RouteUI connects to Route's PropertyChange signal; derived types implement route_prop...
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 57501062a4c3e3934fdd1525c1c7dc349b071194..30859c8d5e8472678bf6b3165bbec32c9f89e5b3 100644 (file)
@@ -52,6 +52,8 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 #include "ardour/user_bundle.h"
+#include "ardour/vca.h"
+#include "ardour/vca_manager.h"
 
 #include "ardour_window.h"
 #include "mixer_strip.h"
@@ -79,11 +81,10 @@ using namespace std;
 using namespace ArdourMeter;
 
 MixerStrip* MixerStrip::_entered_mixer_strip;
-
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
-       : AxisView(sess)
+       : SessionHandlePtr (sess)
        , RouteUI (sess)
        , _mixer(mx)
        , _mixer_owned (in_mixer)
@@ -96,7 +97,9 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
        , mute_solo_table (1, 2)
        , bottom_button_table (1, 3)
        , meter_point_button (_("pre"))
+       , monitor_section_button (0)
        , midi_input_enable_button (0)
+       , _plugin_insert_cnt (0)
        , _comment_button (_("Comments"))
        , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
        , _visibility (X_("mixer-element-visibility"))
@@ -113,7 +116,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 }
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt, bool in_mixer)
-       : AxisView(sess)
+       : SessionHandlePtr (sess)
        , RouteUI (sess)
        , _mixer(mx)
        , _mixer_owned (in_mixer)
@@ -126,6 +129,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
        , mute_solo_table (1, 2)
        , bottom_button_table (1, 3)
        , meter_point_button (_("pre"))
+       , monitor_section_button (0)
        , midi_input_enable_button (0)
        , _comment_button (_("Comments"))
        , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
@@ -154,7 +158,7 @@ MixerStrip::init ()
        if (_mixer_owned) {
                t += string_compose (_("\n%1-%2-click to toggle the width of all strips."), Keyboard::primary_modifier_name(), Keyboard::tertiary_modifier_name ());
        }
-       
+
        width_button.set_icon (ArdourIcon::StripWidth);
        set_tooltip (width_button, t);
 
@@ -162,7 +166,7 @@ MixerStrip::init ()
        set_tooltip (&hide_button, _("Hide this mixer strip"));
 
        input_button_box.set_spacing(2);
-       
+
        input_button.set_text (_("Input"));
        input_button.set_name ("mixer strip button");
        input_button_box.pack_start (input_button, true, true);
@@ -177,7 +181,7 @@ MixerStrip::init ()
 
        meter_point_button.signal_button_press_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_press), false);
        meter_point_button.signal_button_release_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_release), false);
-       
+
        hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
        solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
@@ -207,6 +211,15 @@ MixerStrip::init ()
        }
        solo_iso_table.show ();
 
+       vca_button = manage (new ArdourButton (ArdourButton::default_elements));
+       vca_button->set_no_show_all (true);
+       vca_button->set_name (X_("vca assign"));
+       vca_button->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+       vca_button->signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::vca_button_release), false);
+       UI::instance()->set_tip (*vca_button, _("VCA assignments"));
+       vca_button->set_text (_("-vca-"));
+       vca_button->show ();
+
        rec_mon_table.set_homogeneous (true);
        rec_mon_table.set_row_spacings (2);
        rec_mon_table.set_col_spacings (2);
@@ -238,7 +251,7 @@ MixerStrip::init ()
                        button_size_group->add_widget (*monitor_input_button);
                }
        }
-       
+
        mute_solo_table.set_homogeneous (true);
        mute_solo_table.set_spacings (2);
 
