Cope with drags of selections that include regions on hidden tracks (#3493).
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 4bd50e9d37790266ac662fdc3a239354bd42c734..5ce4caa3af1b74866a95e2073aa5fab38ccc17e8 100644 (file)
 #include "ardour/route.h"
 #include "ardour/route_group.h"
 #include "ardour/audio_track.h"
+#include "ardour/midi_track.h"
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
+#include "ardour/panner_shell.h"
 #include "ardour/send.h"
 #include "ardour/processor.h"
 #include "ardour/profile.h"
@@ -83,11 +85,13 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
        , processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer)
        , gpm (sess, 250)
        , panners (sess)
-       , button_table (4, 2)
+       , button_table (3, 1)
        , solo_led_table (2, 2)
+       , top_button_table (1, 2)
        , middle_button_table (1, 2)
        , bottom_button_table (1, 2)
        , meter_point_label (_("pre"))
+       , midi_input_enable_button (0)
 {
        init ();
 
@@ -108,10 +112,11 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
        , processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer)
        , gpm (sess, 250)
        , panners (sess)
-       , button_table (3, 2)
+       , button_table (3, 1)
        , middle_button_table (1, 2)
        , bottom_button_table (1, 2)
        , meter_point_label (_("pre"))
+       , midi_input_enable_button (0)
 {
        init ();
        set_route (rt);
@@ -123,7 +128,6 @@ MixerStrip::init ()
        input_selector = 0;
        output_selector = 0;
        group_menu = 0;
-       _marked_for_display = false;
        route_ops_menu = 0;
        ignore_comment_edit = false;
        ignore_toggle = false;
@@ -152,8 +156,7 @@ MixerStrip::init ()
        input_button.add (input_label);
        input_button.set_name ("MixerIOButton");
        input_label.set_name ("MixerIOButtonLabel");
-
-       Gtkmm2ext::set_size_request_to_display_given_text (input_button, longest_label.c_str(), 4, 4);
+       input_button_box.pack_start (input_button, true, true);
 
        output_label.set_text (_("Output"));
        ARDOUR_UI::instance()->set_tip (&output_button, _("Button 1 to choose outputs from a port matrix, button 3 to select inputs from a menu"), "");
@@ -182,6 +185,9 @@ MixerStrip::init ()
        mute_button->set_name ("MixerMuteButton");
        solo_button->set_name ("MixerSoloButton");
 
+       monitor_input_button->set_name ("MixerMonitorInputButton");
+       monitor_disk_button->set_name ("MixerMonitorInputButton");
+
         solo_isolated_led = manage (new LED);
         solo_isolated_led->show ();
         solo_isolated_led->set_diameter (6);
@@ -200,32 +206,40 @@ MixerStrip::init ()
         solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release));
        UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
 
-        Label* iso_label = manage (new Label (_("iso")));
-        Label* safe_label = manage (new Label (_("lock")));
-        
-        iso_label->set_name (X_("SoloLEDLabel"));
-        safe_label->set_name (X_("SoloLEDLabel"));
+       _iso_label = manage (new Label (_("iso")));
+       _safe_label = manage (new Label (_("lock")));
+
+       _iso_label->set_name (X_("SoloLEDLabel"));
+       _safe_label->set_name (X_("SoloLEDLabel"));
 
-        iso_label->show ();
-        safe_label->show (); 
+       _iso_label->show ();
+       _safe_label->show ();
 
         solo_led_table.set_spacings (0);
         solo_led_table.set_border_width (1);
