merge with master.
[ardour.git] / gtk2_ardour / meter_strip.cc
index c877d734e16f8878e5955adb004595aaea174486..fd38da65e6b606a32d769658b5eb9903f7f662ee 100644 (file)
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 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;
+PBD::Signal0<void> MeterStrip::ConfigurationChanged;
 
-MeterStrip::MeterStrip (int metricmode)
+MeterStrip::MeterStrip (int metricmode, MeterType mt)
        : AxisView(0)
        , RouteUI(0)
 {
        level_meter = 0;
        _strip_type = 0;
-       set_spacing(2);
+       _tick_bar = 0;
+       _metricmode = -1;
+       metric_type = MeterPeak;
+       mtr_vbox.set_spacing(2);
+       nfo_vbox.set_spacing(2);
        peakbx.set_size_request(-1, 14);
        namebx.set_size_request(18, 52);
-       update_button_box();
+       spacer.set_size_request(-1,0);
 
-       set_metric_mode(metricmode);
+       set_metric_mode(metricmode, mt);
 
        meter_metric_area.set_size_request(25, 10);
        meter_metric_area.signal_expose_event().connect (
@@ -76,16 +83,30 @@ MeterStrip::MeterStrip (int metricmode)
 
        meterbox.pack_start(meter_metric_area, true, false);
 
-       pack_start (peakbx, false, false);
-       pack_start (meterbox, true, true);
-       pack_start (btnbox, false, false);
-       pack_start (namebx, false, false);
+       mtr_vbox.pack_start (peakbx, false, false);
+       mtr_vbox.pack_start (meterbox, true, true);
+       mtr_vbox.pack_start (spacer, false, false);
+       mtr_container.add(mtr_vbox);
+
+       mtr_hsep.set_size_request(-1,1);
+       mtr_hsep.set_name("BlackSeparator");
+
+       nfo_vbox.pack_start (mtr_hsep, false, false);
+       nfo_vbox.pack_start (btnbox, false, false);
+       nfo_vbox.pack_start (namebx, false, false);
+
+       pack_start (mtr_container, true, true);
+       pack_start (nfo_vbox, false, false);
 
        peakbx.show();
        btnbox.show();
        meter_metric_area.show();
        meterbox.show();
-       namebx.show();
+       spacer.show();
+       mtr_vbox.show();
+       mtr_container.show();
+       mtr_hsep.show();
+       nfo_vbox.show();
 
        UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed));
        ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
@@ -94,15 +115,20 @@ MeterStrip::MeterStrip (int metricmode)
 
 MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        : AxisView(sess)
-       , RouteUI(sess)
+       , RouteUI(0)
        , _route(rt)
        , peak_display()
 {
-       set_spacing(2);
-       RouteUI::set_route (rt);
+       mtr_vbox.set_spacing(2);
+       nfo_vbox.set_spacing(2);
        SessionHandlePtr::set_session (sess);
+       RouteUI::init ();
+       RouteUI::set_route (rt);
 
        _has_midi = false;
+       _tick_bar = 0;
+       _metricmode = -1;
+       metric_type = MeterPeak;
 
        int meter_width = 6;
        if (_route->shared_peak_meter()->input_streams().n_total() == 1) {
@@ -110,12 +136,12 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        }
 
        // level meter + ticks
-       level_meter = new LevelMeter(sess);
+       level_meter = new LevelMeterHBox(sess);
        level_meter->set_meter (_route->shared_peak_meter().get());
        level_meter->clear_meters();
-       level_meter->setup_meters (220, meter_width, 6);
        level_meter->set_type (_route->meter_type());
-       level_meter->ButtonPress.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::level_meter_button_press, this, _1));
+       level_meter->setup_meters (220, meter_width, 6);
+       level_meter->ButtonRelease.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::level_meter_button_release, this, _1));
        level_meter->MeterTypeChanged.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::meter_type_changed, this, _1));
 
        meter_align.set(0.5, 0.5, 0.0, 1.0);
@@ -138,8 +164,12 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        peakbx.pack_start(peak_align, true, true, 3);
        peakbx.set_size_request(-1, 14);
 
-       // add track-name label
-       name_label.set_text(_route->name().c_str());
+       // add track-name & -number label
+       number_label.set_text("-");
+       number_label.set_size_request(18, 18);
+
+       name_changed();
+
        name_label.set_corner_radius(2);
        name_label.set_name("meterbridge label");
        name_label.set_angle(-90.0);
