diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-04-24 21:48:05 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:41 -0400 |
| commit | 760beab7fa1b3fcccd653279ad736656793302ea (patch) | |
| tree | 0963d98e2fd835fe7f405577633d158495717118 | |
| parent | 83e51ee69b6b95574f160d4024995d6ad7cdfab5 (diff) | |
use Slavable API in GUI
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/vca_master_strip.cc | 19 | ||||
| -rw-r--r-- | gtk2_ardour/vca_master_strip.h | 2 |
3 files changed, 10 insertions, 15 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 5c13030127..f5582af5bd 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -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 diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc index f10596e786..34bebc9be9 100644 --- a/gtk2_ardour/vca_master_strip.cc +++ b/gtk2_ardour/vca_master_strip.cc @@ -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) { diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h index 30d18d54a8..d8ef778ee1 100644 --- a/gtk2_ardour/vca_master_strip.h +++ b/gtk2_ardour/vca_master_strip.h @@ -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); |