Merged with trunk revision 600
[ardour.git] / gtk2_ardour / mixer_strip.cc
index d69bfe43d384930c96c890aac3e98691e732a612..cc66d1128aa14a7c678da92ed4df6fabcfe1f8bf 100644 (file)
 */
 
 #include <cmath>
-#include <glib.h>
 
 #include <sigc++/bind.h>
 
+#include <pbd/convert.h>
+
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/choice.h>
@@ -36,7 +37,7 @@
 #include <ardour/audioengine.h>
 #include <ardour/route.h>
 #include <ardour/audio_track.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
 #include <ardour/panner.h>
 #include <ardour/send.h>
 #include <ardour/insert.h>
@@ -81,19 +82,17 @@ speed_printer (char buf[32], Gtk::Adjustment& adj, void* arg)
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        : AxisView(sess),
-         RouteUI (rt, sess, _("mute"), _("solo"), _("RECORD")),
+         RouteUI (rt, sess, _("Mute"), _("Solo"), _("Record")),
          _mixer(mx),
          pre_redirect_box (PreFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
          post_redirect_box (PostFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
          gpm (_route, sess),
          panners (_route, sess),
-         button_table (7, 2),
-         gain_automation_style_button (""),
-         gain_automation_state_button (""),
-         pan_automation_style_button (""),
-         pan_automation_state_button (""),
-         polarity_button (_("polarity")),
-         comment_button (_("comments")),
+         button_table (3, 2),
+         middle_button_table (1, 2),
+         bottom_button_table (1, 2),
+         meter_point_label (_("pre")),
+         comment_button (_("Comments")),
          speed_adjustment (1.0, 0.001, 4.0, 0.001, 0.1),
          speed_spinner (&speed_adjustment, "MixerStripSpeedBase", true)
 
@@ -116,33 +115,55 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        width_button.add (*(manage (new Gtk::Image (get_xpm("lr.xpm")))));
        hide_button.add (*(manage (new Gtk::Image (get_xpm("small_x.xpm")))));
 
-
-       input_label.set_text (_("INPUT"));
+       input_label.set_text (_("Input"));
        input_button.add (input_label);
        input_button.set_name ("MixerIOButton");
        input_label.set_name ("MixerIOButtonLabel");
 
-       output_label.set_text (_("OUTPUT"));
+       output_label.set_text (_("Output"));
        output_button.add (output_label);
        output_button.set_name ("MixerIOButton");
        output_label.set_name ("MixerIOButtonLabel");
 
+
+       _route.meter_change.connect (mem_fun(*this, &MixerStrip::meter_changed));
+               meter_point_button.add (meter_point_label);
+               meter_point_button.set_name ("MixerStripMeterPreButton");
+               meter_point_label.set_name ("MixerStripMeterPreButton");
+               
+               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;
+               }
+               
+               /* TRANSLATORS: this string should be longest of the strings
+                  used to describe meter points. In english, its "input".
+               */
+               
+               set_size_request_to_display_given_text (meter_point_button, _("tupni"), 5, 5);
+
+
+               bottom_button_table.attach (meter_point_button, 1, 2, 0, 1);
+
+
+       meter_point_button.signal_button_press_event().connect (mem_fun (gpm, &GainMeter::meter_press), false);
+       /* XXX what is this meant to do? */
+       //meter_point_button.signal_button_release_event().connect (mem_fun (gpm, &GainMeter::meter_release), false);
+
        rec_enable_button->set_name ("MixerRecordEnableButton");
        rec_enable_button->unset_flags (Gtk::CAN_FOCUS);
 
        solo_button->set_name ("MixerSoloButton");
        mute_button->set_name ("MixerMuteButton");
-       gain_automation_style_button.set_name ("MixerAutomationModeButton");
-       gain_automation_state_button.set_name ("MixerAutomationPlaybackButton");
-       pan_automation_style_button.set_name ("MixerAutomationModeButton");
-       pan_automation_state_button.set_name ("MixerAutomationPlaybackButton");
-       polarity_button.set_name ("MixerPhaseInvertButton");
-
-       ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_state_button, _("Pan automation mode"));
-       ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_state_button, _("Gain automation mode"));
-
-       ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_style_button, _("Pan automation type"));
-       ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_style_button, _("Gain automation type"));
 
        hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
@@ -152,64 +173,21 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        output_button.unset_flags (Gtk::CAN_FOCUS);
        solo_button->unset_flags (Gtk::CAN_FOCUS);
        mute_button->unset_flags (Gtk::CAN_FOCUS);