-        solo_led_table.attach (*iso_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
+       solo_led_table.attach (*_iso_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
         solo_led_table.attach (*solo_isolated_led, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
-        solo_led_table.attach (*safe_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
+       solo_led_table.attach (*_safe_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
         solo_led_table.attach (*solo_safe_led, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL);
-
         solo_led_table.show ();
-        solo_led_box.pack_end (solo_led_table, false, false);
-        solo_led_box.show ();
+
+       top_button_table.set_homogeneous (true);
+       top_button_table.set_spacings (0);
+       top_button_table.attach (*monitor_input_button, 0, 1, 0, 1);
+        top_button_table.attach (*monitor_disk_button, 1, 2, 0, 1);
+       top_button_table.show ();
+
+       below_panner_box.set_border_width (2);
+       below_panner_box.set_spacing (2);
+        below_panner_box.pack_end (solo_led_table, false, false);
+        below_panner_box.show ();
 
        button_table.set_homogeneous (true);
        button_table.set_spacings (0);
 
-       button_table.attach (name_button, 0, 2, 0, 1);
-       button_table.attach (input_button, 0, 2, 1, 2);
-       button_table.attach (_invert_button_box, 0, 2, 3, 4);
+       button_table.attach (name_button, 0, 1, 0, 1);
+       button_table.attach (input_button_box, 0, 1, 1, 2);
+       button_table.attach (_invert_button_box, 0, 1, 2, 3);
 
        middle_button_table.set_homogeneous (true);
        middle_button_table.set_spacings (0);
@@ -244,7 +258,7 @@ MixerStrip::init ()
        ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
        group_button.add (group_label);
        group_button.set_name ("MixerGroupButton");
-        Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2);
+       Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2);
        group_label.set_name ("MixerGroupButtonLabel");
 
        global_vpacker.set_border_width (0);
@@ -260,19 +274,18 @@ MixerStrip::init ()
        width_hide_box.pack_start (width_button, false, true);
        width_hide_box.pack_start (top_event_box, true, true);
        width_hide_box.pack_end (hide_button, false, true);
-       gain_meter_alignment.set_padding(0, 4, 0, 0);
-       gain_meter_alignment.add(gpm);
 
        whvbox.pack_start (width_hide_box, true, true);
 
        global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (button_table, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (processor_box, true, true);
        global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (solo_led_box,Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (gain_meter_alignment,Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (below_panner_box, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
 
        global_frame.add (global_vpacker);
@@ -332,7 +345,7 @@ MixerStrip::init ()
        SwitchIO.connect (sigc::mem_fun (*this, &MixerStrip::switch_io));
 
        AudioEngine::instance()->PortConnectedOrDisconnected.connect (
-               *this, invalidator (*this), boost::bind (&MixerStrip::port_connected_or_disconnected, this, _1, _2), gui_context ()
+               *this, invalidator (*this), boost::bind (&MixerStrip::port_connected_or_disconnected, this, _1, _3), gui_context ()
                );
 }
 
@@ -349,11 +362,11 @@ void
 MixerStrip::set_route (boost::shared_ptr<Route> rt)
 {
        if (rec_enable_button->get_parent()) {
-               button_table.remove (*rec_enable_button);
+               below_panner_box.remove (*rec_enable_button);
        }
 
        if (show_sends_button->get_parent()) {
-               button_table.remove (*show_sends_button);
+               below_panner_box.remove (*show_sends_button);
        }
 
        processor_box.set_route (rt);
@@ -373,18 +386,14 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        revert_to_default_display ();
 
-       if (set_color_from_route()) {
-               set_color (unique_random_color());
+       if (route()->is_master()) {
+               solo_button->hide ();
+               below_panner_box.hide ();
+       } else {
+               solo_button->show ();
+               below_panner_box.show ();
        }
 
-        if (route()->is_master()) {
-                solo_button->hide ();
-                solo_led_box.hide ();
-        } else {
-                solo_button->show ();
-                solo_led_box.show ();
-        }
-
        if (_mixer_owned && (route()->is_master() || route()->is_monitor())) {
 
                if (scrollbar_height == 0) {
@@ -398,6 +407,39 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                global_vpacker.pack_start (*spacer, false, false);
        }
 
+       if (is_track()) {
+               monitor_input_button->show ();
+               monitor_disk_button->show ();
+       } else {
+               monitor_input_button->hide();
+               monitor_disk_button->hide ();
+       }
+
+       if (is_midi_track()) {
+               if (midi_input_enable_button == 0) {
+                       Image* img = manage (new Image (get_icon (X_("midi_socket_small"))));
+                       midi_input_enable_button = manage (new StatefulToggleButton);
+                       midi_input_enable_button->set_name ("MixerMidiInputEnableButton");
+                       midi_input_enable_button->set_image (*img);
+                       midi_input_enable_button->signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_press), false);
+                       midi_input_enable_button->signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_release), false);
+                       ARDOUR_UI::instance()->set_tip (midi_input_enable_button, _("Enable/Disable MIDI input"));
+               } else {
+                       input_button_box.remove (*midi_input_enable_button);
+               }
+               /* get current state */
+               midi_input_status_changed ();
+               input_button_box.pack_start (*midi_input_enable_button, false, false);
+               /* follow changes */
+               midi_track()->InputActiveChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::midi_input_status_changed, this), gui_context());
+       } else {
+               if (midi_input_enable_button) {
+                       /* removal from the container will delete it */
+                       input_button_box.remove (*midi_input_enable_button);
+                       midi_input_enable_button = 0;
+               }
+       }
+
        if (is_audio_track()) {
                boost::shared_ptr<AudioTrack> at = audio_track();
                at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::map_frozen, this), gui_context());
@@ -410,38 +452,22 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        if (is_track ()) {
-               
-               button_table.attach (*rec_enable_button, 0, 2, 2, 3);
+
+               below_panner_box.pack_start (*rec_enable_button);
                rec_enable_button->set_sensitive (_session->writable());
                rec_enable_button->show();
 
        } else {
-               
+
                /* non-master bus */
 
                if (!_route->is_master()) {
-                       button_table.attach (*show_sends_button, 0, 2, 2, 3);
+                       below_panner_box.pack_start (*show_sends_button);
                        show_sends_button->show();
                }
        }
 
-       switch (_route->meter_point()) {
-       case MeterInput:
-               meter_point_label.set_text (_("input"));
-               break;
-
-       case MeterPreFader:
-               meter_point_label.set_text (_("pre"));
-               break;
-
-       case MeterPostFader:
-               meter_point_label.set_text (_("post"));
-               break;
-
-       case MeterCustom:
-               meter_point_label.set_text (_("custom"));
-               break;
-       }
+       meter_point_label.set_text (meter_point_string (_route->meter_point()));
 
        delete route_ops_menu;
        route_ops_menu = 0;
@@ -449,8 +475,8 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        _route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context());
        _route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context());
 