@@ -147,44 +177,35 @@ 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);
+       ARDOUR_UI::instance()->set_tip (name_label, _route->name());
+       ARDOUR_UI::instance()->set_tip (*level_meter, _route->name());
 
-       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();
-       }
+       number_label.set_corner_radius(2);
+       number_label.set_name("tracknumber label");
+       number_label.set_angle(-90.0);
+       number_label.layout()->set_width(18 * PANGO_SCALE);
+       number_label.set_alignment(.5, .5);
 
        namebx.set_size_request(18, 52);
-       namebx.pack_start(name_label, true, false, 3);
-       namebx.pack_start(number_label, true, false, 0);
-
-       Gtk::HBox *btnwrap; // horiz center, no expand gtk workaround
-
-       btnwrap = manage(new Gtk::HBox());
-       btnwrap->pack_start(*rec_enable_button, true, false);
-       btnbox.pack_start(*btnwrap, false, false, 1);
-       btnwrap->show();
-
-       btnwrap = manage(new Gtk::HBox());
-       btnwrap->pack_start(*mute_button, true, false);
-       btnbox.pack_start(*btnwrap, false, false, 1);
-       btnwrap->show();
-
-       btnwrap = manage(new Gtk::HBox());
-       btnwrap->pack_start(*solo_button, true, false);
-       btnbox.pack_start(*btnwrap, false, false, 1);
-       btnwrap->show();
+       namebx.pack_start(namenumberbx, true, false, 0);
+       namenumberbx.pack_start(name_label, true, false, 0);
+       namenumberbx.pack_start(number_label, false, false, 0);
+
+       mon_in_box.pack_start(*monitor_input_button, true, false);
+       btnbox.pack_start(mon_in_box, false, false, 1);
+       mon_disk_box.pack_start(*monitor_disk_button, true, false);
+       btnbox.pack_start(mon_disk_box, false, false, 1);
+
+       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);
        rec_enable_button->set_size_request(16, 16);
+       rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
 
        mute_button->set_corner_radius(2);
        mute_button->set_size_request(16, 16);
@@ -192,26 +213,65 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        solo_button->set_corner_radius(2);
        solo_button->set_size_request(16, 16);
 
+       monitor_input_button->set_corner_radius(2);
+       monitor_input_button->set_size_request(16, 16);
+
+       monitor_disk_button->set_corner_radius(2);
+       monitor_disk_button->set_size_request(16, 16);
+
+       mutebox.set_size_request(16, 16);
+       solobox.set_size_request(16, 16);
+       recbox.set_size_request(16, 16);
+       mon_in_box.set_size_request(16, 16);
+       mon_disk_box.set_size_request(16, 16);
+       spacer.set_size_request(-1,0);
+
        update_button_box();
+       update_name_box();
+       update_background (_route->meter_type());
 
-       pack_start (peakbx, false, false);
-       pack_start (meterbox, true, true);
-       pack_start (btnbox, false, false);
-       pack_start (namebx, false, false);
+       mtr_vbox.pack_start (peakbx, false, false);
+       mtr_vbox.pack_start (meterbox, true, true);
+       mtr_vbox.pack_start (spacer, false, false);
+       mtr_container.add(mtr_vbox);
 
+       mtr_hsep.set_size_request(-1,1);
+       mtr_hsep.set_name("BlackSeparator");
+
+       nfo_vbox.pack_start (mtr_hsep, false, false);
+       nfo_vbox.pack_start (btnbox, false, false);
+       nfo_vbox.pack_start (namebx, false, false);
+
+       pack_start (mtr_container, true, true);
+       pack_start (nfo_vbox, false, false);
+
+       name_label.show();
        peak_display.show();
        peakbx.show();
        meter_ticks1_area.show();
        meter_ticks2_area.show();
        meterbox.show();
+       spacer.show();
        level_meter->show();
        meter_align.show();
        peak_align.show();
        btnbox.show();