-       gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
-       gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
-       pan_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
-       pan_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
-       polarity_button.unset_flags (Gtk::CAN_FOCUS);
 
        button_table.set_homogeneous (true);
        button_table.set_spacings (0);
 
        button_table.attach (name_button, 0, 2, 0, 1);
-       button_table.attach (group_button, 0, 2, 1, 2);
-       button_table.attach (input_button, 0, 2, 2, 3);
+       button_table.attach (input_button, 0, 2, 1, 2);
 
-       button_table.attach (polarity_button, 0, 2, 3, 4);
+       middle_button_table.set_homogeneous (true);
+       middle_button_table.set_spacings (0);
+       middle_button_table.attach (*mute_button, 0, 1, 0, 1);
+       middle_button_table.attach (*solo_button, 1, 2, 0, 1);
 
-       button_table.attach (*solo_button, 0, 1, 4, 5);
-       button_table.attach (*mute_button, 1, 2, 4, 5);
-
-       // button_table.attach (gain_automation_style_button, 0, 1, 5, 6);
-       button_table.attach (gain_automation_state_button, 0, 1, 5, 6);
-       // button_table.attach (pan_automation_style_button, 0, 1, 6, 7);
-       button_table.attach (pan_automation_state_button, 1, 2, 5, 6);
-
-       using namespace Menu_Helpers;
-       
-       gain_astate_menu.items().push_back (MenuElem (_("off"), 
-                                                     bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Off)));
-       gain_astate_menu.items().push_back (MenuElem (_("play"),
-                                                     bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Play)));
-       gain_astate_menu.items().push_back (MenuElem (_("write"),
-                                                     bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Write)));
-       gain_astate_menu.items().push_back (MenuElem (_("touch"),
-                                                     bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Touch)));
-       
-       gain_astyle_menu.items().push_back (MenuElem (_("trim")));
-       gain_astyle_menu.items().push_back (MenuElem (_("abs")));
-
-       pan_astate_menu.items().push_back (MenuElem (_("off"), 
-                                                    bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Off)));
-       pan_astate_menu.items().push_back (MenuElem (_("play"),
-                                                    bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Play)));
-       pan_astate_menu.items().push_back (MenuElem (_("write"),
-                                                    bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Write)));
-       pan_astate_menu.items().push_back (MenuElem (_("touch"),
-                                                    bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Touch)));
-
-       pan_astyle_menu.items().push_back (MenuElem (_("trim")));
-       pan_astyle_menu.items().push_back (MenuElem (_("abs")));
-       
-       gain_astate_menu.set_name ("ArdourContextMenu");
-       gain_astyle_menu.set_name ("ArdourContextMenu");
-       pan_astate_menu.set_name ("ArdourContextMenu");
-       pan_astyle_menu.set_name ("ArdourContextMenu");
-
-       ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_style_button, _("gain automation mode"));
-       ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_style_button, _("pan automation mode"));
-       ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_state_button, _("gain automation state"));
-       ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_state_button, _("pan automation state"));
+       bottom_button_table.set_col_spacings (0);
+       bottom_button_table.set_homogeneous (true);
+       bottom_button_table.attach (group_button, 0, 1, 0, 1);
 
        if (is_audio_track()) {
                
@@ -226,12 +204,12 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
                
                speed_spinner.set_print_func (speed_printer, 0);
 
-               ARDOUR_UI::instance()->tooltips().set_tip (speed_spinner, _("varispeed"));
+               ARDOUR_UI::instance()->tooltips().set_tip (speed_spinner, _("Varispeed"));
 
-               button_table.attach (speed_frame, 0, 2, 6, 7);
+               button_table.attach (speed_frame, 0, 2, 5, 6);
 #endif /* VARISPEED_IN_MIXER_STRIP */
 
-               button_table.attach (*rec_enable_button, 0, 2, 6, 7);
+               button_table.attach (*rec_enable_button, 0, 2, 2, 3);
        }
 
        name_button.add (name_label);
@@ -239,16 +217,22 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
 
        name_label.set_name ("MixerNameButtonLabel");
-       name_label.set_text (_route.name());
+       if (_route.phase_invert()) {
+               name_label.set_text (X_("Ø ") + name_label.get_text());
+       } else {
+               name_label.set_text (_route.name());
+       }
 
        group_button.add (group_label);
        group_button.set_name ("MixerGroupButton");
        group_label.set_name ("MixerGroupButtonLabel");
 
        comment_button.set_name ("MixerCommentButton");