-       if (_route->panner()) {
-               _route->panner()->Changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::connect_to_pan, this), gui_context());
+       if (_route->panner_shell()) {
+               _route->panner_shell()->Changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::connect_to_pan, this), gui_context());
        }
 
        if (is_audio_track()) {
@@ -458,20 +484,18 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        _route->comment_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::comment_changed, this, _1), gui_context());
-       _route->gui_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::route_gui_changed, this, _1, _2), gui_context());
 
        set_stuff_from_route ();
 
        /* now force an update of all the various elements */
 
        mute_changed (0);
-        update_solo_display ();
+       update_solo_display ();
        name_changed ();
        comment_changed (0);
        route_group_changed ();
 
        connect_to_pan ();
-
        panners.setup_pan ();
 
        update_diskstream_display ();
@@ -496,15 +520,13 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        middle_button_table.show();
        bottom_button_table.show();
        gpm.show_all ();
-       gain_meter_alignment.show ();
        gain_unit_button.show();
        gain_unit_label.show();
        meter_point_button.show();
        meter_point_label.show();
        diskstream_button.show();
        diskstream_label.show();
-       input_button.show();
-       input_label.show();
+       input_button_box.show_all();
        output_button.show();
        output_label.show();
        name_label.show();
@@ -518,25 +540,11 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 void
 MixerStrip::set_stuff_from_route ()
 {
-       XMLProperty *prop;
-
-       ensure_xml_node ();
-
        /* if width is not set, it will be set by the MixerUI or editor */
 
-       if ((prop = xml_node->property ("strip-width")) != 0) {
-               set_width_enum (Width (string_2_enum (prop->value(), _width)), this);
-       }
-
-       if ((prop = xml_node->property ("shown-mixer")) != 0) {
-               if (prop->value() == "no") {
-                       _marked_for_display = false;
-               } else {
-                       _marked_for_display = true;
-               }
-       } else {
-               /* backwards compatibility */
-               _marked_for_display = true;
+       string str = gui_property ("strip-width");
+       if (!str.empty()) {
+               set_width_enum (Width (string_2_enum (str, _width)), this);
        }
 }
 
@@ -552,12 +560,10 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
        _width_owner = owner;
 
-       ensure_xml_node ();
-
        _width = w;
 
        if (_width_owner == this) {
-               xml_node->add_property ("strip-width", enum_2_string (_width));
+               set_gui_property ("strip-width", enum_2_string (_width));
        }
 
        set_button_names ();
@@ -580,6 +586,9 @@ MixerStrip::set_width_enum (Width w, void* owner)
                                        panners.astate_string(_route->panner()->automation_state()));
                }
 
