add VU and IEC meter DSP (from jmeters)
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 0d40d6fadd80d020650fb17c69a84c57960f1501..dec072b067fa68f430a95677e82c0d2f896760bb 100644 (file)
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/bindable_button.h>
 
-#include "ardour/ardour.h"
-#include "ardour/amp.h"
-#include "ardour/session.h"
+#include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/internal_send.h"
-#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/port.h"
 #include "ardour/profile.h"
-#include "ardour/ladspa_plugin.h"
+#include "ardour/route.h"
+#include "ardour/route_group.h"
+#include "ardour/send.h"
+#include "ardour/session.h"
+#include "ardour/types.h"
 #include "ardour/user_bundle.h"
-#include "ardour/port.h"
 
 #include "ardour_ui.h"
 #include "ardour_window.h"
@@ -65,6 +62,7 @@
 #include "utils.h"
 #include "gui_thread.h"
 #include "route_group_menu.h"
+#include "meter_patterns.h"
 
 #include "i18n.h"
 
@@ -73,6 +71,7 @@ using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace std;
+using namespace ArdourMeter;
 
 int MixerStrip::scrollbar_height = 0;
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
@@ -112,7 +111,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
        , RouteUI (sess)
        , _mixer(mx)
        , _mixer_owned (in_mixer)
-       , processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer)
+       , processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer)
        , gpm (sess, 250)
        , panners (sess)
        , button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
@@ -157,16 +156,15 @@ MixerStrip::init ()
        ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
 
        input_button.set_text (_("Input"));
-       ARDOUR_UI::instance()->set_tip (&input_button, _("Button 1 to choose inputs from a port matrix, button 3 to select inputs from a menu"), "");
        input_button.set_name ("mixer strip button");
+       input_button.set_size_request (-1, 20);
        input_button_box.pack_start (input_button, true, true);
 
        output_button.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"), "");
        output_button.set_name ("mixer strip button");
        Gtkmm2ext::set_size_request_to_display_given_text (output_button, longest_label.c_str(), 4, 4);
 
-       ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Select metering point"), "");
+       ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Click to select metering point"), "");
        meter_point_button.set_name ("mixer strip button");
 
        /* TRANSLATORS: this string should be longest of the strings
@@ -211,7 +209,7 @@ MixerStrip::init ()
         top_button_table.attach (*monitor_disk_button, 1, 2, 0, 1);
        top_button_table.show ();
 
-       rec_solo_table.set_homogeneous (false);
+       rec_solo_table.set_homogeneous (true);
        rec_solo_table.set_row_spacings (2);
        rec_solo_table.set_col_spacings (2);
         rec_solo_table.attach (*solo_isolated_led, 1, 2, 0, 1);
@@ -219,7 +217,7 @@ MixerStrip::init ()
         rec_solo_table.show ();
 
        button_table.set_homogeneous (false);
-       button_table.set_spacings (0);
+       button_table.set_spacings (2);
 
        if (solo_isolated_led) {
                button_size_group->add_widget (*solo_isolated_led);
@@ -244,12 +242,18 @@ MixerStrip::init ()
        middle_button_table.set_homogeneous (true);
        middle_button_table.set_spacings (2);
 
-       bottom_button_table.set_col_spacings (0);
+       bottom_button_table.set_spacings (2);
        bottom_button_table.set_homogeneous (true);
-       bottom_button_table.attach (group_button, 0, 1, 0, 1);
-
-       name_button.set_name ("mixer strip name button");
+//     bottom_button_table.attach (group_button, 0, 1, 0, 1);
+       bottom_button_table.attach (gpm.gain_automation_state_button, 0, 1, 0, 1);
+
+       name_button.set_name ("mixer strip button");
+       name_button.set_text (" "); /* non empty text, forces creation of the layout */
+       name_button.set_text (""); /* back to empty */
+       name_button.layout()->set_ellipsize (Pango::ELLIPSIZE_END);
+       name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized));
        Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
+       name_button.set_size_request (-1, 20);
 
        ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
        group_button.set_name ("mixer strip button");