+
        ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route.comment()=="" ?
-                                                       _("click to add/edit comments"):
+                                                       _("Click to Add/Edit Comments"):
                                                        _route.comment());
+
        comment_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::comment_button_clicked));
        
        global_vpacker.set_border_width (0);
@@ -264,13 +248,18 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
 
        width_hide_box.pack_start (width_button, false, true);
        width_hide_box.pack_end (hide_button, false, true);
+       Gtk::Alignment *gain_meter_alignment = Gtk::manage(new Gtk::Alignment());
+       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 (pre_redirect_box, true, true);
-       global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK, 4);
+       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 (post_redirect_box, true, true);
        global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
@@ -290,14 +279,14 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        _packed = false;
        _embedded = false;
 
+       _session.engine().Stopped.connect (mem_fun(*this, &MixerStrip::engine_stopped));
+       _session.engine().Running.connect (mem_fun(*this, &MixerStrip::engine_running));
        _route.input_changed.connect (mem_fun(*this, &MixerStrip::input_changed));
        _route.output_changed.connect (mem_fun(*this, &MixerStrip::output_changed));
        _route.mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed));
        _route.solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
        _route.solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
        _route.mix_group_changed.connect (mem_fun(*this, &MixerStrip::mix_group_changed));
-       _route.gain_automation_curve().automation_state_changed.connect (mem_fun(*this, &MixerStrip::gain_automation_state_changed));
-       _route.gain_automation_curve().automation_style_changed.connect (mem_fun(*this, &MixerStrip::gain_automation_style_changed));
        _route.panner().Changed.connect (mem_fun(*this, &MixerStrip::connect_to_pan));
 
        if (is_audio_track()) {
@@ -309,8 +298,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        _route.comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed));
        _route.gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed));
 
-       input_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::input_press), false);
-       output_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::output_press), false);
+       input_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::input_press), false);
+       output_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::output_press), false);
 
        rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
        solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false);
@@ -318,21 +307,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false);
        mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false);
 
-       gain_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event), false);
-       gain_automation_style_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event), false);
-       pan_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event), false);
-       pan_automation_style_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event), false);
-
-       gain_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event), false);
-       gain_automation_state_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event), false);
-       pan_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event), false);
-       pan_automation_state_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event), false);
-
-       polarity_button.signal_toggled().connect (mem_fun(*this, &MixerStrip::polarity_toggled));
-
-       name_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::name_button_button_release), false);
-
-       group_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::select_mix_group), false);
+       name_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::name_button_button_press), false);
+       group_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::select_mix_group), false);
 
        _width = (Width) -1;
        set_stuff_from_route ();
@@ -352,8 +328,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        name_changed (0);
        comment_changed (0);
        mix_group_changed (0);
-       gain_automation_state_changed ();
-       pan_automation_state_changed ();
+
        connect_to_pan ();
 
        panners.setup_pan ();
@@ -362,10 +337,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
                speed_changed ();
        }
 
-       /* XXX hack: no phase invert changed signal */
-
-       polarity_button.set_active (_route.phase_invert());
-
        update_diskstream_display ();
        update_input_display ();
        update_output_display ();
@@ -443,15 +414,20 @@ MixerStrip::set_width (Width w)
                set_size_request (-1, -1);
                xml_node->add_property ("strip_width", "wide");
 
-               static_cast<Gtk::Label*> (rec_enable_button->get_child())->set_text (_("RECORD"));
-               static_cast<Gtk::Label*> (mute_button->get_child())->set_text (_("mute"));
-               static_cast<Gtk::Label*> (solo_button->get_child())->set_text (_("solo"));
-               static_cast<Gtk::Label*> (comment_button.get_child())->set_text (_("comments"));
-               static_cast<Gtk::Label*> (gain_automation_style_button.get_child())->set_text (astyle_string(_route.gain_automation_curve().automation_style()));
-               static_cast<Gtk::Label*> (gain_automation_state_button.get_child())->set_text (astate_string(_route.gain_automation_curve().automation_state()));
-               static_cast<Gtk::Label*> (pan_automation_style_button.get_child())->set_text (astyle_string(_route.panner().automation_style()));
-               static_cast<Gtk::Label*> (pan_automation_state_button.get_child())->set_text (astate_string(_route.panner().automation_state()));
-               static_cast<Gtk::Label*> (polarity_button.get_child())->set_text (_("polarity"));
+               rec_enable_button->set_label (_("record"));
+               mute_button->set_label  (_("mute"));
+               solo_button->set_label (_("solo"));
+
+               if (_route.comment() == "") {
+                      comment_button.set_label (_("comments"));
+               } else {
+                      comment_button.set_label (_("*comments*"));
+               }
+
+               gpm.gain_automation_style_button.set_label (gpm.astyle_string(_route.gain_automation_curve().automation_style()));
+               gpm.gain_automation_state_button.set_label (gpm.astate_string(_route.gain_automation_curve().automation_state()));
+               panners.pan_automation_style_button.set_label (panners.astyle_string(_route.panner().automation_style()));
+               panners.pan_automation_state_button.set_label (panners.astate_string(_route.panner().automation_state()));
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
                break;
 