+               _iso_label->show ();
+               _safe_label->show ();
+
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
                set_size_request (-1, -1);
                break;
@@ -601,13 +610,16 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        panners.short_astate_string(_route->panner()->automation_state()));
                }
 
+               _iso_label->hide ();
+               _safe_label->hide ();
+
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
                set_size_request (max (50, gpm.get_gm_width()), -1);
                break;
        }
 
        processor_box.set_width (w);
-       
+
        update_input_display ();
        update_output_display ();
        route_group_changed ();
@@ -620,22 +632,26 @@ MixerStrip::set_packed (bool yn)
 {
        _packed = yn;
 
-       ensure_xml_node ();
-
        if (_packed) {
-               xml_node->add_property ("shown-mixer", "yes");
+               set_gui_property ("visible", true);
        } else {
-               xml_node->add_property ("shown-mixer", "no");
+               set_gui_property ("visible", false);
        }
 }
 
 
+struct RouteCompareByName {
+       bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
+               return a->name().compare (b->name()) < 0;
+       }
+};
+
 gint
 MixerStrip::output_press (GdkEventButton *ev)
 {
-        using namespace Menu_Helpers;
+       using namespace Menu_Helpers;
        if (!_session->engine().connected()) {
-               MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
+               MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
                msg.run ();
                return true;
        }
@@ -661,7 +677,7 @@ MixerStrip::output_press (GdkEventButton *ev)
                boost::shared_ptr<ARDOUR::BundleList> b = _session->bundles ();
 
                /* give user bundles first chance at being in the menu */
-               
+
                for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
                        if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
                                maybe_add_bundle_to_output_menu (*i, current);
@@ -673,9 +689,11 @@ MixerStrip::output_press (GdkEventButton *ev)
                                maybe_add_bundle_to_output_menu (*i, current);
                        }
                }
-               
+
                boost::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes ();
-               for (ARDOUR::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
+               RouteList copy = *routes;
+               copy.sort (RouteCompareByName ());
+               for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
                        maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current);
                }
 
@@ -689,7 +707,7 @@ MixerStrip::output_press (GdkEventButton *ev)
        }
 
        default:
-               break;
+               break;
        }
        return TRUE;
 }
@@ -698,7 +716,7 @@ void
 MixerStrip::edit_output_configuration ()
 {
        if (output_selector == 0) {
-               
+
                boost::shared_ptr<Send> send;
                boost::shared_ptr<IO> output;
 
@@ -707,11 +725,11 @@ MixerStrip::edit_output_configuration ()
                                output = send->output();
                        } else {
                                output = _route->output ();
-                       } 
+                       }
                } else {
                        output = _route->output ();
                }
-               
+
                output_selector = new IOSelectorWindow (_session, output);
        }
 
@@ -746,12 +764,12 @@ MixerStrip::input_press (GdkEventButton *ev)
        citems.clear();
 
        if (!_session->engine().connected()) {
-               MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
+               MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
                msg.run ();
                return true;
        }
 
-       if (_session->actively_recording() && _route->record_enabled()) 
+       if (_session->actively_recording() && _route->record_enabled())
                return true;
 
        switch (ev->button) {
@@ -771,7 +789,7 @@ MixerStrip::input_press (GdkEventButton *ev)
                boost::shared_ptr<ARDOUR::BundleList> b = _session->bundles ();
 
                /* give user bundles first chance at being in the menu */
-               
+
                for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
                        if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
                                maybe_add_bundle_to_input_menu (*i, current);
@@ -783,9 +801,11 @@ MixerStrip::input_press (GdkEventButton *ev)
                                maybe_add_bundle_to_input_menu (*i, current);
                        }
                }
