Revert "Revert new meter types (postponed until after 3.3 release)"

[ardour.git] / gtk2_ardour / meter_strip.cc

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index a7f4af66ef8813cc1234697034889340554b8f45..3a8410867af565cfe8f1e277d86163ff9e1b1823 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -52,6 +52,7 @@ using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace std;
+using namespace ArdourMeter;
 
 PBD::Signal1<void,MeterStrip*> MeterStrip::CatchDeletion;
 PBD::Signal0<void> MeterStrip::MetricChanged;
@@ -65,7 +66,6 @@ MeterStrip::MeterStrip (int metricmode)
        set_spacing(2);
        peakbx.set_size_request(-1, 14);
        namebx.set_size_request(18, 52);
-       numbx.set_size_request(18, 42);
 
        set_metric_mode(metricmode);
 
@@ -80,7 +80,6 @@ MeterStrip::MeterStrip (int metricmode)
        pack_start (meterbox, true, true);
        pack_start (btnbox, false, false);
        pack_start (namebx, false, false);
-       pack_start (numbx, false, false);
 
        peakbx.show();
        btnbox.show();
@@ -149,23 +148,9 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        name_label.set_alignment(-1.0, .5);
        ARDOUR_UI::instance()->set_tip (name_label, _route->name());
 
-       number_label.set_alignment(1.0, .5);
-       number_label.set_name("meterbridge numlabel");
-
-       if (_route->unique_id() > 0) {
-               char buf[12];
-               snprintf(buf, 12, "%d", _route->unique_id());
-               number_label.set_text(buf);
-       } else {
-               number_label.set_text("");
-       }
-
        namebx.set_size_request(18, 52);
        namebx.pack_start(name_label, true, false, 3);
 
-       numbx.set_size_request(18, 42);
-       numbx.pack_start(number_label, true, false, 0);
-
        recbox.pack_start(*rec_enable_button, true, false);
        btnbox.pack_start(recbox, false, false, 1);
        mutebox.pack_start(*mute_button, true, false);
@@ -193,9 +178,6 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        pack_start (meterbox, true, true);
        pack_start (btnbox, false, false);
        pack_start (namebx, false, false);
-       pack_start (numbx, false, false);
-
-       number_label.show();
        name_label.show();
        peak_display.show();
        peakbx.show();
@@ -267,6 +249,7 @@ void
 MeterStrip::set_session (Session* s)
 {
        SessionHandlePtr::set_session (s);
+       if (!s) return;
        s->config.ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MeterStrip::parameter_changed, this, _1), gui_context());
        update_button_box();
        update_name_box();
@@ -288,9 +271,27 @@ void
 MeterStrip::set_button_names()
 {
        mute_button->set_text (_("M"));
-       solo_button->set_text (_("S"));
        rec_enable_button->set_text ("");
        rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
+
+       if (_route && _route->solo_safe()) {
+               solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
+       } else {
+               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;
+               }
+       }
+
 }
 
 void
@@ -343,7 +344,6 @@ MeterStrip::meter_configuration_changed (ChanCount c)
                }
        }
 
-       // TODO draw Inactive routes or busses with different styles
        if (boost::dynamic_pointer_cast<AudioTrack>(_route) == 0
                        && boost::dynamic_pointer_cast<MidiTrack>(_route) == 0
                        ) {
@@ -373,14 +373,12 @@ MeterStrip::meter_configuration_changed (ChanCount c)
 void
 MeterStrip::on_size_request (Gtk::Requisition* r)
 {
-       meter_clear_pattern_cache();
        VBox::on_size_request(r);
 }
 
 void
 MeterStrip::on_size_allocate (Gtk::Allocation& a)
 {
-       meter_clear_pattern_cache();
        const int wh = a.get_height();
        int nh = ceilf(wh * .11f);
        if (nh < 52) nh = 52;
@@ -429,7 +427,6 @@ MeterStrip::set_metric_mode (int metricmode)
 void
 MeterStrip::set_pos (int pos)
 {
-       number_label.set_alignment(1.0, pos%2 ? 0.0 : 1.0 );
 }
 
 gint
@@ -524,11 +521,6 @@ void
 MeterStrip::update_name_box ()
 {
        if (!_session) return;
-       if (_session->config.get_show_id_on_meterbridge()) {
-               numbx.show();
-       } else {
-               numbx.hide();
-       }
        if (_session->config.get_show_name_on_meterbridge()) {
                namebx.show();
        } else {
@@ -554,9 +546,6 @@ MeterStrip::parameter_changed (std::string const & p)
        else if (p == "show-name-on-meterbridge") {
                update_name_box();
        }
-       else if (p == "show-id-on-meterbridge") {
-               update_name_box();
-       }
 }
 
 
@@ -582,16 +571,22 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev)
        RadioMenuItem::Group group;
 
        _suspend_menu_callbacks = true;
-       add_level_meter_item (items, group, _("Peak"), MeterPeak);
-       add_level_meter_item (items, group, _("RMS + Peak"), MeterKrms);
+       add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
+       add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterKrms), MeterKrms);
+       add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC1), MeterIEC1);
+       add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC2), MeterIEC2);
+       add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterVU),   MeterVU);
+
+       MeterType cmt = _route->meter_type();
+       const std::string cmn = ArdourMeter::meter_type_string(cmt);
 
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Change all in Group to Peak"), sigc::bind (SetMeterTypeMulti, -1, _route->route_group(), MeterPeak)));
-       items.push_back (MenuElem (_("Change all in Group to RMS + Peak"), sigc::bind (SetMeterTypeMulti, -1, _route->route_group(), MeterKrms)));
-       items.push_back (MenuElem (_("Change all to Peak"), sigc::bind (SetMeterTypeMulti, 0, _route->route_group(), MeterPeak)));
-       items.push_back (MenuElem (_("Change all to RMS + Peak"), sigc::bind (SetMeterTypeMulti, 0, _route->route_group(), MeterKrms)));
-       items.push_back (MenuElem (_("Change same track-type to Peak"), sigc::bind (SetMeterTypeMulti, _strip_type, _route->route_group(), MeterPeak)));
-       items.push_back (MenuElem (_("Change same track-type to RMS + Peak"), sigc::bind (SetMeterTypeMulti, _strip_type, _route->route_group(), MeterKrms)));
+       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;