remove debug output

[ardour.git] / gtk2_ardour / vca_master_strip.cc

diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc
index ac232dbd86365ceb4435ba9737cb67cbf255aff4..238cd5dabd5d32c81d53674a109d28c3a182fdb2 100644 (file)
--- a/gtk2_ardour/vca_master_strip.cc
+++ b/gtk2_ardour/vca_master_strip.cc
@@ -124,15 +124,14 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr<VCA> v)
        global_vpacker.pack_start (gain_meter.gain_automation_state_button, false, false, 1);
        global_vpacker.pack_start (bottom_padding, false, false, 0);
 
-       global_sample.add (global_vpacker);
-       global_sample.set_shadow_type (Gtk::SHADOW_IN);
-       global_sample.set_name ("BaseFrame");
+       global_frame.add (global_vpacker);
+       global_frame.set_shadow_type (Gtk::SHADOW_IN);
+       global_frame.set_name ("BaseFrame");
 
-       add (global_sample);
+       add (global_frame);
 
        global_vpacker.show ();
-       global_sample.show ();
-       top_padding.show ();
+       global_frame.show ();
        vertical_button.show ();
        hide_button.show ();
        number_label.show ();
@@ -160,6 +159,7 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr<VCA> v)
        _vca->solo_control()->Changed.connect (vca_connections, invalidator (*this), boost::bind (&VCAMasterStrip::solo_changed, this), gui_context());
        _vca->mute_control()->Changed.connect (vca_connections, invalidator (*this), boost::bind (&VCAMasterStrip::mute_changed, this), gui_context());
 
+       _session->MonitorBusAddedOrRemoved.connect (*this, invalidator (*this), boost::bind (&VCAMasterStrip::set_button_names, this), gui_context());
 
        s->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&VCAMasterStrip::parameter_changed, this, _1), gui_context());
        Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&VCAMasterStrip::parameter_changed, this, _1), gui_context());
@@ -198,7 +198,7 @@ VCAMasterStrip::self_delete ()
 void
 VCAMasterStrip::parameter_changed (std::string const & p)
 {
-       if (p == "use-monitor-bus" || p == "solo-control-is-listen-control" || p == "listen-position") {
+       if (p == "solo-control-is-listen-control" || p == "listen-position") {
                set_button_names ();
        } else if (p == "mixer-element-visibility") {
                update_bottom_padding ();
@@ -305,14 +305,14 @@ VCAMasterStrip::set_selected (bool yn)
        AxisView::set_selected (yn);
 
        if (_selected) {
-               global_sample.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
-               global_sample.set_name ("MixerStripSelectedFrame");
+               global_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
+               global_frame.set_name ("MixerStripSelectedFrame");
        } else {
-               global_sample.set_shadow_type (Gtk::SHADOW_IN);
-               global_sample.set_name ("MixerStripFrame");
+               global_frame.set_shadow_type (Gtk::SHADOW_IN);
+               global_frame.set_name ("MixerStripFrame");
        }
 
-       global_sample.queue_draw ();
+       global_frame.queue_draw ();
 }
 
 bool