-               
+
                boost::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes ();
-               for (ARDOUR::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
+               RouteList copy = *routes;
+               copy.sort (RouteCompareByName ());
+               for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
                        maybe_add_bundle_to_input_menu ((*i)->output()->bundle(), current);
                }
 
@@ -798,7 +818,7 @@ MixerStrip::input_press (GdkEventButton *ev)
                break;
        }
        default:
-               break;
+               break;
        }
        return TRUE;
 }
@@ -888,7 +908,7 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
        }
 
        output_menu_bundles.push_back (b);
-       
+
        MenuList& citems = output_menu.items();
 
        std::string n = b->name ();
@@ -912,7 +932,7 @@ MixerStrip::update_diskstream_display ()
                        input_selector->hide_all ();
                }
 
-               show_route_color ();
+               route_color_changed ();
 
        } else {
 
@@ -932,12 +952,12 @@ MixerStrip::connect_to_pan ()
                return;
        }
 
-        boost::shared_ptr<Pannable> p = _route->pannable ();
+       boost::shared_ptr<Pannable> p = _route->pannable ();
 
-        p->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context());
-        p->automation_style_changed.connect (panstyle_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context());
+       p->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context());
+       p->automation_style_changed.connect (panstyle_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context());
 
-       panners.panner_changed (this);
+       panners.panshell_changed ();
 }
 
 
@@ -1023,7 +1043,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);
                io_connection_count = 0;
@@ -1196,12 +1216,12 @@ MixerStrip::comment_editor_done_editing ()
        ignore_toggle = true;
        _comment_menu_item->set_active (false);
        ignore_toggle = false;
-       
+
        string const str = comment_area->get_buffer()->get_text();
        if (str == _route->comment ()) {
                return;
        }
-       
+
        _route->set_comment (str, this);
 }
 
@@ -1211,7 +1231,7 @@ MixerStrip::toggle_comment ()
        if (ignore_toggle) {
                return;
        }
-       
+
        if (comment_window == 0) {
                setup_comment_editor ();
        }
@@ -1221,25 +1241,25 @@ MixerStrip::toggle_comment ()
                return;
        }
 
-       comment_window->show();
+       string title;
+       title = _route->name();
+       title += _(": comment editor");
+
+       comment_window->set_title (title);
        comment_window->present();
 }
 
 void
 MixerStrip::setup_comment_editor ()
 {
-       string title;
-       title = _route->name();
-       title += _(": comment editor");
-
-       comment_window = new ArdourDialog (title, false);
+       comment_window = new ArdourDialog ("", false); // title will be reset to show route
        comment_window->set_position (Gtk::WIN_POS_MOUSE);
        comment_window->set_skip_taskbar_hint (true);
        comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing));
+       comment_window->set_default_size (400, 200);
 
        comment_area = manage (new TextView());
        comment_area->set_name ("MixerTrackCommentArea");
-       comment_area->set_size_request (110, 178);
        comment_area->set_wrap_mode (WRAP_WORD);
        comment_area->set_editable (true);
        comment_area->get_buffer()->set_text (_route->comment());
@@ -1263,19 +1283,6 @@ MixerStrip::comment_changed (void *src)
        }
 }
 
-/** Set the route group for this strip's route, or remove it from its current group.
- *  @param rg New RouteGroup, or 0.
- */
-void
-MixerStrip::set_route_group (RouteGroup *rg)
-{
-       if (rg) {
-               rg->add (_route);
-       } else if (_route->route_group ()) {
-               _route->route_group()->remove (_route);
-       }
-}
-
 bool
 MixerStrip::select_route_group (GdkEventButton *ev)
 {
@@ -1292,10 +1299,12 @@ MixerStrip::select_route_group (GdkEventButton *ev)
                        plist->add (Properties::solo, true);
 
                        group_menu = new RouteGroupMenu (_session, plist);
-                       group_menu->GroupSelected.connect (sigc::mem_fun (*this, &MixerStrip::set_route_group));
                }
 
-               group_menu->popup (1, ev->time);
+               WeakRouteList r;
+               r.push_back (route ());
+               group_menu->build (r);
+               group_menu->menu()->popup (1, ev->time);
        }
 
        return true;
