fix MTDM test

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 71813e84f7a2dca4bf2ec1e110474c0e8b21200b..831c5158b83a6aa7d74a62d37ebb82f98085a719 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -80,8 +80,6 @@ MixerStrip* MixerStrip::_entered_mixer_strip;
 
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
-static const int _button_vpad = 4;
-
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
        : AxisView(sess)
        , RouteUI (sess)
@@ -178,25 +176,20 @@ MixerStrip::init ()
        
        hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
-       monitor_input_button->set_diameter (3);
-       monitor_disk_button->set_diameter (3);
-
-        solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
-        solo_isolated_led->show ();
-        solo_isolated_led->set_diameter (3);
-        solo_isolated_led->set_no_show_all (true);
-        solo_isolated_led->set_name (X_("solo isolate"));
-        solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-        solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release), false);
+       solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
+       solo_isolated_led->show ();
+       solo_isolated_led->set_no_show_all (true);
+       solo_isolated_led->set_name (X_("solo isolate"));
+       solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+       solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release), false);
        UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), "");
 
-        solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
-        solo_safe_led->show ();
-        solo_safe_led->set_diameter (3);
-        solo_safe_led->set_no_show_all (true);
-        solo_safe_led->set_name (X_("solo safe"));
-        solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-        solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release), false);
+       solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
+       solo_safe_led->show ();
+       solo_safe_led->set_no_show_all (true);
+       solo_safe_led->set_name (X_("solo safe"));
+       solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+       solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release), false);
        UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
 
        solo_safe_led->set_text (_("Lock"));
@@ -251,9 +244,7 @@ MixerStrip::init ()
        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.set_text_ellipsize (Pango::ELLIPSIZE_END);
        name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized));
 
        ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
@@ -491,6 +482,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                solo_button->hide ();
                mute_button->show ();
                rec_mon_table.hide ();
+               if (solo_iso_table.get_parent()) {
+                       solo_iso_table.get_parent()->remove(solo_iso_table);
+               }
        } else {
                bottom_button_table.attach (group_button, 1, 2, 0, 1);
                mute_solo_table.attach (*mute_button, 0, 1, 0, 1);
@@ -1590,36 +1584,32 @@ void
 MixerStrip::name_changed ()
 {
        switch (_width) {
-       case Wide:
-               if (_session->config.get_track_name_number()) {
-                       const int64_t track_number = _route->track_number ();
-                       if (track_number == 0) {
-                               number_label.set_text ("-");
-                       } else {
-                               number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
-                       }
-               } else {
-                       number_label.set_text ("");
-               }
-               name_button.set_text (_route->name());
-               break;
-       case Narrow:
-               if (_session->config.get_track_name_number()) {
-                       name_button.set_markup(track_number_to_string (_route->track_number (), " ",
-                                               PBD::short_version (_route->name (), 5)));
-               } else {
+               case Wide:
+                       name_button.set_text (_route->name());
+                       break;
+               case Narrow:
                        name_button.set_text (PBD::short_version (_route->name(), 5));
-               }
-               break;
+                       break;
        }
 
        ARDOUR_UI::instance()->set_tip (name_button, _route->name());
+
+       if (_session->config.get_track_name_number()) {
+               const int64_t track_number = _route->track_number ();
+               if (track_number == 0) {
+                       number_label.set_text ("-");
+               } else {
+                       number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
+               }
+       } else {
+               number_label.set_text ("");
+       }
 }
 
 void
 MixerStrip::name_button_resized (Gtk::Allocation& alloc)
 {
-       name_button.layout()->set_width (alloc.get_width() * PANGO_SCALE);
+       name_button.set_layout_ellisize_width (alloc.get_width() * PANGO_SCALE);
 }
 
 bool
@@ -2198,6 +2188,12 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev)
        add_level_meter_item_point (items, group, _("Output"), MeterOutput);
        add_level_meter_item_point (items, group, _("Custom"), MeterCustom);
 
+       if (gpm.meter_channels().n_audio() == 0) {
+               m->popup (ev->button, ev->time);
+               _suspend_menu_callbacks = false;
+               return;
+       }
+
        RadioMenuItem::Group tgroup;
        items.push_back (SeparatorElem());