-       namebx.show();
+       mtr_vbox.show();
+       mtr_container.show();
+       mtr_hsep.show();
+       nfo_vbox.show();
+       namenumberbx.show();
+
+       if (boost::dynamic_pointer_cast<Track>(_route)) {
+               monitor_input_button->show();
+               monitor_disk_button->show();
+       } else {
+               monitor_input_button->hide();
+               monitor_disk_button->hide();
+       }
 
        _route->shared_peak_meter()->ConfigurationChanged.connect (
-                       route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
+                       meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
                        );
 
        ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_peak_display));
@@ -227,10 +287,11 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        meter_ticks1_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks1_expose));
        meter_ticks2_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks2_expose));
 
-       _route->DropReferences.connect (route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), gui_context());
-       _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MeterStrip::strip_property_changed, this, _1), gui_context());
+       _route->DropReferences.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), gui_context());
+       _route->PropertyChanged.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::strip_property_changed, this, _1), gui_context());
 
        peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::peak_button_release), false);
+       name_label.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::name_label_button_release), false);
 
        UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed));
        ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
@@ -256,8 +317,10 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 
 MeterStrip::~MeterStrip ()
 {
-       delete level_meter;
-       CatchDeletion (this);
+       if (level_meter) {
+               delete level_meter;
+               CatchDeletion (this);
+       }
 }
 
 void
@@ -270,8 +333,10 @@ 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
@@ -290,9 +355,28 @@ 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;
+               }
+       }
+
+       monitor_input_button->set_text (_("I"));
+       monitor_disk_button->set_text (_("D"));
 }
 
 void
@@ -301,18 +385,11 @@ MeterStrip::strip_property_changed (const PropertyChange& what_changed)
        if (!what_changed.contains (ARDOUR::Properties::name)) {
                return;
        }
-       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();
+       ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed);
+       name_changed();
+       ARDOUR_UI::instance()->set_tip (name_label, _route->name());
+       if (level_meter) {
+               ARDOUR_UI::instance()->set_tip (*level_meter, _route->name());
        }
 }
 
@@ -355,17 +432,16 @@ 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
                        ) {
-               meter_ticks1_area.set_name ("AudioBusMetricsLeft");
-               meter_ticks2_area.set_name ("AudioBusMetricsRight");
+               meter_ticks1_area.set_name ("MyAudioBusMetricsLeft");
+               meter_ticks2_area.set_name ("MyAudioBusMetricsRight");
                _has_midi = false;
        }
        else if (type == (1 << DataType::AUDIO)) {
-               meter_ticks1_area.set_name ("AudioTrackMetricsLeft");
-               meter_ticks2_area.set_name ("AudioTrackMetricsRight");
+               meter_ticks1_area.set_name ("MyAudioTrackMetricsLeft");
+               meter_ticks2_area.set_name ("MyAudioTrackMetricsRight");
                _has_midi = false;
        }
        else if (type == (1 << DataType::MIDI)) {
@@ -377,30 +453,86 @@ MeterStrip::meter_configuration_changed (ChanCount c)
                meter_ticks2_area.set_name ("AudioMidiTrackMetricsRight");
                _has_midi = true;
        }
+       set_tick_bar(_tick_bar);
 
-       if (old_has_midi != _has_midi) MetricChanged();
        on_theme_changed();
+       if (old_has_midi != _has_midi) MetricChanged();
+       else ConfigurationChanged();
+}
+
+void
+MeterStrip::set_tick_bar (int m)
+{
+       std::string n;
+       _tick_bar = m;
+       if (_tick_bar & 1) {
+               n = meter_ticks1_area.get_name();
+               if (n.substr(0,3) != "Bar") {
+                       meter_ticks1_area.set_name("Bar" + n);
+               }
+       } else {
+               n = meter_ticks1_area.get_name();
+               if (n.substr(0,3) == "Bar") {
+                       meter_ticks1_area.set_name(n.substr(3,-1));
+               }
+       }
+       if (_tick_bar & 2) {
+               n = meter_ticks2_area.get_name();
+               if (n.substr(0,3) != "Bar") {
+                       meter_ticks2_area.set_name("Bar" + n);
+               }
+       } else {
+               n = meter_ticks2_area.get_name();
+               if (n.substr(0,3) == "Bar") {
+                       meter_ticks2_area.set_name(n.substr(3,-1));
+               }
+       }
 }
 
 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;