@@ -302,6 +315,7 @@ MixerStrip::init ()
        global_vpacker.pack_start (solo_iso_table, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (mute_solo_table, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (*vca_button, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK);
        if (!ARDOUR::Profile->get_trx()) {
                global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
@@ -383,6 +397,7 @@ MixerStrip::init ()
        _visibility.add (&solo_iso_table, X_("SoloIsoLock"), _("Solo Iso / Lock"), false);
        _visibility.add (&output_button, X_("Output"), _("Output"), false);
        _visibility.add (&_comment_button, X_("Comments"), _("Comments"), false);
+       _visibility.add (vca_button, X_("VCA"), _("VCA Assigns"), false);
 
        parameter_changed (X_("mixer-element-visibility"));
        UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &MixerStrip::parameter_changed));
@@ -408,7 +423,7 @@ bool
 MixerStrip::mixer_strip_enter_event (GdkEventCrossing* /*ev*/)
 {
        _entered_mixer_strip = this;
-       
+
        //although we are triggering on the "enter", to the user it will appear that it is happenin on the "leave"
        //because the mixerstrip control is a parent that encompasses the strip
        deselect_all_processors();
@@ -431,10 +446,19 @@ MixerStrip::mixer_strip_leave_event (GdkEventCrossing *ev)
                //if we leave this mixer strip we need to clear out any selections
                //processor_box.processor_display.select_none();  //but this doesn't work, because it gets triggered when (for example) you open the menu or start a drag
        }
-       
+
        return false;
 }
 
+string
+MixerStrip::name() const
+{
+       if (_route) {
+               return _route->name();
+       }
+       return string();
+}
+
 void
 MixerStrip::set_route (boost::shared_ptr<Route> rt)
 {
@@ -456,7 +480,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        if (group_button.get_parent()) {
                bottom_button_table.remove (group_button);
        }
-       
+
        RouteUI::set_route (rt);
 
        /* ProcessorBox needs access to _route so that it can read
@@ -469,7 +493,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        /* unpack these from the parent and stuff them into our own
           table
        */
-       
+
        if (gpm.peak_display.get_parent()) {
                gpm.peak_display.get_parent()->remove (gpm.peak_display);
        }
@@ -478,7 +502,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        gpm.set_type (rt->meter_type());
-       
+
        mute_solo_table.attach (gpm.gain_display,0,1,1,2, EXPAND|FILL, EXPAND);
        mute_solo_table.attach (gpm.peak_display,1,2,1,2, EXPAND|FILL, EXPAND);
 
@@ -491,13 +515,25 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        if (route()->is_master()) {
-               mute_solo_table.attach (*mute_button, 0, 2, 0, 1);
                solo_button->hide ();
                mute_button->show ();
                rec_mon_table.hide ();
                if (solo_iso_table.get_parent()) {
                        solo_iso_table.get_parent()->remove(solo_iso_table);
                }
+               if (monitor_section_button == 0) {
+                       Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
+                       _session->MonitorChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::monitor_changed, this), gui_context());
+
+                       monitor_section_button = manage (new ArdourButton);
+                       monitor_changed ();
+                       monitor_section_button->set_related_action (act);
+                       set_tooltip (monitor_section_button, _("Show/Hide Monitoring Section"));
+                       mute_solo_table.attach (*monitor_section_button, 1, 2, 0, 1);
+                       monitor_section_button->show();
+                       monitor_section_button->unset_flags (Gtk::CAN_FOCUS);
+               }
+               parameter_changed ("use-monitor-bus");
        } else {
                bottom_button_table.attach (group_button, 1, 2, 0, 1);
                mute_solo_table.attach (*mute_button, 0, 1, 0, 1);
@@ -569,7 +605,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        if (is_track ()) {
 
                rec_mon_table.attach (*rec_enable_button, 0, 1, 0, ARDOUR::Profile->get_mixbus() ? 1 : 2);
-               rec_enable_button->set_sensitive (_session->writable());
                rec_enable_button->show();
 
                if (ARDOUR::Profile->get_mixbus()) {
@@ -614,7 +649,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 ();
 
@@ -622,9 +661,11 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        update_mute_display ();
        update_solo_display ();
+       update_vca_display ();
        name_changed ();
-       comment_changed (0);
+       comment_changed ();
        route_group_changed ();
+       update_track_number_visibility ();
 
        connect_to_pan ();
        panners.setup_pan ();
@@ -669,6 +710,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        gpm.gain_automation_state_button.show();
 
        parameter_changed ("mixer-element-visibility");
+       map_frozen();
 
        show ();
 }
@@ -798,7 +840,7 @@ MixerStrip::output_release (GdkEventButton *ev)
                edit_output_configuration ();
                break;
        }
-       
+
        return false;
 }
 