@@ -459,15 +435,20 @@ MixerStrip::set_width (Width w)
                set_size_request (50, -1);
                xml_node->add_property ("strip_width", "narrow");
 
-               static_cast<Gtk::Label*> (rec_enable_button->get_child())->set_text (_("REC"));
-               static_cast<Gtk::Label*> (mute_button->get_child())->set_text (_("m"));
-               static_cast<Gtk::Label*> (solo_button->get_child())->set_text (_("s"));
-               static_cast<Gtk::Label*> (comment_button.get_child())->set_text (_("cmt"));
-               static_cast<Gtk::Label*> (gain_automation_style_button.get_child())->set_text (short_astyle_string(_route.gain_automation_curve().automation_style()));
-               static_cast<Gtk::Label*> (gain_automation_state_button.get_child())->set_text (short_astate_string(_route.gain_automation_curve().automation_state()));
-               static_cast<Gtk::Label*> (pan_automation_style_button.get_child())->set_text (short_astyle_string(_route.panner().automation_style()));
-               static_cast<Gtk::Label*> (pan_automation_state_button.get_child())->set_text (short_astate_string(_route.panner().automation_state()));
-               static_cast<Gtk::Label*> (polarity_button.get_child())->set_text (_("pol"));
+               rec_enable_button->set_label (_("Rec"));
+               mute_button->set_label (_("M"));
+               solo_button->set_label (_("S"));
+
+               if (_route.comment() == "") {
+                      comment_button.set_label (_("Cmt"));
+               } else {
+                      comment_button.set_label (_("*Cmt*"));
+               }
+
+               gpm.gain_automation_style_button.set_label (gpm.short_astyle_string(_route.gain_automation_curve().automation_style()));
+               gpm.gain_automation_state_button.set_label (gpm.short_astate_string(_route.gain_automation_curve().automation_state()));
+               panners.pan_automation_style_button.set_label (panners.short_astyle_string(_route.panner().automation_style()));
+               panners.pan_automation_state_button.set_label (panners.short_astate_string(_route.panner().automation_state()));
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
                break;
        }
@@ -476,6 +457,7 @@ MixerStrip::set_width (Width w)
        update_output_display ();
        mix_group_changed (0);
        name_changed (0);
+
 }
 
 void
@@ -496,27 +478,33 @@ MixerStrip::set_packed (bool yn)
 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;
        }
 
        MenuList& citems = output_menu.items();
-       output_menu.set_name ("ArdourContextMenu");
-       citems.clear();
-
-       citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_output_configuration)));
-       citems.push_back (SeparatorElem());
-       citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
-       citems.push_back (SeparatorElem());
-
-       _session.foreach_connection (this, &MixerStrip::add_connection_to_output_menu);
-
-       output_menu.popup (1, ev->time);
+       switch (ev->button) {
 
+       case 1:
+               output_menu.set_name ("ArdourContextMenu");
+               citems.clear();
+               
+               citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_output_configuration)));
+               citems.push_back (SeparatorElem());
+               citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
+               citems.push_back (SeparatorElem());
+               
+               _session.foreach_connection (this, &MixerStrip::add_connection_to_output_menu);
+               
+               output_menu.popup (1, ev->time);
+               break;
+               
+       default:
+               break;
+       }
        return TRUE;
 }
 
@@ -556,26 +544,34 @@ MixerStrip::input_press (GdkEventButton *ev)
        MenuList& citems = input_menu.items();
        input_menu.set_name ("ArdourContextMenu");
        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;
        }