-       if (nh > 148) nh = 148;
-       namebx.set_size_request(18, nh);
+       int nh;
+       int mh = 0;
+       if (_session) {
+               mh = _session->config.get_meterbridge_label_height();
+       }
+       switch (mh) {
+               default:
+               case 0:
+                       nh = ceilf(wh * .12f);
+                       if (nh < 52) nh = 52;
+                       if (nh > 148) nh = 148;
+                       break;
+               case 1:
+                       nh = 52;
+                       break;
+               case 2:
+                       nh = 88;
+                       break;
+               case 3:
+                       nh = 106;
+                       break;
+               case 4:
+                       nh = 148;
+                       break;
+       }
+       int tnh = 0;
+       if (_session && _session->config.get_track_name_number()) {
+               tnh = 4 + _session->track_number_decimals() * 8;
+       }
+       namebx.set_size_request(18, nh + tnh);
+       namenumberbx.set_size_request(18, nh + tnh);
        if (_route) {
-               name_label.set_size_request(18, nh-2);
-               name_label.layout()->set_width((nh-4) * PANGO_SCALE);
+               name_label.set_size_request(18, nh + (_route->is_master() ? tnh : -1));
+               name_label.layout()->set_width((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE);
        }
        VBox::on_size_allocate(a);
 }
@@ -408,12 +540,22 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a)
 gint
 MeterStrip::meter_metrics_expose (GdkEventExpose *ev)
 {
-       return meter_expose_metrics(ev, _types, &meter_metric_area);
+       if (_route) {
+               return meter_expose_metrics(ev, _route->meter_type(), _types, &meter_metric_area);
+       } else {
+               return meter_expose_metrics(ev, metric_type, _types, &meter_metric_area);
+       }
 }
 
 void
-MeterStrip::set_metric_mode (int metricmode)
+MeterStrip::set_metric_mode (int metricmode, ARDOUR::MeterType mt)
 {
+       if (metric_type == mt && _metricmode == metricmode) {
+               return;
+       }
+       metric_type = mt;
+       _metricmode = metricmode;
+
        _types.clear ();
        switch(metricmode) {
                case 0:
@@ -434,26 +576,51 @@ MeterStrip::set_metric_mode (int metricmode)
                        _types.push_back (DataType::AUDIO);
                        break;
        }
-
+       update_background (mt);
        meter_metric_area.queue_draw ();
 }
 
 void
-MeterStrip::set_pos (int pos)
+MeterStrip::update_background(MeterType type)
+{
+       switch(type) {
+               case MeterIEC1DIN:
+               case MeterIEC1NOR:
+               case MeterIEC2BBC:
+               case MeterIEC2EBU:
+               case MeterK12:
+               case MeterK14:
+               case MeterK20:
+                       mtr_container.set_name ("meterstripPPM");
+                       break;
+               case MeterVU:
+                       mtr_container.set_name ("meterstripVU");
+                       break;
+               default:
+                       mtr_container.set_name ("meterstripDPM");
+       }
+}
+
+MeterType
+MeterStrip::meter_type()
 {
-       number_label.set_alignment(1.0, pos%2 ? .25 : .75 );
+       assert((!_route && _strip_type == 0) || (_route && _strip_type != 0));
+       if (!_route) return metric_type;
+       return _route->meter_type();
 }
 
 gint
 MeterStrip::meter_ticks1_expose (GdkEventExpose *ev)
 {
-       return meter_expose_ticks(ev, _types, &meter_ticks1_area);
+       assert(_route);
+       return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks1_area);
 }
 
 gint
 MeterStrip::meter_ticks2_expose (GdkEventExpose *ev)
 {
-       return meter_expose_ticks(ev, _types, &meter_ticks2_area);
+       assert(_route);
+       return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks2_area);
 }
 
 void