@@ -274,13 +278,14 @@ MixerStrip::init ()
 
        whvbox.pack_start (width_hide_box, true, true);
 
+       global_vpacker.set_spacing (2);
        global_vpacker.pack_start (whvbox, 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 (top_button_table, Gtk::PACK_SHRINK, 2);
-       global_vpacker.pack_start (rec_solo_table, Gtk::PACK_SHRINK, 2);
-       global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK, 2);
+       global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (rec_solo_table, 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);
@@ -352,7 +357,7 @@ MixerStrip::init ()
 
        parameter_changed (X_("mixer-strip-visibility"));
 
-       Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, ui_bind (&MixerStrip::parameter_changed, this, _1), gui_context());
+       Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context());
 
        gpm.LevelMeterButtonPress.connect_same_thread (_level_meter_connection, boost::bind (&MixerStrip::level_meter_button_press, this, _1));
 }
@@ -377,10 +382,13 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                rec_solo_table.remove (*show_sends_button);
        }
 
-       processor_box.set_route (rt);
-
        RouteUI::set_route (rt);
 
+       /* ProcessorBox needs access to _route so that it can read
+          GUI object state.
+       */
+       processor_box.set_route (rt);
+
        /* map the current state */
 
        mute_changed (0);
@@ -394,6 +402,22 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        revert_to_default_display ();
 