+       
+       switch (ev->button) {
+
+       case 1:
 
 #if ADVANCED_ROUTE_DISKSTREAM_CONNECTIVITY
-       if (is_audio_track()) {
-               citems.push_back (MenuElem (_("Track"), mem_fun(*this, &MixerStrip::select_stream_input)));
-       }
+               if (is_audio_track()) {
+                       citems.push_back (MenuElem (_("Track"), mem_fun(*this, &MixerStrip::select_stream_input)));
+               }
 #endif
-       citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_input_configuration)));
-       citems.push_back (SeparatorElem());
-       citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
-       citems.push_back (SeparatorElem());
-
-       _session.foreach_connection (this, &MixerStrip::add_connection_to_input_menu);
-       input_menu.popup (1, ev->time);
-
+               citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_input_configuration)));
+               citems.push_back (SeparatorElem());
+               citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
+               citems.push_back (SeparatorElem());
+               
+               _session.foreach_connection (this, &MixerStrip::add_connection_to_input_menu);
+               input_menu.popup (1, ev->time);
+               break;
+               
+       default:
+               break;
+       }
        return TRUE;
 }
 
@@ -669,9 +665,9 @@ MixerStrip::select_stream_input ()
        MenuList& items = stream_menu->items();
        stream_menu->set_name ("ArdourContextMenu");
        
-       Session::DiskStreamList streams = _session.disk_streams();
+       Session::AudioDiskstreamList streams = _session.audio_disk_streams();
 
-       for (Session::DiskStreamList::iterator i = streams.begin(); i != streams.end(); ++i) {
+       for (Session::AudioDiskstreamList::iterator i = streams.begin(); i != streams.end(); ++i) {
 
                if (!(*i)->hidden()) {
 
@@ -689,7 +685,7 @@ MixerStrip::select_stream_input ()
 }
 
 void
-MixerStrip::stream_input_chosen (DiskStream *stream)
+MixerStrip::stream_input_chosen (AudioDiskstream *stream)
 {
        if (is_audio_track()) {
                audio_track()->set_diskstream (*stream, this);
@@ -731,8 +727,8 @@ MixerStrip::connect_to_pan ()
        if (!_route.panner().empty()) {
                StreamPanner* sp = _route.panner().front();
 
-               panstate_connection = sp->automation().automation_state_changed.connect (mem_fun(*this, &MixerStrip::pan_automation_state_changed));
-               panstyle_connection = sp->automation().automation_style_changed.connect (mem_fun(*this, &MixerStrip::pan_automation_style_changed));
+               panstate_connection = sp->automation().automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed));
+               panstyle_connection = sp->automation().automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed));
        }
 
        panners.pan_changed (this);
@@ -748,14 +744,13 @@ MixerStrip::update_input_display ()
        } else {
                switch (_width) {
                case Wide:
-                       input_label.set_text (_("INPUT"));
+                       input_label.set_text (_(" Input"));
                        break;
                case Narrow:
-                       input_label.set_text (_("IN"));
+                       input_label.set_text (_("I"));
                        break;
                }
        }
-
        panners.setup_pan ();
 }
 
@@ -769,160 +764,21 @@ MixerStrip::update_output_display ()
        } else {
                switch (_width) {
                case Wide:
-                       output_label.set_text (_("OUTPUT"));
+                       output_label.set_text (_("Output"));
                        break;
                case Narrow:
-                       output_label.set_text (_("OUT"));
+                       output_label.set_text (_("O"));
                        break;
                }
        }
-
        gpm.setup_meters ();
        panners.setup_pan ();
 }
 
