ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

use Slavable API in GUI

This commit is contained in:
Paul Davis 2016-04-24 21:48:05 -04:00
parent 83e51ee69b
commit 760beab7fa
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/mixer_strip.cc
View File

@ -2522,7 +2522,7 @@ MixerStrip::vca_assign (boost::shared_ptr<VCA> vca)
return;
}
_route->vca_assign (vca);
_route->assign (vca);
}
void
@ -2532,7 +2532,7 @@ MixerStrip::vca_unassign (boost::shared_ptr<VCA> vca)
return;
}
_route->vca_unassign (vca);
_route->unassign (vca);
}
bool

19
gtk2_ardour/vca_master_strip.cc
View File

@ -285,27 +285,22 @@ VCAMasterStrip::vca_menu_toggle (CheckMenuItem* menuitem, uint32_t n)
if (!menuitem->get_active()) {
if (!vca) {
/* null VCA means drop all VCA assignments */
vca_unassign ();
_vca->unassign (boost::shared_ptr<VCA>());
} else {
_vca->gain_control()->remove_master (vca->gain_control());
_vca->solo_control()->remove_master (vca->solo_control());
_vca->mute_control()->remove_master (vca->mute_control());
_vca->unassign (vca);
}
} else {
if (vca) {
_vca->gain_control()->add_master (vca->gain_control());
_vca->mute_control()->add_master (vca->mute_control());
_vca->solo_control()->add_master (vca->solo_control());
_vca->assign (vca);
}
}
}
void
VCAMasterStrip::vca_unassign ()
VCAMasterStrip::unassign ()
{
_vca->gain_control()->clear_masters ();
_vca->solo_control()->clear_masters ();
_vca->mute_control()->clear_masters ();
_vca->unassign (boost::shared_ptr<VCA>());
}
bool
@ -333,7 +328,7 @@ VCAMasterStrip::vca_button_release (GdkEventButton* ev)
Menu* menu = new Menu;
MenuList& items = menu->items();
items.push_back (MenuElem (_("Unassign"), sigc::mem_fun (*this, &VCAMasterStrip::vca_unassign)));
items.push_back (MenuElem (_("Unassign"), sigc::mem_fun (*this, &VCAMasterStrip::unassign)));
for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) {

2
gtk2_ardour/vca_master_strip.h
View File

@ -80,7 +80,7 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
void solo_changed ();
void mute_changed ();
void vca_menu_toggle (Gtk::CheckMenuItem* menuitem, uint32_t n);
void vca_unassign ();
void unassign ();
bool vca_button_release (GdkEventButton*);
void update_vca_display ();
void finish_name_edit (std::string);