@@ -1309,7 +1318,7 @@ MixerStrip::route_group_changed ()
        RouteGroup *rg = _route->route_group();
 
        if (rg) {
-                group_label.set_text (PBD::short_version (rg->name(), 5));
+               group_label.set_text (PBD::short_version (rg->name(), 5));
        } else {
                switch (_width) {
                case Wide:
@@ -1322,31 +1331,18 @@ MixerStrip::route_group_changed ()
        }
 }
 
-
-void
-MixerStrip::route_gui_changed (string what_changed, void*)
-{
-       ENSURE_GUI_THREAD (*this, &MixerStrip::route_gui_changed, what_changed, ignored)
-
-       if (what_changed == "color") {
-               if (set_color_from_route () == 0) {
-                       show_route_color ();
-               }
-       }
-}
-
 void
-MixerStrip::show_route_color ()
+MixerStrip::route_color_changed ()
 {
        name_button.modify_bg (STATE_NORMAL, color());
        top_event_box.modify_bg (STATE_NORMAL, color());
-       route_active_changed ();
+       reset_strip_style ();
 }
 
 void
 MixerStrip::show_passthru_color ()
 {
-       route_active_changed ();
+       reset_strip_style ();
 }
 
 void
@@ -1364,9 +1360,10 @@ MixerStrip::build_route_ops_menu ()
        items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename)));
        rename_menu_item = &items.back();
        items.push_back (SeparatorElem());
-       items.push_back (CheckMenuElem (_("Active"), sigc::mem_fun (*this, &RouteUI::toggle_route_active)));
-       route_active_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
-       route_active_menu_item->set_active (_route->active());
+       items.push_back (CheckMenuElem (_("Active")));
+       CheckMenuItem* i = dynamic_cast<CheckMenuItem *> (&items.back());
+       i->set_active (_route->active());
+       i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::set_route_active), !_route->active(), false));
 
        items.push_back (SeparatorElem());
 
@@ -1380,10 +1377,10 @@ MixerStrip::build_route_ops_menu ()
        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)));
-        }
+       }
 
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route)));
+       items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), false)));
 }
 
 gboolean
@@ -1397,8 +1394,8 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
                route_ops_menu->popup (1, ev->time);
 
        } else if (ev->button == 1) {
-                revert_to_default_display ();
-        }
+               revert_to_default_display ();
+       }
 
        return false;
 }
@@ -1406,9 +1403,8 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
 void
 MixerStrip::list_route_operations ()
 {
-       if (route_ops_menu == 0) {
-               build_route_ops_menu ();
-       }
+       delete route_ops_menu;
+       build_route_ops_menu ();
 }
 
 void
@@ -1433,7 +1429,7 @@ MixerStrip::name_changed ()
                RouteUI::property_changed (PropertyChange (ARDOUR::Properties::name));
                break;
        case Narrow:
-               name_label.set_text (PBD::short_version (_route->name(), 5));
+               name_label.set_text (PBD::short_version (_route->name(), 5));
                break;
        }
 }
@@ -1515,13 +1511,6 @@ MixerStrip::hide_processor_editor (boost::weak_ptr<Processor> p)
        }
 }
 
-void
-MixerStrip::route_active_changed ()
-{
-       RouteUI::route_active_changed ();
-       reset_strip_style ();
-}
-
 void
 MixerStrip::reset_strip_style ()
 {
@@ -1530,7 +1519,7 @@ MixerStrip::reset_strip_style ()
                gpm.set_fader_name ("SendStripBase");
 
        } else {
-               
+
                if (is_midi_track()) {
                        if (_route->active()) {
                                set_name ("MidiTrackStripBase");
@@ -1558,7 +1547,7 @@ MixerStrip::reset_strip_style ()
                                gpm.set_meter_strip_name ("AudioBusMetricsInactive");
                        }
                        gpm.set_fader_name ("AudioBusFader");
-                       
+
                        /* (no MIDI busses yet) */
                }
        }
@@ -1580,30 +1569,38 @@ MixerStrip::engine_running ()
 {
 }
 