@@ -512,26 +679,45 @@ MeterStrip::update_button_box ()
        int height = 0;
        if (_session->config.get_show_mute_on_meterbridge()) {
                height += 18;
-               if (mute_button) mute_button->show();
+               mutebox.show();
        } else {
-               if (mute_button) mute_button->hide();
+               mutebox.hide();
        }
        if (_session->config.get_show_solo_on_meterbridge()) {
                height += 18;
-               if (solo_button) solo_button->show();
+               solobox.show();
        } else {
-               if (solo_button) solo_button->hide();
+               solobox.hide();
        }
        if (_session->config.get_show_rec_on_meterbridge()) {
                height += 18;
-               if (rec_enable_button) rec_enable_button->show();
+               recbox.show();
+       } else {
+               recbox.hide();
+       }
+       if (_session->config.get_show_monitor_on_meterbridge()) {
+               height += 18 + 18;
+               mon_in_box.show();
+               mon_disk_box.show();
        } else {
-               if (rec_enable_button) rec_enable_button->hide();
+               mon_in_box.hide();
+               mon_disk_box.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)
 {
@@ -547,11 +733,44 @@ MeterStrip::parameter_changed (std::string const & p)
        else if (p == "show-solo-on-meterbridge") {
                update_button_box();
        }
+       else if (p == "show-name-on-meterbridge") {
+               update_name_box();
+       }
+       else if (p == "show-monitor-on-meterbridge") {
+               update_button_box();
+       }
+       else if (p == "meterbridge-label-height") {
+               queue_resize();
+       }
+       else if (p == "track-name-number") {
+               name_changed();
+               queue_resize();
+       }
 }
 
+void
+MeterStrip::name_changed () {
+       if (!_route) {
+               return;
+       }
+       name_label.set_text(_route->name ());
+       if (_session && _session->config.get_track_name_number()) {
+               const int64_t track_number = _route->track_number ();
+               if (track_number == 0) {
+                       number_label.set_text("-");
+                       number_label.hide();
+               } else {
+                       number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
+                       number_label.show();
+               }
+               number_label.set_size_request(18, 4 + _session->track_number_decimals() * 8);
+       } else {
+               number_label.hide();
+       }
+}
 
 bool
-MeterStrip::level_meter_button_press (GdkEventButton* ev)
+MeterStrip::level_meter_button_release (GdkEventButton* ev)
 {
        if (ev->button == 3) {
                popup_level_meter_menu (ev);
@@ -572,23 +791,79 @@ 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_type_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterKrms),  MeterKrms);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC2BBC), MeterIEC2BBC);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC2EBU), MeterIEC2EBU);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK20), MeterK20);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK14), MeterK14);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK12), MeterK12);
+       add_level_meter_type_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;
 }
 
+bool
+MeterStrip::name_label_button_release (GdkEventButton* ev)
+{
+       if (!_session) return true;
+       if (!_session->config.get_show_name_on_meterbridge()) return true;
+
+       if (ev->button == 3) {
+               popup_name_label_menu (ev);
+               return true;
+       }
+
+       return false;
+}
+
 void
-MeterStrip::add_level_meter_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterType type)
+MeterStrip::popup_name_label_menu (GdkEventButton* ev)
+{
+       using namespace Gtk::Menu_Helpers;
+
+       Gtk::Menu* m = manage (new Menu);
+       MenuList& items = m->items ();
+
+       RadioMenuItem::Group group;
+
+       _suspend_menu_callbacks = true;
+       add_label_height_item (items, group, _("Variable height"), 0);
+       add_label_height_item (items, group, _("Short"), 1);
+       add_label_height_item (items, group, _("Tall"), 2);
+       add_label_height_item (items, group, _("Grande"), 3);
+       add_label_height_item (items, group, _("Venti"), 4);
+
+       m->popup (ev->button, ev->time);
+       _suspend_menu_callbacks = false;
+}
+
+void
+MeterStrip::add_label_height_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, uint32_t h)
+{
+       using namespace Menu_Helpers;
+
+       items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MeterStrip::set_label_height), h)));
+       RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
+       i->set_active (_session && _session->config.get_meterbridge_label_height() == h);
+}
+
+void
+MeterStrip::add_level_meter_type_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterType type)
 {
        using namespace Menu_Helpers;
 
@@ -601,13 +876,26 @@ void
 MeterStrip::set_meter_type (MeterType type)
 {
        if (_suspend_menu_callbacks) return;
+       if (_route->meter_type() == type) return;
+
        level_meter->set_type (type);
 }
 
+void
+MeterStrip::set_label_height (uint32_t h)
+{
+       if (_suspend_menu_callbacks) return;
+       _session->config.set_meterbridge_label_height(h);
+}
+
 void
 MeterStrip::meter_type_changed (MeterType type)
 {
-       _route->set_meter_type(type);
+       if (_route->meter_type() != type) {
+               _route->set_meter_type(type);
+       }
+       update_background (type);
+       MetricChanged();
 }
 
 void