+       /* 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);
+       }
+       if (gpm.gain_display.get_parent()) {
+               gpm.gain_display.get_parent()->remove (gpm.gain_display);
+       }
+
+       gpm.set_type (rt->meter_type());
+       
+       middle_button_table.attach (gpm.gain_display,0,1,1,2, EXPAND|FILL, EXPAND);
+       middle_button_table.attach (gpm.peak_display,1,2,1,2);
+
        if (solo_button->get_parent()) {
                middle_button_table.remove (*solo_button);
        }
@@ -465,12 +489,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::map_frozen, this), gui_context());
        }
 
-       if (has_audio_outputs ()) {
-               panners.show_all ();
-       } else {
-               panners.hide_all ();
-       }
-
        if (is_track ()) {
 
                rec_solo_table.attach (*rec_enable_button, 0, 1, 0, 2);
@@ -493,6 +511,8 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        route_ops_menu = 0;
 
        _route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context());
+       _route->input()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_output_display, this), gui_context());
+       _route->output()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_output_display, this), gui_context());
        _route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context());
 
        if (_route->panner_shell()) {
@@ -503,7 +523,8 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                audio_track()->DiskstreamChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::diskstream_changed, this), gui_context());
        }
 
-       _route->comment_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::comment_changed, this, _1), gui_context());
+       _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::comment_changed, this, _1), gui_context());
+       _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::property_changed, this, _1), gui_context());
 
        set_stuff_from_route ();
 
@@ -518,6 +539,12 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        connect_to_pan ();
        panners.setup_pan ();
 
+       if (has_audio_outputs ()) {
+               panners.show_all ();
+       } else {
+               panners.hide_all ();
+       }
+
        update_diskstream_display ();
        update_input_display ();
        update_output_display ();
@@ -532,6 +559,8 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        gpm.reset_peak_display ();
+       gpm.gain_display.show ();
+       gpm.peak_display.show ();
 
        width_button.show();
        width_hide_box.show();
@@ -548,6 +577,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        name_button.show();
        _comment_button.show();
        group_button.show();
+       gpm.gain_automation_state_button.show();
 
        parameter_changed ("mixer-strip-visibility");
 
@@ -587,13 +617,15 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
        switch (w) {
        case Wide:
+
                if (show_sends_button)  {
-                       show_sends_button->set_text (_("Sends"));
+                       show_sends_button->set_text (_("Aux\nSends"));
+                       show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER);
                }
 
-               ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
+               gpm.gain_automation_style_button.set_text (
                                gpm.astyle_string(gain_automation->automation_style()));
-               ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
+               gpm.gain_automation_state_button.set_text (
                                gpm.astate_string(gain_automation->automation_state()));
 
                if (_route->panner()) {
@@ -603,22 +635,22 @@ MixerStrip::set_width_enum (Width w, void* owner)
                                        panners.astate_string(_route->panner()->automation_state()));
                }
 
-               solo_isolated_led->set_text (_("iso"));
-               solo_safe_led->set_text (_("lock"));
 
-               Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
+               Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
                set_size_request (-1, -1);
                break;
 
        case Narrow:
+
                if (show_sends_button) {
                        show_sends_button->set_text (_("Snd"));
                }
 
-               ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
+               gpm.gain_automation_style_button.set_text (
                                gpm.short_astyle_string(gain_automation->automation_style()));
-               ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
+               gpm.gain_automation_state_button.set_text (
                                gpm.short_astate_string(gain_automation->automation_state()));
+               gain_meter().setup_meters (); // recalc meter width
 
                if (_route->panner()) {
                        ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (
@@ -626,11 +658,8 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (
                        panners.short_astate_string(_route->panner()->automation_state()));
                }
-               
-               solo_isolated_led->set_text (_("i"));
-               solo_safe_led->set_text (_("L"));
 
-               Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
+               Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
                set_size_request (max (50, gpm.get_gm_width()), -1);
                break;
        }
@@ -767,6 +796,8 @@ MixerStrip::edit_output_configuration ()
        } else {
                output_selector->present ();
        }
+
+       output_selector->set_keep_above (true);
 }
 
 void
@@ -781,6 +812,8 @@ MixerStrip::edit_input_configuration ()
        } else {
                input_selector->present ();
        }
+
+       input_selector->set_keep_above (true);
 }
 
 gint
@@ -865,7 +898,7 @@ MixerStrip::input_press (GdkEventButton *ev)
 }
 
 void
-MixerStrip::bundle_input_toggled (boost::shared_ptr<ARDOUR::Bundle> c)
+MixerStrip::bundle_input_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
 {
        if (ignore_toggle) {
                return;
@@ -874,14 +907,14 @@ MixerStrip::bundle_input_toggled (boost::shared_ptr<ARDOUR::Bundle> c)
        ARDOUR::BundleList current = _route->input()->bundles_connected ();
 
        if (std::find (current.begin(), current.end(), c) == current.end()) {
-               _route->input()->connect_ports_to_bundle (c, this);
+               _route->input()->connect_ports_to_bundle (c, true, this);
        } else {
                _route->input()->disconnect_ports_from_bundle (c, this);
        }
 }
 
 void
-MixerStrip::bundle_output_toggled (boost::shared_ptr<ARDOUR::Bundle> c)
+MixerStrip::bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
 {
        if (ignore_toggle) {
                return;
@@ -890,14 +923,14 @@ MixerStrip::bundle_output_toggled (boost::shared_ptr<ARDOUR::Bundle> c)
        ARDOUR::BundleList current = _route->output()->bundles_connected ();
 
        if (std::find (current.begin(), current.end(), c) == current.end()) {
-               _route->output()->connect_ports_to_bundle (c, this);
+               _route->output()->connect_ports_to_bundle (c, true, this);
        } else {
                _route->output()->disconnect_ports_from_bundle (c, this);
        }
 }
 
 void
-MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const & current)
+MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const& /*current*/)
 {
        using namespace Menu_Helpers;
 
@@ -921,17 +954,11 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR:
        std::string n = b->name ();
        replace_all (n, "_", " ");
 
-       citems.push_back (CheckMenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_input_toggled), b)));
-
-       if (std::find (current.begin(), current.end(), b) != current.end()) {
-               ignore_toggle = true;
-               dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
-               ignore_toggle = false;
-       }
+       citems.push_back (MenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_input_chosen), b)));
 }
 
 void
-MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const & current)
+MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const& /*current*/)
 {
        using namespace Menu_Helpers;
 
@@ -955,13 +982,7 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
        std::string n = b->name ();
        replace_all (n, "_", " ");
 
-       citems.push_back (CheckMenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_toggled), b)));
-
-       if (std::find (current.begin(), current.end(), b) != current.end()) {
-               ignore_toggle = true;
-               dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
-               ignore_toggle = false;
-       }
+       citems.push_back (MenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_chosen), b)));
 }
 
 void
@@ -1070,14 +1091,15 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
        ostringstream tooltip;
        char * tooltip_cstr;
 
-       tooltip << route->name();
-
        if (for_input) {
                io_count = route->n_inputs().n_total();
+               tooltip << string_compose (_("<b>INPUT</b> to %1"), Glib::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()));
        }
 
+
        for (io_index = 0; io_index < io_count; ++io_index) {
                if (for_input) {
                        port = route->input()->nth (io_index);
@@ -1094,9 +1116,9 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
                                string& connection_name (*i);
 
                                if (io_connection_count == 0) {
-                                       tooltip << endl << port->name().substr(port->name().find("/") + 1) << " -> " << connection_name;
+                                       tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) << " -> " << Glib::Markup::escape_text(connection_name);
                                } else {
-                                       tooltip << ", " << connection_name;
+                                       tooltip << ", " << Glib::Markup::escape_text(connection_name);
                                }
 
                                if (connection_name.find("ardour:") == 0) {
@@ -1162,7 +1184,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
        }
 
        if (each_io_has_one_connection) {
-               if ((total_connection_count == ardour_connection_count)) {
+               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("/");
@@ -1196,7 +1218,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
        switch (width) {
        case Wide:
-               label_string = label.str().substr(0, 6);
+               label_string = label.str().substr(0, 7);
                break;
        case Narrow:
                label_string = label.str().substr(0, 3);
@@ -1215,6 +1237,13 @@ MixerStrip::update_input_display ()
 {
        update_io_button (_route, _width, true);
        panners.setup_pan ();
+
+       if (has_audio_outputs ()) {
+               panners.show_all ();
+       } else {
+               panners.hide_all ();
+       }
+
 }
 
 void
@@ -1223,6 +1252,12 @@ MixerStrip::update_output_display ()
        update_io_button (_route, _width, false);
        gpm.setup_meters ();
        panners.setup_pan ();
+
+       if (has_audio_outputs ()) {
+               panners.show_all ();
+       } else {
+               panners.hide_all ();
+       }
 }
 
 void
@@ -1330,7 +1365,6 @@ void
 MixerStrip::setup_comment_editor ()
 {
        comment_window = new ArdourWindow (""); // 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);
@@ -1431,7 +1465,9 @@ MixerStrip::build_route_ops_menu ()
        MenuList& items = route_ops_menu->items();
 
        items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::open_comment_editor)));
-       items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template)));
+       if (!_route->is_master()) {
+               items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template)));
+       }
        items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename)));
        rename_menu_item = &items.back();
 
@@ -1462,15 +1498,16 @@ MixerStrip::build_route_ops_menu ()
 gboolean
 MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
-       if (ev->button == 3) {
+       /* show menu for either button 1 or 3, so as not to confuse people
+          and also not hide stuff from them.
+       */
+
+       if (ev->button == 3 || ev->button == 1) {
                list_route_operations ();
 
                /* do not allow rename if the track is record-enabled */
                rename_menu_item->set_sensitive (!_route->record_enabled());
                route_ops_menu->popup (1, ev->time);
-
-       } else if (ev->button == 1) {
-               revert_to_default_display ();
        }
 
        return false;
@@ -1497,6 +1534,16 @@ MixerStrip::set_selected (bool yn)
        global_frame.queue_draw ();
 }
 
+void
+MixerStrip::property_changed (const PropertyChange& what_changed)
+{
+       RouteUI::property_changed (what_changed);
+
+       if (what_changed.contains (ARDOUR::Properties::name)) {
+               name_changed ();
+       }
+}
+
 void
 MixerStrip::name_changed ()
 {
@@ -1508,6 +1555,14 @@ MixerStrip::name_changed ()
                name_button.set_text (PBD::short_version (_route->name(), 5));
                break;
        }
