smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Dont delete&create add_vca_buton every time the vca list is updated.

Browse source
This commit is contained in:
Ben Loftis 2018-02-13 08:13:52 -06:00
parent 037e469e51
commit 181b5e40d1
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gtk2_ardour/mixer_ui.cc
View file

@ -135,10 +135,15 @@ Mixer_UI::Mixer_UI ()
scroller_base.drag_dest_set (target_table); scroller_base.drag_dest_set (target_table);
scroller_base.signal_drag_data_received().connect (sigc::mem_fun(*this, &Mixer_UI::scroller_drag_data_received)); scroller_base.signal_drag_data_received().connect (sigc::mem_fun(*this, &Mixer_UI::scroller_drag_data_received));
/* create a button to add mixer strips */ /* create a button to add VCA strips ... will get packed in redisplay_track_list() */
add_button.show ();
Widget* w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON)); Widget* w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
w->show (); w->show ();
add_vca_button.add (*w);
add_vca_button.signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_track_or_bus));
/* create a button to add mixer strips */
w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
w->show ();
add_button.add (*w); add_button.add (*w);
add_button.signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_track_or_bus)); add_button.signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_track_or_bus));
@ -330,6 +335,7 @@ Mixer_UI::Mixer_UI ()
list_hpane.show(); list_hpane.show();
group_display.show(); group_display.show();
favorite_plugins_display.show(); favorite_plugins_display.show();
add_button.show ();
MixerStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_strip, this, _1), gui_context()); MixerStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_strip, this, _1), gui_context());
VCAMasterStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_master, this, _1), gui_context()); VCAMasterStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_master, this, _1), gui_context());
@ -1435,17 +1441,10 @@ Mixer_UI::redisplay_track_list ()
container_clear (vca_hpacker); container_clear (vca_hpacker);
/* create a button to add mixer strips */
Button* add_vca_button = manage (new Button);
Widget* w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
w->show ();
add_vca_button->add (*w);
add_vca_button->signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_track_or_bus));
vca_hpacker.pack_end (vca_scroller_base, true, true); vca_hpacker.pack_end (vca_scroller_base, true, true);
vca_hpacker.pack_end (*add_vca_button, false, false); vca_hpacker.pack_end (add_vca_button, false, false);
add_vca_button->show (); add_vca_button.show ();
vca_scroller_base.show(); vca_scroller_base.show();
for (i = rows.begin(); i != rows.end(); ++i) { for (i = rows.begin(); i != rows.end(); ++i) {

3
gtk2_ardour/mixer_ui.h
View file

@ -167,8 +167,9 @@ private:
Gtk::Label vca_label; Gtk::Label vca_label;
Gtk::EventBox vca_scroller_base; Gtk::EventBox vca_scroller_base;
Gtk::HBox out_packer; Gtk::HBox out_packer;
Gtk::Button add_button; // should really be an ArdourButton
ArdourWidgets::HPane list_hpane; ArdourWidgets::HPane list_hpane;
Gtk::Button add_button; // should really be an ArdourButton
Gtk::Button add_vca_button;
MixerGroupTabs* _group_tabs; MixerGroupTabs* _group_tabs;