@@ -859,17 +901,19 @@ MixerStrip::output_press (GdkEventButton *ev)
                        citems.pop_back ();
                }
 
-               citems.push_back (SeparatorElem());
+               if (!ARDOUR::Profile->get_mixbus()) {
+                       citems.push_back (SeparatorElem());
 
-               for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
-                       citems.push_back (
-                               MenuElem (
-                                       string_compose (_("Add %1 port"), (*i).to_i18n_string()),
-                                       sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_output_port), *i)
-                                       )
-                               );
+                       for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
+                               citems.push_back (
+                                               MenuElem (
+                                                       string_compose (_("Add %1 port"), (*i).to_i18n_string()),
+                                                       sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_output_port), *i)
+                                                       )
+                                               );
+                       }
                }
-               
+
                citems.push_back (SeparatorElem());
                citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::edit_output_configuration)));
 
@@ -915,7 +959,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) {
@@ -929,7 +973,7 @@ MixerStrip::input_press (GdkEventButton *ev)
 
                citems.push_back (SeparatorElem());
                uint32_t const n_with_separator = citems.size ();
-               
+
                input_menu_bundles.clear ();
 
                ARDOUR::BundleList current = _route->input()->bundles_connected ();
@@ -1022,9 +1066,9 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR:
 {
        using namespace Menu_Helpers;
 
-       if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs() || *b == *_route->output()->bundle()) {
-               return;
-       }
+       if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs() || *b == *_route->output()->bundle()) {
+               return;
+       }
 
        list<boost::shared_ptr<Bundle> >::iterator i = input_menu_bundles.begin ();
        while (i != input_menu_bundles.end() && b->has_same_ports (*i) == false) {
@@ -1050,9 +1094,9 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
 {
        using namespace Menu_Helpers;
 
-       if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) {
-               return;
-       }
+       if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) {
+               return;
+       }
 
        list<boost::shared_ptr<Bundle> >::iterator i = output_menu_bundles.begin ();
        while (i != output_menu_bundles.end() && b->has_same_ports (*i) == false) {
@@ -1195,7 +1239,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
        ostringstream tooltip;
        char * tooltip_cstr;
-       
+
        //to avoid confusion, the button caption should only show connections that match the datatype of the track
        DataType dt = DataType::AUDIO;
        if ( boost::dynamic_pointer_cast<MidiTrack>(route) != 0 ) {
@@ -1207,10 +1251,10 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
        if (for_input) {
                io_count = route->n_inputs().n_total();
-               tooltip << string_compose (_("<b>INPUT</b> to %1"), Glib::Markup::escape_text(route->name()).c_str());
+               tooltip << string_compose (_("<b>INPUT</b> to %1"), Gtkmm2ext::markup_escape_text (route->name()));
        } else {
                io_count = route->n_outputs().n_total();
-               tooltip << string_compose (_("<b>OUTPUT</b> from %1"), Glib::Markup::escape_text(route->name()).c_str());
+               tooltip << string_compose (_("<b>OUTPUT</b> from %1"), Gtkmm2ext::markup_escape_text (route->name()));
        }
 
 
@@ -1220,7 +1264,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
                } else {
                        port = route->output()->nth (io_index);
                }
-               
+
                port_connections.clear ();
                port->get_connections(port_connections);
 
@@ -1244,15 +1288,15 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
                                }
 
                                if (io_connection_count == 0) {
-                                       tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)).c_str()
+                                       tooltip << endl << Gtkmm2ext::markup_escape_text (port->name().substr(port->name().find("/") + 1))
                                                << " -> "