-void
-MixerStrip::update ()
-{
-       gpm.update_meters ();
-}
-
 void
 MixerStrip::fast_update ()
 {
-       if (_session.meter_falloff() > 0.0f) {
-               gpm.update_meters_falloff ();
-       }
-}
-
-gint
-MixerStrip::gain_automation_state_button_event (GdkEventButton *ev)
-{
-       if (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_2BUTTON_PRESS) {
-               return TRUE;
-       }
-       
-       switch (ev->button) {
-       case 1:
-               switch (ev->button) {
-               case 1:
-                       gain_astate_menu.popup (1, ev->time);
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       return TRUE;
-}
-
-gint
-MixerStrip::gain_automation_style_button_event (GdkEventButton *ev)
-{
-       if (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_2BUTTON_PRESS) {
-               return TRUE;
-       }
-
-       switch (ev->button) {
-       case 1:
-               gain_astyle_menu.popup (1, ev->time);
-               break;
-       default:
-               break;
-       }
-       return TRUE;
-}
-
-gint
-MixerStrip::pan_automation_state_button_event (GdkEventButton *ev)
-{
-       using namespace Menu_Helpers;
-
-       if (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_2BUTTON_PRESS) {
-               return TRUE;
-       }
-
-       switch (ev->button) {
-       case 1:
-               pan_astate_menu.popup (1, ev->time);
-               break;
-       default:
-               break;
-       }
-
-       return TRUE;
-}
-
-gint
-MixerStrip::pan_automation_style_button_event (GdkEventButton *ev)
-{
-       switch (ev->button) {
-       case 1:
-               pan_astyle_menu.popup (1, ev->time);
-               break;
-       default:
-               break;
-       }
-       return TRUE;
-}
-
-string
-MixerStrip::astate_string (AutoState state)
-{
-       return _astate_string (state, false);
-}
-
-string
-MixerStrip::short_astate_string (AutoState state)
-{
-       return _astate_string (state, true);
-}
-
-string
-MixerStrip::_astate_string (AutoState state, bool shrt)
-{
-       string sstr;
-
-       switch (state) {
-       case Off:
-               sstr = (shrt ? "--" : _("off"));
-               break;
-       case Play:
-               sstr = (shrt ? "P" : _("aplay"));
-               break;
-       case Touch:
-               sstr = (shrt ? "T" : _("touch"));
-               break;
-       case Write:
-               sstr = (shrt ? "W" : _("awrite"));
-               break;
-       }
-
-       return sstr;
-}
-
-string
-MixerStrip::astyle_string (AutoStyle style)
-{
-       return _astyle_string (style, false);
-}
-
-string
-MixerStrip::short_astyle_string (AutoStyle style)
-{
-       return _astyle_string (style, true);
-}
-
-string
-MixerStrip::_astyle_string (AutoStyle style, bool shrt)
-{
-       if (style & Trim) {
-               return _("trim");
-       } else {
-               /* XXX it might different in different languages */
-
-               return (shrt ? _("abs") : _("abs"));
-       }
+       gpm.update_meters ();
 }
 
 void
@@ -931,113 +787,6 @@ MixerStrip::diskstream_changed (void *src)
        Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_diskstream_display));
 }      
 
-void
-MixerStrip::gain_automation_style_changed ()
-{
-       switch (_width) {
-       case Wide:
-               static_cast<Gtk::Label*> (gain_automation_style_button.get_child())->set_text (astyle_string(_route.gain_automation_curve().automation_style()));
-               break;
-       case Narrow:
-               static_cast<Gtk::Label*> (gain_automation_style_button.get_child())->set_text (short_astyle_string(_route.gain_automation_curve().automation_style()));
-               break;
-       }
-}
-
-void
-MixerStrip::gain_automation_state_changed ()
-{
-       ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::gain_automation_state_changed));
-       
-       bool x;
-
-       switch (_width) {
-       case Wide:
-               static_cast<Gtk::Label*> (gain_automation_state_button.get_child())->set_text (astate_string(_route.gain_automation_curve().automation_state()));
-               break;
-       case Narrow:
-               static_cast<Gtk::Label*> (gain_automation_state_button.get_child())->set_text (short_astate_string(_route.gain_automation_curve().automation_state()));
-               break;
-       }
-
-       x = (_route.gain_automation_state() != Off);
-       
-       if (gain_automation_state_button.get_active() != x) {
-               ignore_toggle = true;
-               gain_automation_state_button.set_active (x);
-               ignore_toggle = false;
-       }
-
-       gpm.update_gain_sensitive ();
-       
-       /* start watching automation so that things move */
-       
-       gain_watching.disconnect();
-
-       if (x) {
-               gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (gpm, &GainMeter::effective_gain_display));
-       }
-}
-
-void
-MixerStrip::pan_automation_style_changed ()
-{
-       ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::pan_automation_style_changed));
-       
-       switch (_width) {
-       case Wide:
-               static_cast<Gtk::Label*> (pan_automation_style_button.get_child())->set_text (astyle_string(_route.panner().automation_style()));
-               break;
-       case Narrow:
-               static_cast<Gtk::Label*> (pan_automation_style_button.get_child())->set_text (short_astyle_string(_route.panner().automation_style()));
-               break;
-       }
-}
-
-void
-MixerStrip::pan_automation_state_changed ()
-{
-       ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::pan_automation_state_changed));
-       
-       bool x;
-
-       switch (_width) {
-       case Wide:
-               static_cast<Gtk::Label*> (pan_automation_state_button.get_child())->set_text (astate_string(_route.panner().automation_state()));
-               break;
-       case Narrow:
-               static_cast<Gtk::Label*> (pan_automation_state_button.get_child())->set_text (short_astate_string(_route.panner().automation_state()));
-               break;
-       }
-
-       /* when creating a new session, we get to create busses (and
-          sometimes tracks) with no outputs by the time they get
-          here.
-       */
-
-       if (_route.panner().empty()) {
-               return;
-       }
-
-       x = (_route.panner().front()->automation().automation_state() != Off);
-
-       if (pan_automation_state_button.get_active() != x) {
-               ignore_toggle = true;
-               pan_automation_state_button.set_active (x);
-               ignore_toggle = false;
-       }
-
-       panners.update_pan_sensitive ();
-       
-       /* start watching automation so that things move */
-       
-       pan_watching.disconnect();
-
-       if (x) {
-               pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (panners, &PannerUI::effective_pan_display));
-       }
-}
-
 void
 MixerStrip::input_changed (IOChange change, void *src)
 {
@@ -1057,29 +806,49 @@ MixerStrip::comment_button_clicked ()
                setup_comment_editor ();
        }
 