-/** Called when the metering point has changed */
-void
-MixerStrip::meter_changed ()
+string
+MixerStrip::meter_point_string (MeterPoint mp)
 {
-       ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed)
-
-       switch (_route->meter_point()) {
+       switch (mp) {
        case MeterInput:
-               meter_point_label.set_text (_("input"));
+               return _("in");
                break;
 
        case MeterPreFader:
-               meter_point_label.set_text (_("pre"));
+               return _("pre");
                break;
 
        case MeterPostFader:
-               meter_point_label.set_text (_("post"));
+               return _("post");
+               break;
+
+       case MeterOutput:
+               return _("out");
                break;
 
        case MeterCustom:
-               meter_point_label.set_text (_("custom"));
+       default:
+               return _("custom");
                break;
        }
+}
 
+/** Called when the metering point has changed */
+void
+MixerStrip::meter_changed ()
+{
+       meter_point_label.set_text (meter_point_string (_route->meter_point()));
        gpm.setup_meters ();
        // reset peak when meter point changes
        gpm.reset_peak_display();
@@ -1657,14 +1654,16 @@ MixerStrip::drop_send ()
        send_gone_connection.disconnect ();
        input_button.set_sensitive (true);
        output_button.set_sensitive (true);
-        group_button.set_sensitive (true);
-        set_invert_sensitive (true);
-        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);
+       group_button.set_sensitive (true);
+       set_invert_sensitive (true);
+       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);
 }
 
 void
@@ -1689,18 +1688,20 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
        gain_meter().set_controls (_route, send->meter(), send->amp());
        gain_meter().setup_meters ();
 
-       panner_ui().set_panner (_current_delivery->panner());
+       panner_ui().set_panner (_current_delivery->panner_shell(), _current_delivery->panner());
        panner_ui().setup_pan ();
 
        input_button.set_sensitive (false);
-        group_button.set_sensitive (false);
-        set_invert_sensitive (false);
-        meter_point_button.set_sensitive (false);
-        mute_button->set_sensitive (false);
-        solo_button->set_sensitive (false);
-        rec_enable_button->set_sensitive (false);
-        solo_isolated_led->set_sensitive (false);
-        solo_safe_led->set_sensitive (false);
+       group_button.set_sensitive (false);
+       set_invert_sensitive (false);
+       meter_point_button.set_sensitive (false);
+       mute_button->set_sensitive (false);
+       solo_button->set_sensitive (false);
+       rec_enable_button->set_sensitive (false);
+       solo_isolated_led->set_sensitive (false);
+       solo_safe_led->set_sensitive (false);
+       monitor_input_button->set_sensitive (false);
+       monitor_disk_button->set_sensitive (false);
 
        if (boost::dynamic_pointer_cast<InternalSend>(send)) {
                output_button.set_sensitive (false);
@@ -1723,7 +1724,7 @@ MixerStrip::revert_to_default_display ()
        gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp());
        gain_meter().setup_meters ();
 
-       panner_ui().set_panner (_route->main_outs()->panner());
+       panner_ui().set_panner (_route->main_outs()->panner_shell(), _route->main_outs()->panner());
        panner_ui().setup_pan ();
 
        reset_strip_style ();