-                                               << Glib::Markup::escape_text( pn.empty() ? connection_name : pn ).c_str();
+                                               << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn );
                                } else {
                                        tooltip << ", "
-                                               << Glib::Markup::escape_text( pn.empty() ? connection_name : pn ).c_str();
+                                               << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn );
                                }
 
-                               if (connection_name.find("ardour:") == 0) {
+                               if (connection_name.find(RouteUI::program_port_prefix) == 0) {
                                        if (ardour_track_name.empty()) {
                                                // "ardour:Master/in 1" -> "ardour:Master/"
                                                string::size_type slash = connection_name.find("/");
@@ -1336,17 +1380,20 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
        if (for_input) {
                set_tooltip (&input_button, tooltip_cstr);
-       } else {
+       } else {
                set_tooltip (&output_button, tooltip_cstr);
        }
 
+       delete [] tooltip_cstr;
+
        if (each_io_has_one_connection) {
                if (total_connection_count == ardour_connection_count) {
                        // all connections are to the same track in ardour
                        // "ardour:Master/" -> "Master"
                        string::size_type slash = ardour_track_name.find("/");
                        if (slash != string::npos) {
-                               label << ardour_track_name.substr(7, slash - 7);
+                               const size_t ppps = RouteUI::program_port_prefix.size (); // "ardour:"
+                               label << ardour_track_name.substr (ppps, slash - ppps);
                                have_label = true;
                        }
                }
@@ -1387,7 +1434,7 @@ void
 MixerStrip::update_input_display ()
 {
        update_io_button (_route, _width, true);
-       panners.setup_pan ();
+       panners.setup_pan ();
 
        if (has_audio_outputs ()) {
                panners.show_all ();
@@ -1401,8 +1448,8 @@ void
 MixerStrip::update_output_display ()
 {
        update_io_button (_route, _width, false);
-       gpm.setup_meters ();
-       panners.setup_pan ();
+       gpm.setup_meters ();
+       panners.setup_pan ();
 
        if (has_audio_outputs ()) {
                panners.show_all ();
@@ -1473,7 +1520,7 @@ MixerStrip::setup_comment_button ()
        }
 
        set_tooltip (
-               _comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment()
+               _comment_button, _route->comment().empty() ? _("Click to add/edit comments") : _route->comment()
                );
 
 }
@@ -1489,9 +1536,9 @@ MixerStrip::select_route_group (GdkEventButton *ev)
 
                        PropertyList* plist = new PropertyList();
 
-                       plist->add (Properties::gain, true);
-                       plist->add (Properties::mute, true);
-                       plist->add (Properties::solo, true);
+                       plist->add (Properties::group_gain, true);
+                       plist->add (Properties::group_mute, true);
+                       plist->add (Properties::group_solo, true);
 
                        group_menu = new RouteGroupMenu (_session, plist);
                }
@@ -1540,6 +1587,18 @@ MixerStrip::show_passthru_color ()
        reset_strip_style ();
 }
 
+
+void
+MixerStrip::help_count_plugins (boost::weak_ptr<Processor> p)
+{
+       boost::shared_ptr<Processor> processor (p.lock ());
+       if (!processor || !processor->display_to_user()) {
+               return;
+       }
+       if (boost::dynamic_pointer_cast<PluginInsert> (processor)) {
+               ++_plugin_insert_cnt;
+       }
+}
 void
 MixerStrip::build_route_ops_menu ()
 {
@@ -1572,8 +1631,22 @@ MixerStrip::build_route_ops_menu ()
        i->set_sensitive(! _session->transport_rolling());
        i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::set_route_active), !_route->active(), false));
 
-       items.push_back (SeparatorElem());
+       if (!Profile->get_mixbus ()) {
+               items.push_back (SeparatorElem());
+               items.push_back (CheckMenuElem (_("Strict I/O")));
+               i = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
+               i->set_active (_route->strict_io());
+               i->signal_activate().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*_route, &Route::set_strict_io), !_route->strict_io())));
+       }
+
+       _plugin_insert_cnt = 0;
+       _route->foreach_processor (sigc::mem_fun (*this, &MixerStrip::help_count_plugins));
+       if (_plugin_insert_cnt > 0) {
+               items.push_back (SeparatorElem());
+               items.push_back (MenuElem (_("Pin Connections..."), sigc::mem_fun (*this, &RouteUI::manage_pins)));
+       }
 