+        int x, y, cw_width, cw_height;
+
        if (comment_window->is_visible()) {
-               comment_window->hide ();
-               return;
+              string str =  comment_area->get_buffer()->get_text();
+              if (_route.comment() != str) {
+                _route.set_comment (str, this);
+
+                switch (_width) {
+                  
+                case Wide:
+                  if (! str.empty()) {
+                    comment_button.set_label (_("*Comments*"));
+                  } else {
+                    comment_button.set_label (_("Comments"));
+                     }
+                  break;
+                  
+                case Narrow:
+                  if (! str.empty()) {
+                    comment_button.set_label (_("*Cmt*"));
+                  } else {
+                    comment_button.set_label (_("Cmt"));
+                  } 
+                  break;
+                }
+                
+                ARDOUR_UI::instance()->tooltips().set_tip (comment_button, 
+                                                           str.empty() ? _("Click to Add/Edit Comments") : str);
+              }
+              comment_window->hide ();
+              return;
        } 
+       comment_window->get_size (cw_width, cw_height);
+       comment_window->get_position(x, y);
+       comment_window->move(x, y - (cw_height / 2) - 45);
+       /* 
+          half the dialog height minus the comments button height 
+          with some window decoration fudge thrown in.
+       */
 
-       comment_window->set_position (Gtk::WIN_POS_MOUSE);
-       comment_window->show_all ();
+       comment_window->show();
        comment_window->present();
-       
-       ResponseType response = (ResponseType) comment_window->run();
-       comment_window->hide ();
-
-       switch (response) {
-       case RESPONSE_ACCEPT:
-               break;
-       default:
-               return;
-       }
 
-       string str =  comment_area->get_buffer()->get_text();
-       _route.set_comment (str, this);
-       ARDOUR_UI::instance()->tooltips().set_tip (comment_button, 
-                                                  str.empty() ? _("click to add/edit comments") : str);
 }
 
 void
@@ -1090,17 +859,19 @@ MixerStrip::setup_comment_editor ()
        title += _(": comment editor");
 
        comment_window = new ArdourDialog (title, false);
-       comment_area = manage (new TextView());
+       comment_window->set_position (Gtk::WIN_POS_MOUSE);
+       comment_window->set_skip_taskbar_hint (true);
 
+       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());
-       comment_area->set_size_request (200,100);
        comment_area->show ();
 
        comment_window->get_vbox()->pack_start (*comment_area);
-       comment_window->add_button (Stock::CANCEL, RESPONSE_CANCEL);
-       comment_window->add_button (Stock::OK, RESPONSE_ACCEPT);
+       comment_window->get_action_area()->hide();
 }
 
 void
@@ -1143,19 +914,27 @@ MixerStrip::select_mix_group (GdkEventButton *ev)
        using namespace Menu_Helpers;
 
        if (group_menu == 0) {
-               group_menu = new Menu;
+               group_menu = new Menu;
        } 
        group_menu->set_name ("ArdourContextMenu");
        MenuList& items = group_menu->items();
        RadioMenuItem::Group group;
 
