use Slavable API in GUI

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 5ea57eeaae94996abfe41ceb7cb634dd07fc10ae..f5582af5bd21ba4e16e628b504a205bb6ea3d2f5 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -641,6 +641,11 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::setup_comment_button, this), gui_context());
        _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::property_changed, this, _1), gui_context());
 
+       _route->gain_control()->MasterStatusChange.connect (route_connections,
+                                                           invalidator (*this),
+                                                           boost::bind (&MixerStrip::update_vca_display, this),
+                                                           gui_context());
+
        set_stuff_from_route ();
 
        /* now force an update of all the various elements */
@@ -651,6 +656,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        name_changed ();
        comment_changed ();
        route_group_changed ();
+       update_track_number_visibility ();
 
        connect_to_pan ();
        panners.setup_pan ();
@@ -944,7 +950,7 @@ MixerStrip::input_press (GdkEventButton *ev)
                return true;
        }
 
-       if (_session->actively_recording() && _route->record_enabled())
+       if (_session->actively_recording() && is_track() && track()->rec_enable_control()->get_value())
                return true;
 
        switch (ev->button) {
@@ -1659,7 +1665,7 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
                list_route_operations ();
 
                /* do not allow rename if the track is record-enabled */
-               rename_menu_item->set_sensitive (!_route->record_enabled());
+               rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
                route_ops_menu->popup (1, ev->time);
 
                return true;
@@ -1675,7 +1681,7 @@ MixerStrip::name_button_button_release (GdkEventButton* ev)
                list_route_operations ();
 
                /* do not allow rename if the track is record-enabled */
-               rename_menu_item->set_sensitive (!_route->record_enabled());
+               rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
                route_ops_menu->popup (1, ev->time);
        }
 
@@ -1689,7 +1695,7 @@ MixerStrip::number_button_button_press (GdkEventButton* ev)
                list_route_operations ();
 
                /* do not allow rename if the track is record-enabled */
-               rename_menu_item->set_sensitive (!_route->record_enabled());
+               rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
                route_ops_menu->popup (1, ev->time);
 
                return true;
@@ -2135,7 +2141,7 @@ MixerStrip::set_button_names ()
                        monitor_section_button->set_text (_("Mon"));
                }
 
-               if (_route && _route->solo_safe()) {
+               if (_route && _route->solo_safe_control()->solo_safe()) {
                        solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
                } else {
                        solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
@@ -2164,7 +2170,7 @@ MixerStrip::set_button_names ()
                        monitor_section_button->set_text (S_("Mon|O"));
                }
 
-               if (_route && _route->solo_safe()) {
+               if (_route && _route->solo_safe_control()->solo_safe()) {
                        solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
                } else {
                        solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
@@ -2256,11 +2262,9 @@ MixerStrip::parameter_changed (string p)
                   our VisibilityGroup to reflect these changes in our widgets.
                */
                _visibility.set_state (UIConfiguration::instance().get_mixer_strip_visibility ());
-       }
-       else if (p == "track-name-number") {
+       } else if (p == "track-name-number") {
                name_changed ();
-       }
-       else if (p == "use-monitor-bus") {
+       } else if (p == "use-monitor-bus") {
                if (monitor_section_button) {
                        if (mute_button->get_parent()) {
                                mute_button->get_parent()->remove(*mute_button);
@@ -2278,6 +2282,8 @@ MixerStrip::parameter_changed (string p)
                                mute_button->show();
                        }
                }
+       } else if (p == "track-name-number") {
+               update_track_number_visibility();
        }
 }
 
@@ -2503,10 +2509,8 @@ MixerStrip::vca_menu_toggle (CheckMenuItem* menuitem, uint32_t n)
        }
 
        if (!menuitem->get_active()) {
-               cerr << "Unassign from " << n << endl;
                _mixer.do_vca_unassign (vca);
        } else {
-               cerr << "Assign to " << n << endl;
                _mixer.do_vca_assign (vca);
        }
 }
@@ -2517,7 +2521,8 @@ MixerStrip::vca_assign (boost::shared_ptr<VCA> vca)
        if (!vca || !_route) {
                return;
        }
-       _route->gain_control()->add_master (vca);
+
+       _route->assign (vca);
 }
 
 void
@@ -2527,12 +2532,7 @@ MixerStrip::vca_unassign (boost::shared_ptr<VCA> vca)
                return;
        }
 
-       if (!vca) {
-               /* null VCA means drop all VCA assignments */
-               _route->gain_control()->clear_masters ();
-       } else {
-               _route->gain_control()->remove_master (vca);
-       }
+       _route->unassign (vca);
 }
 
 bool
@@ -2571,7 +2571,6 @@ MixerStrip::vca_button_release (GdkEventButton* ev)
                items.push_back (CheckMenuElem ((*v)->name()));
                CheckMenuItem* item = dynamic_cast<CheckMenuItem*> (&items.back());
                if (_route->slaved_to (*v)) {
-                       cerr << "Yes, slaved to " << (*v)->name() << " aka " << (*v)->number() << endl;
                        item->set_active (true);
                }
                item->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &MixerStrip::vca_menu_toggle), item, (*v)->number()));
@@ -2581,3 +2580,28 @@ MixerStrip::vca_button_release (GdkEventButton* ev)
 
        return true;
 }
+
+void
+MixerStrip::update_track_number_visibility ()
+{
+       DisplaySuspender ds;
+       bool show_label = _session->config.get_track_name_number();
+
+       if (_route && _route->is_master()) {
+               show_label = false;
+       }
+
+       if (show_label) {
+               number_label.show ();
+               // see ArdourButton::on_size_request(), we should probably use a global size-group here instead.
+               // except the width of the number label is subtracted from the name-hbox, so we
+               // need to explictly calculate it anyway until the name-label & entry become ArdourWidgets.
+               int tnw = (2 + std::max(2u, _session->track_number_decimals())) * number_label.char_pixel_width();
+               if (tnw & 1) --tnw;
+               number_label.set_size_request(tnw, -1);
+               number_label.show ();
+               //name_hbox.set_size_request(TimeAxisView::name_width_px - 2 - tnw, -1); // -2 = cellspacing
+       } else {
+               number_label.hide ();
+       }
+}