+       items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Adjust Latency..."), sigc::mem_fun (*this, &RouteUI::adjust_latency)));
 
        items.push_back (SeparatorElem());
@@ -1581,11 +1654,6 @@ MixerStrip::build_route_ops_menu ()
        denormal_menu_item = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
        denormal_menu_item->set_active (_route->denormal_protection());
 
-       if (!Profile->get_sae()) {
-               items.push_back (SeparatorElem());
-               items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
-       }
-
        if (_route) {
                /* note that this relies on selection being shared across editor and
                   mixer (or global to the backend, in the future), which is the only
@@ -1598,9 +1666,14 @@ MixerStrip::build_route_ops_menu ()
                        if (!selection.selected (rtav)) {
                                selection.set (rtav);
                        }
-                       
-                       items.push_front (SeparatorElem());
-                       items.push_front (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks)));
+
+                       if (!_route->is_master()) {
+                               items.push_back (SeparatorElem());
+                               items.push_back (MenuElem (_("Duplicate..."), sigc::mem_fun (*this, &RouteUI::duplicate_selected_routes)));
+                       }
+
+                       items.push_back (SeparatorElem());
+                       items.push_back (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks)));
                }
        }
 }
@@ -1612,7 +1685,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;
@@ -1628,7 +1701,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);
        }
 
@@ -1642,9 +1715,9 @@ 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;
        }
 
@@ -1670,16 +1743,14 @@ MixerStrip::set_selected (bool yn)
                global_frame.set_name ("MixerStripFrame");
        }
        global_frame.queue_draw ();
-       
+
 //     if (!yn)
 //             processor_box.deselect_all_processors();
 }
 
 void
-MixerStrip::property_changed (const PropertyChange& what_changed)
+MixerStrip::route_property_changed (const PropertyChange& what_changed)
 {
-       RouteUI::property_changed (what_changed);
-
        if (what_changed.contains (ARDOUR::Properties::name)) {
                name_changed ();
        }
@@ -1735,7 +1806,7 @@ MixerStrip::width_button_pressed (GdkEventButton* ev)
        if (ev->button != 1) {
                return false;
        }
-       
+
        if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)) && _mixer_owned) {
                switch (_width) {
                case Wide:
@@ -1800,7 +1871,10 @@ MixerStrip::map_frozen ()
                        // XXX need some way, maybe, to retoggle redirect editors
                        break;
                }
+       } else {
+               processor_box.set_sensitive (true);
        }
+       RouteUI::map_frozen ();
 }
 
 void
@@ -1880,19 +1954,19 @@ MixerStrip::meter_point_string (MeterPoint mp)
                case MeterInput:
                        return _("In");
                        break;
-                       
+
                case MeterPreFader:
                        return _("Pre");
                        break;
-                       
+
                case MeterPostFader:
                        return _("Post");
                        break;
-                       
+
                case MeterOutput:
                        return _("Out");
                        break;
-                       
+
                case MeterCustom:
                default:
                        return _("Custom");
@@ -1904,19 +1978,19 @@ MixerStrip::meter_point_string (MeterPoint mp)
                case MeterInput:
                        return S_("Meter|In");
                        break;
-                       
+
                case MeterPreFader:
                        return S_("Meter|Pr");
                        break;
-                       
+
                case MeterPostFader:
                        return S_("Meter|Po");
                        break;
-                       
+
                case MeterOutput:
                        return S_("Meter|O");
                        break;
-                       
+
                case MeterCustom:
                default:
                        return S_("Meter|C");
@@ -1928,6 +2002,18 @@ MixerStrip::meter_point_string (MeterPoint mp)
        return string();
 }
 
+/** Called when the monitor-section state */
+void
+MixerStrip::monitor_changed ()
+{
+       assert (monitor_section_button);
+       if (_session->monitor_active()) {
+               monitor_section_button->set_name ("master monitor section button active");
+       } else {
+               monitor_section_button->set_name ("master monitor section button normal");
+       }
+}
+
 /** Called when the metering point has changed */
 void
 MixerStrip::meter_changed ()
@@ -1976,12 +2062,13 @@ MixerStrip::drop_send ()
        meter_point_button.set_sensitive (true);
        mute_button->set_sensitive (true);
        solo_button->set_sensitive (true);
-       rec_enable_button->set_sensitive (true);
        solo_isolated_led->set_sensitive (true);
        solo_safe_led->set_sensitive (true);
        monitor_input_button->set_sensitive (true);
        monitor_disk_button->set_sensitive (true);
        _comment_button.set_sensitive (true);
+       RouteUI::check_rec_enable_sensitivity ();
+       set_button_names (); // update solo button visual state
 }
 
 void