-       items.clear ();
-       items.push_back (RadioMenuElem (group, _("no group"), bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0)));
+       switch (ev->button) {
+       case 1:
 
-       _session.foreach_mix_group (bind (mem_fun (*this, &MixerStrip::add_mix_group_to_menu), &group));
-       
-       group_menu->popup (1, 0);
+               items.clear ();
+               items.push_back (RadioMenuElem (group, _("No group"), bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0)));
+
+               _session.foreach_mix_group (bind (mem_fun (*this, &MixerStrip::add_mix_group_to_menu), &group));
+
+               group_menu->popup (1, ev->time);
+               break;
 
+       default:
+               break;
+       }
+       
        return true;
 }      
 
@@ -1171,7 +950,7 @@ MixerStrip::mix_group_changed (void *ignored)
        } else {
                switch (_width) {
                case Wide:
-                       group_label.set_text (_("no group"));
+                       group_label.set_text (_("Grp"));
                        break;
                case Narrow:
                        group_label.set_text (_("~G"));
@@ -1180,16 +959,6 @@ MixerStrip::mix_group_changed (void *ignored)
        }
 }
 
-void
-MixerStrip::polarity_toggled ()
-{
-       bool x;
-
-       if ((x = polarity_button.get_active()) != _route.phase_invert()) {
-               _route.set_phase_invert (x, this);
-       }
-}
-
 
 void 
 MixerStrip::route_gui_changed (string what_changed, void* ignored)
@@ -1206,11 +975,7 @@ MixerStrip::route_gui_changed (string what_changed, void* ignored)
 void
 MixerStrip::show_route_color ()
 {
-       name_button.ensure_style ();
-       Glib::RefPtr<Gtk::Style> style = name_button.get_style()->copy();
-       style->set_bg (Gtk::STATE_NORMAL, color());
-       name_button.set_style (style);
-
+       name_button.modify_bg (STATE_NORMAL, color());
        route_active_changed ();
 }
 
@@ -1232,9 +997,13 @@ MixerStrip::build_route_ops_menu ()
        
        items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteUI::route_rename)));
        items.push_back (SeparatorElem());
-       items.push_back (CheckMenuElem (_("Active"), mem_fun(*this, &RouteUI::toggle_route_active)));
+       items.push_back (CheckMenuElem (_("Active"), 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 (SeparatorElem());
+       items.push_back (CheckMenuElem (_("Invert Polarity"), mem_fun (*this, &RouteUI::toggle_polarity)));
+       polarity_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
+       polarity_menu_item->set_active (_route.phase_invert());
 
        build_remote_control_menu ();
        
@@ -1246,10 +1015,11 @@ MixerStrip::build_route_ops_menu ()
 }
 
 gint
-MixerStrip::name_button_button_release (GdkEventButton* ev)
+MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
-       if (ev->button == 3) {
+       if (ev->button == 1) {
                list_route_operations ();
+               route_ops_menu->popup (1, ev->time);
        }
        return FALSE;
 }
@@ -1262,8 +1032,6 @@ MixerStrip::list_route_operations ()
        }
        
        refresh_remote_control_menu();
-
-       route_ops_menu->popup (1, 0);
 }
 
 
@@ -1325,9 +1093,12 @@ MixerStrip::name_changed (void *src)
                RouteUI::name_changed (src);
                break;
        case Narrow:
-               name_label.set_text (short_version (_route.name(), 5));
+               name_label.set_text (PBD::short_version (_route.name(), 5));
                break;
        }
+       if (_route.phase_invert()) {
+               name_label.set_text (X_("Ø ") + name_label.get_text());
+       }
 }
 
 void
@@ -1424,3 +1195,43 @@ MixerStrip::mix_group() const
 {
        return _route.mix_group();
 }
+
+void
+MixerStrip::engine_stopped ()
+{
+        input_button.set_sensitive (false);
+       rec_enable_button->set_sensitive (false);
+       output_button.set_sensitive (false);
+}
+
+void
+MixerStrip::engine_running ()
+{
+        input_button.set_sensitive (true);
+       rec_enable_button->set_sensitive (true);
+       output_button.set_sensitive (true);
+}
+
+void
+MixerStrip::meter_changed (void *src)
+{
+
+       ENSURE_GUI_THREAD (bind (mem_fun(*this, &MixerStrip::meter_changed), src));
+
+               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;
+               }
+
+               gpm.setup_meters ();
+}
+