+
+       ARDOUR_UI::instance()->set_tip (name_button, _route->name());
+}
+
+void
+MixerStrip::name_button_resized (Gtk::Allocation& alloc)
+{
+       name_button.layout()->set_width (alloc.get_width() * PANGO_SCALE);
 }
 
 bool
@@ -1520,11 +1575,11 @@ MixerStrip::width_button_pressed (GdkEventButton* ev)
        if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)) && _mixer_owned) {
                switch (_width) {
                case Wide:
-                       _mixer.set_strip_width (Narrow);
+                       _mixer.set_strip_width (Narrow, true);
                        break;
 
                case Narrow:
-                       _mixer.set_strip_width (Wide);
+                       _mixer.set_strip_width (Wide, true);
                        break;
                }
        } else {
@@ -1617,28 +1672,22 @@ MixerStrip::reset_strip_style ()
                if (is_midi_track()) {
                        if (_route->active()) {
                                set_name ("MidiTrackStripBase");
-                               gpm.set_meter_strip_name ("MidiTrackMetrics");
                        } else {
                                set_name ("MidiTrackStripBaseInactive");
-                               gpm.set_meter_strip_name ("MidiTrackMetricsInactive");
                        }
                        gpm.set_fader_name ("MidiTrackFader");
                } else if (is_audio_track()) {
                        if (_route->active()) {
                                set_name ("AudioTrackStripBase");
-                               gpm.set_meter_strip_name ("AudioTrackMetrics");
                        } else {
                                set_name ("AudioTrackStripBaseInactive");
-                               gpm.set_meter_strip_name ("AudioTrackMetricsInactive");
                        }
                        gpm.set_fader_name ("AudioTrackFader");
                } else {
                        if (_route->active()) {
                                set_name ("AudioBusStripBase");
-                               gpm.set_meter_strip_name ("AudioBusMetrics");
                        } else {
                                set_name ("AudioBusStripBaseInactive");
-                               gpm.set_meter_strip_name ("AudioBusMetricsInactive");
                        }
                        gpm.set_fader_name ("AudioBusFader");
 
@@ -1661,28 +1710,58 @@ MixerStrip::engine_running ()
 string
 MixerStrip::meter_point_string (MeterPoint mp)
 {
-       switch (mp) {
-       case MeterInput:
-               return _("in");
-               break;
-
-       case MeterPreFader:
-               return _("pre");
-               break;
-
-       case MeterPostFader:
-               return _("post");
-               break;
-
-       case MeterOutput:
-               return _("out");
+       switch (_width) {
+       case Wide:
+               switch (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");
+                       break;
+               }
                break;
-
-       case MeterCustom:
-       default:
-               return _("custom");
+       case Narrow:
+               switch (mp) {
+               case MeterInput:
+                       return _("in");
+                       break;
+                       
+               case MeterPreFader:
+                       return _("pr");
+                       break;
+                       
+               case MeterPostFader:
+                       return _("po");
+                       break;
+                       
+               case MeterOutput:
+                       return _("o");
+                       break;
+                       
+               case MeterCustom:
+               default:
+                       return _("c");
+                       break;
+               }
                break;
        }
+
+       return string();
 }
 
 /** Called when the metering point has changed */
@@ -1705,6 +1784,7 @@ MixerStrip::bus_send_display_changed (boost::shared_ptr<Route> send_to)
 
        if (send_to) {
                boost::shared_ptr<Send> send = _route->internal_send_for (send_to);
+
                if (send) {
                        show_send (send);
                } else {
@@ -1720,7 +1800,7 @@ MixerStrip::drop_send ()
 {
        boost::shared_ptr<Send> current_send;
 
-       if (_current_delivery && (current_send = boost::dynamic_pointer_cast<Send>(_current_delivery))) {
+       if (_current_delivery && ((current_send = boost::dynamic_pointer_cast<Send>(_current_delivery)) != 0)) {
                current_send->set_metering (false);
        }
 
@@ -1765,6 +1845,14 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
        panner_ui().set_panner (_current_delivery->panner_shell(), _current_delivery->panner());
        panner_ui().setup_pan ();
 
+       /* make sure the send has audio output */
+
+       if (_current_delivery->output() && _current_delivery->output()->n_ports().n_audio() > 0) {
+               panners.show_all ();
+       } else {
+               panners.hide_all ();
+       }
+
        input_button.set_sensitive (false);
        group_button.set_sensitive (false);
        set_invert_sensitive (false);
@@ -1798,6 +1886,12 @@ MixerStrip::revert_to_default_display ()
        panner_ui().set_panner (_route->main_outs()->panner_shell(), _route->main_outs()->panner());
        panner_ui().setup_pan ();
 
+       if (has_audio_outputs ()) {
+               panners.show_all ();
+       } else {
+               panners.hide_all ();
+       }
+
        reset_strip_style ();
 }
 
@@ -1812,26 +1906,24 @@ MixerStrip::set_button_names ()
                monitor_disk_button->set_text (_("Disk"));
 
                if (_route && _route->solo_safe()) {
-                       if (solo_safe_pixbuf == 0) {
-                               solo_safe_pixbuf = ::get_icon("solo-safe-icon");
-                       }
-                       solo_button->set_image (solo_safe_pixbuf);
-                       solo_button->set_text (string());
+                       solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
                } else {
-                       solo_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
-                       if (!Config->get_solo_control_is_listen_control()) {
-                               solo_button->set_text (_("Solo"));
-                       } else {
-                               switch (Config->get_listen_position()) {
-                               case AfterFaderListen:
-                                       solo_button->set_text (_("AFL"));
-                                       break;
-                               case PreFaderListen:
-                                       solo_button->set_text (_("PFL"));
-                                       break;
-                               }
+                       solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
+               }
+               if (!Config->get_solo_control_is_listen_control()) {
+                       solo_button->set_text (_("Solo"));
+               } else {
+                       switch (Config->get_listen_position()) {
+                       case AfterFaderListen:
+                               solo_button->set_text (_("AFL"));
+                               break;
+                       case PreFaderListen:
+                               solo_button->set_text (_("PFL"));
+                               break;
                        }
                }
+               solo_isolated_led->set_text (_("iso"));
+               solo_safe_led->set_text (_("lock"));
                break;
 
        default:
@@ -1839,34 +1931,37 @@ MixerStrip::set_button_names ()
                mute_button->set_text (_("M"));
                monitor_input_button->set_text (_("I"));
                monitor_disk_button->set_text (_("D"));
+
                if (_route && _route->solo_safe()) {
-                       solo_button->remove ();
-                       if (solo_safe_pixbuf == 0) {
-                               solo_safe_pixbuf =::get_icon("solo-safe-icon");
-                       }
-                       solo_button->set_image (solo_safe_pixbuf);
-                       solo_button->set_text (string());
+                       solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
                } else {
-                       solo_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
-                       if (!Config->get_solo_control_is_listen_control()) {
-                               solo_button->set_text (_("S"));
-                       } else {
-                               switch (Config->get_listen_position()) {
-                               case AfterFaderListen:
-                                       solo_button->set_text (_("A"));
-                                       break;
-                               case PreFaderListen:
-                                       solo_button->set_text (_("P"));
-                                       break;
-                               }
+                       solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
+               }
+               if (!Config->get_solo_control_is_listen_control()) {
+                       solo_button->set_text (_("S"));
+               } else {
+                       switch (Config->get_listen_position()) {
+                       case AfterFaderListen:
+                               solo_button->set_text (_("A"));
+                               break;
+                       case PreFaderListen:
+                               solo_button->set_text (_("P"));
+                               break;
                        }
                }
+
+               solo_isolated_led->set_text (_("i"));
+               solo_safe_led->set_text (_("L"));
                break;
+       }
 
+       if (_route) {
+               meter_point_button.set_text (meter_point_string (_route->meter_point()));
+       } else {
+               meter_point_button.set_text ("");
        }
 }
 
-
 PluginSelector*
 MixerStrip::plugin_selector()
 {
@@ -1895,22 +1990,12 @@ MixerStrip::input_active_button_release (GdkEventButton* ev)
                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);
-               }
+       boost::shared_ptr<RouteList> rl (new RouteList);
 
-       } 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);
-               }
-       }
+       rl->push_back (route());
+
+       _session->set_exclusive_input_active (rl, !mt->input_active(),
+                                             Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)));
 
        return true;
 }
