NO-OP: whitespace and some guaranteed assertion removal

[ardour.git] / gtk2_ardour / control_slave_ui.cc

diff --git a/gtk2_ardour/control_slave_ui.cc b/gtk2_ardour/control_slave_ui.cc
index fa14d46518230d36bb95be221130fb2e78f4338c..0c8ad87d28da3b26eed082cc0d25bb40a5c86be3 100644 (file)
--- a/gtk2_ardour/control_slave_ui.cc
+++ b/gtk2_ardour/control_slave_ui.cc
@@ -31,13 +31,13 @@
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/utils.h"
 
-#include "ardour_button.h"
 #include "control_slave_ui.h"
 #include "gui_thread.h"
 
 #include "pbd/i18n.h"
 
 using namespace ARDOUR;
+using namespace ArdourWidgets;
 using namespace Gtk;
 using std::string;
 
@@ -191,22 +191,17 @@ ControlSlaveUI::vca_button_release (GdkEventButton* ev, uint32_t n)
 
        for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) {
 
-               boost::shared_ptr<GainControl> gcs = stripable->gain_control();
-               boost::shared_ptr<GainControl> gcm = (*v)->gain_control();
-
-               if (gcs == gcm) {
-                       /* asked to slave to self. not ok */
-                       continue;
-               }
-
-               if (gcm->slaved_to (gcs)) {
-                       /* master is already slaved to slave */
+               if (stripable->assigned_to (_session->vca_manager_ptr (), *v)) {
+                       /* master(stripable) is directly or indirectly controlled by slave (v) */
                        continue;
                }
 
                items.push_back (CheckMenuElem ((*v)->name()));
                Gtk::CheckMenuItem* item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
 
+               boost::shared_ptr<GainControl> gcs = stripable->gain_control();
+               boost::shared_ptr<GainControl> gcm = (*v)->gain_control();
+
                if (gcs->slaved_to (gcm)) {
                        item->set_active (true);
                        slaved = true;