@@ -1732,46 +1733,50 @@ MixerStrip::revert_to_default_display ()
 void
 MixerStrip::set_button_names ()
 {
-        switch (_width) {
+       switch (_width) {
        case Wide:
                rec_enable_button_label.set_text (_("Rec"));
                mute_button_label.set_text (_("Mute"));
-                if (_route && _route->solo_safe()) {
-                        solo_button_label.set_text (X_("!"));
-                } else {
-                        if (!Config->get_solo_control_is_listen_control()) {
-                                solo_button_label.set_text (_("Solo"));
-                        } else {
-                                switch (Config->get_listen_position()) {
-                                case AfterFaderListen:
-                                        solo_button_label.set_text (_("AFL"));
-                                        break;
-                                case PreFaderListen:
-                                        solo_button_label.set_text (_("PFL"));
-                                        break;
-                                }
-                        }
-                }
+               monitor_input_button_label.set_text (_("In"));
+               monitor_disk_button_label.set_text (_("Disk"));
+               if (_route && _route->solo_safe()) {
+                       solo_button_label.set_text (X_("!"));
+               } else {
+                       if (!Config->get_solo_control_is_listen_control()) {
+                               solo_button_label.set_text (_("Solo"));
+                       } else {
+                               switch (Config->get_listen_position()) {
+                               case AfterFaderListen:
+                                       solo_button_label.set_text (_("AFL"));
+                                       break;
+                               case PreFaderListen:
+                                       solo_button_label.set_text (_("PFL"));
+                                       break;
+                               }
+                       }
+               }
                break;
 
        default:
                rec_enable_button_label.set_text (_("R"));
                mute_button_label.set_text (_("M"));
-                if (_route && _route->solo_safe()) {
-                        solo_button_label.set_text (X_("!"));
-                        if (!Config->get_solo_control_is_listen_control()) {
-                                solo_button_label.set_text (_("S"));
-                        } else {
-                                switch (Config->get_listen_position()) {
-                                case AfterFaderListen:
-                                        solo_button_label.set_text (_("A"));
-                                        break;
-                                case PreFaderListen:
-                                        solo_button_label.set_text (_("P"));
-                                        break;
-                                }
-                        }
-                }
+               monitor_input_button_label.set_text (_("I"));
+               monitor_disk_button_label.set_text (_("D"));
+               if (_route && _route->solo_safe()) {
+                       solo_button_label.set_text (X_("!"));
+                       if (!Config->get_solo_control_is_listen_control()) {
+                               solo_button_label.set_text (_("S"));
+                       } else {
+                               switch (Config->get_listen_position()) {
+                               case AfterFaderListen:
+                                       solo_button_label.set_text (_("A"));
+                                       break;
+                               case PreFaderListen:
+                                       solo_button_label.set_text (_("P"));
+                                       break;
+                               }
+                       }
+               }
                break;
 
        }
@@ -1797,7 +1802,6 @@ MixerStrip::on_key_press_event (GdkEventKey* ev)
                break;
 
        case GDK_r:
-                cerr << "Stole that r\n";
                rec_enable_press (&fake);
                return true;
                break;
@@ -1850,7 +1854,6 @@ MixerStrip::on_key_release_event (GdkEventKey* ev)
                break;
 
        case GDK_r:
-                cerr << "Stole that r\n";
                rec_enable_release (&fake);
                return true;
                break;
@@ -1874,7 +1877,7 @@ MixerStrip::on_key_release_event (GdkEventKey* ev)
 bool
 MixerStrip::on_enter_notify_event (GdkEventCrossing*)
 {
-        Keyboard::magic_widget_grab_focus ();
+       Keyboard::magic_widget_grab_focus ();
        return false;
 }
 
@@ -1896,3 +1899,61 @@ MixerStrip::plugin_selector()
 {
        return _mixer.plugin_selector();
 }
+
+void
+MixerStrip::hide_things ()
+{
+       processor_box.hide_things ();
+}
+
+bool
+MixerStrip::input_active_button_press (GdkEventButton*)
+{
+       /* nothing happens on press */
+       return true;
+}
+
+bool
+MixerStrip::input_active_button_release (GdkEventButton* ev)
+{
+       boost::shared_ptr<MidiTrack> mt = midi_track ();
+
+       if (!mt) {
+               return true;
+       }
+
+       if (mt->input_active()) {
+               if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
+                       /* turn all other tracks using this input off */
+                       _session->set_exclusive_input_active (mt, false);
+               } else {
+                       mt->set_input_active (false);
+               }
+
+       } else {
+               if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
+                       /* turn all other tracks using this input on */
+                       _session->set_exclusive_input_active (mt, true);
+               } else {
+                       mt->set_input_active (true);
+               }
+       }
+
+       return true;
+}
+
+void
+MixerStrip::midi_input_status_changed ()
+{
+       if (midi_input_enable_button) {
+               boost::shared_ptr<MidiTrack> mt = midi_track ();
+               assert (mt);
+               midi_input_enable_button->set_active (mt->input_active ());
+       }
+}
+
+string
+MixerStrip::state_id () const
+{
+       return string_compose ("strip %1", _route->id().to_s());
+}