Revert "Revert new meter types (postponed until after 3.3 release)"
[ardour.git] / gtk2_ardour / meter_strip.cc
index 15b208461c4a1f1385fd5c444e5a716d032f5072..3a8410867af565cfe8f1e277d86163ff9e1b1823 100644 (file)
@@ -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;
@@ -64,7 +65,6 @@ MeterStrip::MeterStrip (int metricmode)
        _strip_type = 0;
        set_spacing(2);
        peakbx.set_size_request(-1, 14);
-       btnbox.set_size_request(-1, 16);
        namebx.set_size_request(18, 52);
 
        set_metric_mode(metricmode);
@@ -85,7 +85,6 @@ MeterStrip::MeterStrip (int metricmode)
        btnbox.show();
        meter_metric_area.show();
        meterbox.show();
-       namebx.show();
 
        UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed));
        ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
@@ -100,6 +99,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 {
        set_spacing(2);
        RouteUI::set_route (rt);
+       SessionHandlePtr::set_session (sess);
 
        _has_midi = false;
 
@@ -138,7 +138,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        peakbx.set_size_request(-1, 14);
 
        // add track-name label
-       name_label.set_text(_route->name().c_str());
+       name_label.set_text(_route->name());
        name_label.set_corner_radius(2);
        name_label.set_name("meterbridge label");
        name_label.set_angle(-90.0);
@@ -146,35 +146,39 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        name_label.layout()->set_width(48 * PANGO_SCALE);
        name_label.set_size_request(18, 50);
        name_label.set_alignment(-1.0, .5);
-
-       number_label.set_alignment(1.0, .5);
-       number_label.set_name("meterbridge numlabel");
-
-       if (atoi(_route->name().c_str()) > 0) {
-               char buf[16];
-               snprintf(buf, 15, "%d", atoi(_route->name().c_str()));
-               number_label.set_text(buf);
-               number_label.show();
-               name_label.hide();
-       } else {
-               name_label.show();
-               number_label.hide();
-       }
+       ARDOUR_UI::instance()->set_tip (name_label, _route->name());
 
        namebx.set_size_request(18, 52);
        namebx.pack_start(name_label, true, false, 3);
-       namebx.pack_start(number_label, true, false, 0);
 
-       // rec-enable button
-       btnbox.pack_start(*rec_enable_button, true, false);
+       recbox.pack_start(*rec_enable_button, true, false);
+       btnbox.pack_start(recbox, false, false, 1);
+       mutebox.pack_start(*mute_button, true, false);
+       btnbox.pack_start(mutebox, false, false, 1);
+       solobox.pack_start(*solo_button, true, false);
+       btnbox.pack_start(solobox, false, false, 1);
+
        rec_enable_button->set_corner_radius(2);
-       btnbox.set_size_request(-1, 16);
+       rec_enable_button->set_size_request(16, 16);
+
+       mute_button->set_corner_radius(2);
+       mute_button->set_size_request(16, 16);
+
+       solo_button->set_corner_radius(2);
+       solo_button->set_size_request(16, 16);
+
+       mutebox.set_size_request(16, 16);
+       solobox.set_size_request(16, 16);
+       recbox.set_size_request(16, 16);
+
+       update_button_box();
+       update_name_box();
 
        pack_start (peakbx, false, false);
        pack_start (meterbox, true, true);
        pack_start (btnbox, false, false);
        pack_start (namebx, false, false);
-
+       name_label.show();
        peak_display.show();
        peakbx.show();
        meter_ticks1_area.show();
@@ -184,7 +188,6 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        meter_align.show();
        peak_align.show();
        btnbox.show();
-       namebx.show();
 
        _route->shared_peak_meter()->ConfigurationChanged.connect (
                        route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
@@ -212,6 +215,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
        DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
        Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MeterStrip::parameter_changed, this, _1), gui_context());
+       sess->config.ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MeterStrip::parameter_changed, this, _1), gui_context());
 
        if (_route->is_master()) {
                _strip_type = 4;
@@ -241,6 +245,16 @@ MeterStrip::self_delete ()
        delete this;
 }
 
+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();
+}
+
 void
 MeterStrip::update_rec_display ()
 {
@@ -256,8 +270,28 @@ MeterStrip::state_id() const
 void
 MeterStrip::set_button_names()
 {
+       mute_button->set_text (_("M"));
        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
@@ -268,17 +302,7 @@ MeterStrip::strip_property_changed (const PropertyChange& what_changed)
        }
        ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed)
        name_label.set_text(_route->name());
-
-       if (atoi(_route->name().c_str()) > 0) {
-               char buf[16];
-               snprintf(buf, 15, "%d", atoi(_route->name().c_str()));
-               number_label.set_text(buf);
-               number_label.show();
-               name_label.hide();
-       } else {
-               name_label.show();
-               number_label.hide();
-       }
+       ARDOUR_UI::instance()->set_tip (name_label, _route->name());
 }
 
 void
@@ -320,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
                        ) {
@@ -350,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;
@@ -406,7 +427,6 @@ MeterStrip::set_metric_mode (int metricmode)
 void
 MeterStrip::set_pos (int pos)
 {
-       number_label.set_alignment(1.0, pos%2 ? .2 : .8 );
 }
 
 gint
@@ -470,12 +490,62 @@ MeterStrip::redraw_metrics ()
        meter_ticks2_area.queue_draw();
 }
 
+void
+MeterStrip::update_button_box ()
+{
+       if (!_session) return;
+       int height = 0;
+       if (_session->config.get_show_mute_on_meterbridge()) {
+               height += 18;
+               mutebox.show();
+       } else {
+               mutebox.hide();
+       }
+       if (_session->config.get_show_solo_on_meterbridge()) {
+               height += 18;
+               solobox.show();
+       } else {
+               solobox.hide();
+       }
+       if (_session->config.get_show_rec_on_meterbridge()) {
+               height += 18;
+               recbox.show();
+       } else {
+               recbox.hide();
+       }
+       btnbox.set_size_request(16, height);
+       check_resize();
+}
+
+void
+MeterStrip::update_name_box ()
+{
+       if (!_session) return;
+       if (_session->config.get_show_name_on_meterbridge()) {
+               namebx.show();
+       } else {
+               namebx.hide();
+       }
+}
+
 void
 MeterStrip::parameter_changed (std::string const & p)
 {
        if (p == "meter-peak") {
                max_peak = -INFINITY;
        }
+       else if (p == "show-rec-on-meterbridge") {
+               update_button_box();
+       }
+       else if (p == "show-mute-on-meterbridge") {
+               update_button_box();
+       }
+       else if (p == "show-solo-on-meterbridge") {
+               update_button_box();
+       }
+       else if (p == "show-name-on-meterbridge") {
+               update_name_box();
+       }
 }
 
 
@@ -501,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;