@@ -2038,17 +2123,56 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev)
 
        RadioMenuItem::Group group;
 
-       add_level_meter_item (items, group, _("Input"), MeterInput);
-       add_level_meter_item (items, group, _("Pre-fader"), MeterPreFader);
-       add_level_meter_item (items, group, _("Post-fader"), MeterPostFader);
-       add_level_meter_item (items, group, _("Output"), MeterOutput);
-       add_level_meter_item (items, group, _("Custom"), MeterCustom);
+       _suspend_menu_callbacks = true;
+       add_level_meter_item_point (items, group, _("Input"), MeterInput);
+       add_level_meter_item_point (items, group, _("Pre-fader"), MeterPreFader);
+       add_level_meter_item_point (items, group, _("Post-fader"), MeterPostFader);
+       add_level_meter_item_point (items, group, _("Output"), MeterOutput);
+       add_level_meter_item_point (items, group, _("Custom"), MeterCustom);
+
+       RadioMenuItem::Group tgroup;
+       items.push_back (SeparatorElem());
+
+       add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
+       add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterKrms), MeterKrms);
+       add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1), MeterIEC1);
+       add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC2), MeterIEC2);
+       add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterVU),   MeterVU);
+
+       int _strip_type;
+       if (_route->is_master()) {
+               _strip_type = 4;
+       }
+       else if (boost::dynamic_pointer_cast<AudioTrack>(_route) == 0
+                       && boost::dynamic_pointer_cast<MidiTrack>(_route) == 0) {
+               /* non-master bus */
+               _strip_type = 3;
+       }
+       else if (boost::dynamic_pointer_cast<MidiTrack>(_route)) {
+               _strip_type = 2;
+       }
+       else {
+               _strip_type = 1;
+       }
+
+       MeterType cmt = _route->meter_type();
+       const std::string cmn = ArdourMeter::meter_type_string(cmt);
+
+       items.push_back (SeparatorElem());
+       items.push_back (MenuElem (string_compose(_("Change all in Group to %1"), cmn),
+                               sigc::bind (SetMeterTypeMulti, -1, _route->route_group(), cmt)));
+       items.push_back (MenuElem (string_compose(_("Change all to %1"), cmn),
+                               sigc::bind (SetMeterTypeMulti, 0, _route->route_group(), cmt)));
+       items.push_back (MenuElem (string_compose(_("Change same track-type to %1"), cmn),
+                               sigc::bind (SetMeterTypeMulti, _strip_type, _route->route_group(), cmt)));
 
        m->popup (ev->button, ev->time);
+       _suspend_menu_callbacks = false;
 }
 
 void
-MixerStrip::add_level_meter_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterPoint point)
+MixerStrip::add_level_meter_item_point (Menu_Helpers::MenuList& items,
+               RadioMenuItem::Group& group, string const & name, MeterPoint point)
 {
        using namespace Menu_Helpers;
        
@@ -2060,5 +2184,24 @@ MixerStrip::add_level_meter_item (Menu_Helpers::MenuList& items, RadioMenuItem::
 void
 MixerStrip::set_meter_point (MeterPoint p)
 {
+       if (_suspend_menu_callbacks) return;
        _route->set_meter_point (p);
 }
+
+void
+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);
+}
+
+void
+MixerStrip::set_meter_type (MeterType t)
+{
+       if (_suspend_menu_callbacks) return;
+       gpm.set_type (t);
+}