use Slavable API in GUI

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 5c130301279adf0b1747fae50aad9f237995f0ec..f5582af5bd21ba4e16e628b504a205bb6ea3d2f5 100644 (file)
--- 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 f10596e78622b4aab49d79eab72ac9e11806ab6d..34bebc9be91b0200c04be96531ac927eb629262c 100644 (file)
--- 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 30d18d54a83d0a9589bdbf51b0156bc649ddd126..d8ef778ee181d8bee52c6bad985cea8e5f7077da 100644 (file)
--- 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);