return to the old way of editing track names, but hopefully better than it was. likel...

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 643b18af3dee06f7d776e27e54bacfddd335ac93..0f1d78d5bff567cd64b9fd8a2bef39c1d8d9ccae 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -155,13 +155,14 @@ MixerStrip::init ()
 
        input_button.set_text (_("Input"));
        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"));
        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
@@ -206,7 +207,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);
@@ -241,14 +242,16 @@ MixerStrip::init ()
 
        bottom_button_table.set_spacings (2);
        bottom_button_table.set_homogeneous (true);
-       bottom_button_table.attach (group_button, 0, 1, 0, 1);
+//     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 name button");
+       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");
@@ -397,6 +400,14 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        revert_to_default_display ();
 
+       if (gpm.gain_display.get_parent()) {
+               middle_button_table.remove (gpm.gain_display);
+       }
+
+       if (gpm.peak_display.get_parent()) {
+               middle_button_table.remove (gpm.peak_display);
+       }
+
        if (solo_button->get_parent()) {
                middle_button_table.remove (*solo_button);
        }
@@ -536,6 +547,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();
@@ -552,6 +565,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");
 
@@ -591,14 +605,24 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
        switch (w) {
        case Wide:
+               if (!gpm.peak_display.get_parent()) {
+                       middle_button_table.attach (gpm.peak_display,1,2,1,2);
+               }
+               if (gpm.gain_display.get_parent()) {
+                       middle_button_table.remove (gpm.gain_display);
+               }
+               if (!gpm.gain_display.get_parent()) {
+                       middle_button_table.attach (gpm.gain_display,0,1,1,2);
+               }
+
                if (show_sends_button)  {
                        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()) {
@@ -616,13 +640,24 @@ MixerStrip::set_width_enum (Width w, void* owner)
                break;
 
        case Narrow:
+               if (gpm.peak_display.get_parent()) {
+                       middle_button_table.remove (gpm.peak_display);
+               }
+
+               if (gpm.gain_display.get_parent()) {
+                       middle_button_table.remove (gpm.gain_display);
+               }
+               if (!gpm.gain_display.get_parent()) {
+                       middle_button_table.attach (gpm.gain_display,0,2,1,2);
+               }
+
                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()));
 
                if (_route->panner()) {
@@ -632,8 +667,8 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        panners.short_astate_string(_route->panner()->automation_state()));
                }
                
-               solo_isolated_led->set_text (_("i"));
-               solo_safe_led->set_text (_("L"));
+               solo_isolated_led->set_text (_("iso"));
+               solo_safe_led->set_text (_("Lck"));
 
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
                set_size_request (max (50, gpm.get_gm_width()), -1);
@@ -906,7 +941,7 @@ MixerStrip::bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
 }
 
 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;
 
@@ -934,7 +969,7 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR:
 }
 
 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;
 
@@ -1680,28 +1715,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 */
@@ -1884,8 +1949,13 @@ MixerStrip::set_button_names ()
                break;
 
        }
-}
 
+       if (_route) {
+               meter_point_button.set_text (meter_point_string (_route->meter_point()));
+       } else {
+               meter_point_button.set_text ("");
+       }
+}
 
 PluginSelector*
 MixerStrip::plugin_selector()