@@ -2004,7 +2091,7 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
        send->set_metering (true);
        _current_delivery->DropReferences.connect (send_gone_connection, invalidator (*this), boost::bind (&MixerStrip::revert_to_default_display, this), gui_context());
 
-       gain_meter().set_controls (_route, send->meter(), send->amp());
+       gain_meter().set_controls (_route, send->meter(), send->amp(), send->gain_control());
        gain_meter().setup_meters ();
 
        uint32_t const in = _current_delivery->pans_required();
@@ -2043,7 +2130,7 @@ MixerStrip::revert_to_default_display ()
 
        set_current_delivery (_route->main_outs ());
 
-       gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp());
+       gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp(), _route->gain_control());
        gain_meter().setup_meters ();
 
        panner_ui().set_panner (_route->main_outs()->panner_shell(), _route->main_outs()->panner());
@@ -2068,8 +2155,11 @@ MixerStrip::set_button_names ()
                mute_button->set_text (_("Mute"));
                monitor_input_button->set_text (_("In"));
                monitor_disk_button->set_text (_("Disk"));
+               if (monitor_section_button) {
+                       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));
@@ -2094,8 +2184,11 @@ MixerStrip::set_button_names ()
                mute_button->set_text (S_("Mute|M"));
                monitor_input_button->set_text (S_("MonitorInput|I"));
                monitor_disk_button->set_text (S_("MonitorDisk|D"));
+               if (monitor_section_button) {
+                       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));
@@ -2187,9 +2280,28 @@ 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") {
+               if (monitor_section_button) {
+                       if (mute_button->get_parent()) {
+                               mute_button->get_parent()->remove(*mute_button);
+                       }
+                       if (monitor_section_button->get_parent()) {
+                               monitor_section_button->get_parent()->remove(*monitor_section_button);
+                       }
+                       if (Config->get_use_monitor_bus ()) {
+                               mute_solo_table.attach (*mute_button, 0, 1, 0, 1);
+                               mute_solo_table.attach (*monitor_section_button, 1, 2, 0, 1);
+                               mute_button->show();
+                               monitor_section_button->show();
+                       } else {
+                               mute_solo_table.attach (*mute_button, 0, 2, 0, 1);
+                               mute_button->show();
+                       }
+               }
+       } else if (p == "track-name-number") {
+               update_track_number_visibility();
        }
 }
 
@@ -2204,7 +2316,7 @@ MixerStrip::override_solo_visibility () const
        if (_route && _route->is_master ()) {
                return boost::optional<bool> (false);
        }
-       
+
        return boost::optional<bool> ();
 }
 
@@ -2362,7 +2474,7 @@ MixerStrip::add_level_meter_item_point (Menu_Helpers::MenuList& items,
                RadioMenuItem::Group& group, string const & name, MeterPoint point)
 {
        using namespace Menu_Helpers;
-       
+
        items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MixerStrip::set_meter_point), point)));
        RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
        i->set_active (_route->meter_point() == point);
@@ -2380,7 +2492,7 @@ MixerStrip::add_level_meter_item_type (Menu_Helpers::MenuList& items,
                RadioMenuItem::Group& group, string const & name, MeterType type)
 {
        using namespace Menu_Helpers;
-       
+
        items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MixerStrip::set_meter_type), type)));
        RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
        i->set_active (_route->meter_type() == type);
@@ -2392,3 +2504,150 @@ MixerStrip::set_meter_type (MeterType t)
        if (_suspend_menu_callbacks) return;
        gpm.set_type (t);
 }
+
+void
+MixerStrip::vca_menu_toggle (Gtk::CheckMenuItem* menuitem, uint32_t n)
+{
+       if (!_route) {
+               return;
+       }
+
+       boost::shared_ptr<VCA> vca = _session->vca_manager().vca_by_number (n);
+
+       if (!vca) {
+               return;
+       }
+
+       if (!_selected) {
+               /* if this strip is not selected, add it before carrying out
+                  changes to assignment. the user probably didn't notice
+                  that they were clicking on an unselected track.
+               */
+               _mixer.select_strip (*this);
+       }
+
+       if (!menuitem->get_active()) {
+               _mixer.do_vca_unassign (vca);
+       } else {
+               _mixer.do_vca_assign (vca);
+       }
+}
+
+void
+MixerStrip::vca_assign (boost::shared_ptr<VCA> vca)
+{
+       if (!vca || !_route) {
+               return;
+       }
+
+       _route->assign (vca);
+}
+
+void
+MixerStrip::vca_unassign (boost::shared_ptr<VCA> vca)
+{
+       if (!_route) {
+               return;
+       }
+
+       _route->unassign (vca);
+}
+
+bool
+MixerStrip::vca_button_release (GdkEventButton* ev)
+{
+       using namespace Gtk::Menu_Helpers;
+
+       if (!_session) {
+               return false;
+       }
+
+       /* primary click only */
+
+       if (ev->button != 1) {
+               return false;
+       }
+
+       if (!_route) {
+               /* no route - nothing to do */
+               return false;
+       }
+
+       VCAList vcas (_session->vca_manager().vcas());
+
+       if (vcas.empty()) {
+               /* the button should not have been visible under these conditions */
+               return true;
+       }
+
+       Menu* menu = new Menu;
+       MenuList& items = menu->items();
+
+       items.push_back (MenuElem (_("Unassign"), sigc::bind (sigc::mem_fun (_mixer, &Mixer_UI::do_vca_unassign), boost::shared_ptr<VCA>())));
+
+       for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) {
+               items.push_back (CheckMenuElem ((*v)->name()));
+               Gtk::CheckMenuItem* item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
+               if (_route->slaved_to (*v)) {
+                       item->set_active (true);
+               }
+               item->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &MixerStrip::vca_menu_toggle), item, (*v)->number()));
+       }
+
+       menu->popup (1, ev->time);
+
+       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 ();
+       } else {
+               number_label.hide ();
+       }
+}
+
+bool
+MixerStrip::is_selected () const
+{
+       if (!_route) {
+               return false;
+       }
+
+       return _route->presentation_info().selected();
+}
+
+Gdk::Color
+MixerStrip::color () const
+{
+       return route_color ();
+}
+
+bool
+MixerStrip::marked_for_display () const
+{
+       return !_route->presentation_info().hidden();
+}
+
+bool
+MixerStrip::set_marked_for_display (bool yn)
+{
+       return RouteUI::mark_hidden (!yn);
+}
+