Revert "Revert new meter types (postponed until after 3.3 release)"
[ardour.git] / gtk2_ardour / meter_strip.cc
index fc31a3f96bea01826113a5a905402b1adf869b53..3a8410867af565cfe8f1e277d86163ff9e1b1823 100644 (file)
@@ -30,6 +30,7 @@
 #include "ardour/midi_track.h"
 
 #include <gtkmm2ext/gtk_ui.h>
+#include <gtkmm2ext/keyboard.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/rgb_macros.h>
 
 #include "logmeter.h"
 #include "gui_thread.h"
 #include "ardour_window.h"
+#include "utils.h"
 
 #include "meterbridge.h"
 #include "meter_strip.h"
+#include "meter_patterns.h"
 
 #include "i18n.h"
 
@@ -49,47 +52,27 @@ using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace std;
+using namespace ArdourMeter;
 
 PBD::Signal1<void,MeterStrip*> MeterStrip::CatchDeletion;
-
-MeterStrip::MetricPatterns MeterStrip::metric_patterns;
-MeterStrip::TickPatterns MeterStrip::ticks_patterns;
+PBD::Signal0<void> MeterStrip::MetricChanged;
 
 MeterStrip::MeterStrip (int metricmode)
        : AxisView(0)
        , RouteUI(0)
 {
        level_meter = 0;
+       _strip_type = 0;
        set_spacing(2);
        peakbx.set_size_request(-1, 14);
-       btnbox.set_size_request(-1, 16);
-       namebx.set_size_request(14, 52);
+       namebx.set_size_request(18, 52);
 
-       _types.clear ();
-       switch(metricmode) {
-               case 1:
-                       meter_metric_area.set_name ("AudioBusMetrics");
-                       _types.push_back (DataType::AUDIO);
-                       break;
-               case 2:
-                       meter_metric_area.set_name ("AudioTrackMetrics");
-                       _types.push_back (DataType::AUDIO);
-                       break;
-               case 3:
-                       meter_metric_area.set_name ("MidiTrackMetrics");
-                       _types.push_back (DataType::MIDI);
-                       break;
-               default:
-                       meter_metric_area.set_name ("AudioMidiTrackMetrics");
-                       _types.push_back (DataType::AUDIO);
-                       _types.push_back (DataType::MIDI);
-                       break;
-       }
-       //meter_metric_area.queue_draw ();
+       set_metric_mode(metricmode);
 
-       set_size_request_to_display_given_text (meter_metric_area, "-8888", 1, 0);
+       meter_metric_area.set_size_request(25, 10);
        meter_metric_area.signal_expose_event().connect (
                        sigc::mem_fun(*this, &MeterStrip::meter_metrics_expose));
+       RedrawMetrics.connect (sigc::mem_fun(*this, &MeterStrip::redraw_metrics));
 
        meterbox.pack_start(meter_metric_area, true, false);
 
@@ -102,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));
@@ -117,6 +99,9 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 {
        set_spacing(2);
        RouteUI::set_route (rt);
+       SessionHandlePtr::set_session (sess);
+
+       _has_midi = false;
 
        int meter_width = 6;
        if (_route->shared_peak_meter()->input_streams().n_total() == 1) {
@@ -127,14 +112,16 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        level_meter = new LevelMeter(sess);
        level_meter->set_meter (_route->shared_peak_meter().get());
        level_meter->clear_meters();
-       level_meter->setup_meters (400, meter_width, 6);
+       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->MeterTypeChanged.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::meter_type_changed, this, _1));
 
-       Gtk::Alignment *meter_align = Gtk::manage (new Gtk::Alignment());
-       meter_align->set(0.5, 0.5, 0.0, 1.0);
-       meter_align->add(*level_meter);
+       meter_align.set(0.5, 0.5, 0.0, 1.0);
+       meter_align.add(*level_meter);
 
        meterbox.pack_start(meter_ticks1_area, true, false);
-       meterbox.pack_start(*meter_align, true, true);
+       meterbox.pack_start(meter_align, true, true);
        meterbox.pack_start(meter_ticks2_area, true, false);
 
        // peak display
@@ -145,49 +132,73 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        peak_display.set_size_request(12, 8);
        peak_display.set_corner_radius(2);
 
-       Gtk::Alignment *peak_align = Gtk::manage (new Gtk::Alignment());
-       peak_align->set(0.5, 1.0, 1.0, 0.8);
-       peak_align->add(peak_display);
-       peakbx.pack_start(*peak_align, true, true, 3);
+       peak_align.set(0.5, 1.0, 1.0, 0.8);
+       peak_align.add(peak_display);
+       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());
+       name_label.set_text(_route->name());
        name_label.set_corner_radius(2);
-       name_label.set_name("solo isolate"); // XXX re-use 'very_small_text'
+       name_label.set_name("meterbridge label");
        name_label.set_angle(-90.0);
        name_label.layout()->set_ellipsize (Pango::ELLIPSIZE_END);
        name_label.layout()->set_width(48 * PANGO_SCALE);
-       name_label.set_size_request(14, 50);
+       name_label.set_size_request(18, 50);
+       name_label.set_alignment(-1.0, .5);
+       ARDOUR_UI::instance()->set_tip (name_label, _route->name());
 
-       namebx.set_size_request(14, 52);
+       namebx.set_size_request(18, 52);
        namebx.pack_start(name_label, true, false, 3);
 
-       // 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();
        meter_ticks2_area.show();
        meterbox.show();
        level_meter->show();
-       meter_align->show();
-       peak_align->show();
+       meter_align.show();
+       peak_align.show();
        btnbox.show();
-       name_label.show();
-       namebx.show();
 
        _route->shared_peak_meter()->ConfigurationChanged.connect (
                        route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
                        );
+
+       ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_peak_display));
+       ResetRoutePeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_route_peak_display));
+       ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_group_peak_display));
+       RedrawMetrics.connect (sigc::mem_fun(*this, &MeterStrip::redraw_metrics));
+       SetMeterTypeMulti.connect (sigc::mem_fun(*this, &MeterStrip::set_meter_type_multi));
+
        meter_configuration_changed (_route->shared_peak_meter()->input_streams ());
 
        meter_ticks1_area.set_size_request(3,-1);
@@ -203,6 +214,23 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed));
        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;
+       }
+       else if (boost::dynamic_pointer_cast<AudioTrack>(_route) == 0
+                       && boost::dynamic_pointer_cast<MidiTrack>(_route) == 0) {
+               /* non-master bus */
+               _strip_type = 3;
+       }
+       else if (boost::dynamic_pointer_cast<MidiTrack>(_route)) {
+               _strip_type = 2;
+       }
+       else {
+               _strip_type = 1;
+       }
 }
 
 MeterStrip::~MeterStrip ()
@@ -217,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 ()
 {
@@ -232,7 +270,28 @@ MeterStrip::state_id() const
 void
 MeterStrip::set_button_names()
 {
-       rec_enable_button->set_text (_("R"));
+       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
@@ -243,6 +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());
+       ARDOUR_UI::instance()->set_tip (name_label, _route->name());
 }
 
 void
@@ -251,7 +311,7 @@ MeterStrip::fast_update ()
        float mpeak = level_meter->update_meters();
        if (mpeak > max_peak) {
                max_peak = mpeak;
-               if (mpeak >= 0.0f) {
+               if (mpeak >= Config->get_meter_peak()) {
                        peak_display.set_name ("meterbridge peakindicator on");
                        peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
                }
@@ -261,19 +321,13 @@ MeterStrip::fast_update ()
 void
 MeterStrip::on_theme_changed()
 {
-       metric_patterns.clear();
-       ticks_patterns.clear();
-
        if (level_meter && _route) {
                int meter_width = 6;
                if (_route->shared_peak_meter()->input_streams().n_total() == 1) {
                        meter_width = 12;
                }
-               level_meter->setup_meters (400, meter_width, 6);
+               level_meter->setup_meters (220, meter_width, 6);
        }
-       meter_metric_area.queue_draw();
-       meter_ticks1_area.queue_draw();
-       meter_ticks2_area.queue_draw();
 }
 
 void
@@ -281,6 +335,7 @@ MeterStrip::meter_configuration_changed (ChanCount c)
 {
        int type = 0;
        _types.clear ();
+       bool old_has_midi = _has_midi;
 
        for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
                if (c.get (*i) > 0) {
@@ -289,501 +344,292 @@ 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 ("AudioBusMetrics");
-               meter_ticks2_area.set_name ("AudioBusMetrics");
+               meter_ticks1_area.set_name ("AudioBusMetricsLeft");
+               meter_ticks2_area.set_name ("AudioBusMetricsRight");
+               _has_midi = false;
        }
        else if (type == (1 << DataType::AUDIO)) {
-               meter_ticks1_area.set_name ("AudioTrackMetrics");
-               meter_ticks2_area.set_name ("AudioTrackMetrics");
+               meter_ticks1_area.set_name ("AudioTrackMetricsLeft");
+               meter_ticks2_area.set_name ("AudioTrackMetricsRight");
+               _has_midi = false;
        }
        else if (type == (1 << DataType::MIDI)) {
-               meter_ticks1_area.set_name ("MidiTrackMetrics");
-               meter_ticks2_area.set_name ("MidiTrackMetrics");
+               meter_ticks1_area.set_name ("MidiTrackMetricsLeft");
+               meter_ticks2_area.set_name ("MidiTrackMetricsRight");
+               _has_midi = true;
        } else {
-               meter_ticks1_area.set_name ("AudioMidiTrackMetrics");
-               meter_ticks2_area.set_name ("AudioMidiTrackMetrics");
+               meter_ticks1_area.set_name ("AudioMidiTrackMetricsLeft");
+               meter_ticks2_area.set_name ("AudioMidiTrackMetricsRight");
+               _has_midi = true;
        }
 
+       if (old_has_midi != _has_midi) MetricChanged();
        on_theme_changed();
 }
 
 void
 MeterStrip::on_size_request (Gtk::Requisition* r)
 {
-       metric_patterns.clear();
-       ticks_patterns.clear();
        VBox::on_size_request(r);
 }
 
 void
 MeterStrip::on_size_allocate (Gtk::Allocation& a)
 {
-       metric_patterns.clear();
-       ticks_patterns.clear();
+       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);
+       if (_route) {
+               name_label.set_size_request(18, nh-2);
+               name_label.layout()->set_width((nh-4) * PANGO_SCALE);
+       }
        VBox::on_size_allocate(a);
 }
 
-/* XXX code-copy from gain_meter.cc -- TODO consolidate
- *
- * slightly different:
- *  - ticks & label positions are swapped
- *  - more ticks for audio (longer meter by default)
- *  - right-aligned lables, unit-legend
- *  - height limitation of FastMeter::max_pattern_metric_size is included here
- */
-cairo_pattern_t*
-MeterStrip::render_metrics (Gtk::Widget& w, vector<DataType> types)
-{
-       Glib::RefPtr<Gdk::Window> win (w.get_window());
-
-       gint width, height;
-       win->get_size (width, height);
-
-       cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height);
-       cairo_t* cr = cairo_create (surface);
-       Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create(w.get_pango_context());
-
-
-       Pango::AttrList audio_font_attributes;
-       Pango::AttrList midi_font_attributes;
-       Pango::AttrList unit_font_attributes;
-
-       Pango::AttrFontDesc* font_attr;
-       Pango::FontDescription font;
-
-       font = Pango::FontDescription (""); // use defaults
-       //font = get_font_for_style("gain-fader");
-       //font = w.get_style()->get_font();
-
-       font.set_weight (Pango::WEIGHT_NORMAL);
-       font.set_size (9.0 * PANGO_SCALE);
-       font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
-       audio_font_attributes.change (*font_attr);
-       delete font_attr;
-
-       font.set_weight (Pango::WEIGHT_ULTRALIGHT);
-       font.set_stretch (Pango::STRETCH_ULTRA_CONDENSED);
-       font.set_size (7.5 * PANGO_SCALE);
-       font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
-       midi_font_attributes.change (*font_attr);
-       delete font_attr;
-
-       font.set_size (7.0 * PANGO_SCALE);
-       font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
-       unit_font_attributes.change (*font_attr);
-       delete font_attr;
-
-       cairo_move_to (cr, 0, 0);
-       cairo_rectangle (cr, 0, 0, width, height);
-       {
-               Gdk::Color c = w.get_style()->get_bg (Gtk::STATE_NORMAL);
-               cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
-       }
-       cairo_fill (cr);
-
-       height = min(1024, height); // XXX see FastMeter::max_pattern_metric_size
-       uint32_t peakcolor = ARDOUR_UI::config()->color_by_name ("meterbridge peaklabel");
-
-       for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
-
-               Gdk::Color c;
-
-               if (types.size() > 1) {
-                       /* we're overlaying more than 1 set of marks, so use different colours */
-                       Gdk::Color c;
-                       switch (*i) {
-                       case DataType::AUDIO:
-                               c = w.get_style()->get_fg (Gtk::STATE_NORMAL);
-                               cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
-                               break;
-                       case DataType::MIDI:
-                               c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
-                               cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
-                               break;
-                       }
-               } else {
-                       c = w.get_style()->get_fg (Gtk::STATE_NORMAL);
-                       cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
-               }
+gint
+MeterStrip::meter_metrics_expose (GdkEventExpose *ev)
+{
+       return meter_expose_metrics(ev, _types, &meter_metric_area);
+}
 
-               std::map<int,float> points;
-
-               switch (*i) {
-               case DataType::AUDIO:
-                       layout->set_attributes (audio_font_attributes);
-                       points.insert (std::pair<int,float>(-50, 0.5));
-                       points.insert (std::pair<int,float>(-40, 0.5));
-                       points.insert (std::pair<int,float>(-30, 0.5));
-                       points.insert (std::pair<int,float>(-25, 0.5));
-                       points.insert (std::pair<int,float>(-20, 1.0));
-                       points.insert (std::pair<int,float>(-18, 1.0));
-                       points.insert (std::pair<int,float>(-15, 1.0));
-                       points.insert (std::pair<int,float>(-10, 1.0));
-                       points.insert (std::pair<int,float>( -5, 1.0));
-                       points.insert (std::pair<int,float>( -3, 0.5));
-                       points.insert (std::pair<int,float>(  0, 1.0));
-                       points.insert (std::pair<int,float>(  3, 0.5));
+void
+MeterStrip::set_metric_mode (int metricmode)
+{
+       _types.clear ();
+       switch(metricmode) {
+               case 0:
+                       meter_metric_area.set_name ("MidiTrackMetricsLeft");
+                       _types.push_back (DataType::MIDI);
                        break;
-
-               case DataType::MIDI:
-                       layout->set_attributes (midi_font_attributes);
-                       points.insert (std::pair<int,float>(  0, 1.0));
-                       if (types.size() == 1) {
-                               points.insert (std::pair<int,float>( 16, 0.5));
-                               points.insert (std::pair<int,float>( 32, 0.5));
-                               points.insert (std::pair<int,float>( 48, 0.5));
-                               points.insert (std::pair<int,float>( 64, 1.0));
-                               points.insert (std::pair<int,float>( 80, 0.5));
-                               points.insert (std::pair<int,float>( 96, 0.5));
-                               points.insert (std::pair<int,float>(100, 0.5));
-                               points.insert (std::pair<int,float>(112, 0.5));
-                       } else {
-                               /* labels that don't overlay with dB */
-                               points.insert (std::pair<int,float>( 48, 0.5));
-                               points.insert (std::pair<int,float>( 72, 0.5));
-                               points.insert (std::pair<int,float>( 88, 0.5));
-                       }
-                       points.insert (std::pair<int,float>(127, 1.0));
+               case 1:
+                       meter_metric_area.set_name ("AudioTrackMetricsLeft");
+                       _types.push_back (DataType::AUDIO);
+                       break;
+               case 2:
+                       meter_metric_area.set_name ("MidiTrackMetricsRight");
+                       _types.push_back (DataType::MIDI);
+                       break;
+               case 3:
+               default:
+                       meter_metric_area.set_name ("AudioTrackMetricsRight");
+                       _types.push_back (DataType::AUDIO);
                        break;
-               }
-
-               char buf[32];
-               gint pos;
-
-               for (std::map<int,float>::const_iterator j = points.begin(); j != points.end(); ++j) {
-
-                       float fraction = 0;
-                       switch (*i) {
-                       case DataType::AUDIO:
-                               cairo_set_line_width (cr, (j->second));
-                               if (j->first >= 0) {
-                                       cairo_set_source_rgb (cr,
-                                                       UINT_RGBA_R_FLT(peakcolor),
-                                                       UINT_RGBA_G_FLT(peakcolor),
-                                                       UINT_RGBA_B_FLT(peakcolor));
-                               }
-                               fraction = log_meter (j->first);
-                               snprintf (buf, sizeof (buf), "%+2d", j->first);
-                               pos = height - (gint) floor (height * fraction);
-                               cairo_move_to(cr, width-2.5, pos + .5);
-                               cairo_line_to(cr, width, pos + .5);
-                               cairo_stroke (cr);
-                               break;
-                       case DataType::MIDI:
-                               cairo_set_line_width (cr, 1.0);
-                               fraction = (j->first) / 127.0;
-                               snprintf (buf, sizeof (buf), "%3d", j->first);
-                               pos = height - (gint) rintf (height * fraction);
-                               cairo_arc(cr, 3, pos, 1.0, 0, 2 * M_PI);
-                               cairo_fill(cr);
-                               break;
-                       }
-
-                       layout->set_text(buf);
-
-                       /* we want logical extents, not ink extents here */
-
-                       int tw, th;
-                       layout->get_pixel_size(tw, th);
-
-                       int p = pos - (th / 2);
-                       p = min (p, height - th);
-                       p = max (p, 0);
-
-                       cairo_move_to (cr, width-4-tw, p);
-                       pango_cairo_show_layout (cr, layout->gobj());
-               }
-       }
-
-       if (types.size() == 1) {
-               int tw, th;
-               layout->set_attributes (unit_font_attributes);
-               switch (types.at(0)) {
-                       case DataType::AUDIO:
-                               layout->set_text("dBFS");
-                               layout->get_pixel_size(tw, th);
-                               break;
-                       case DataType::MIDI:
-                               layout->set_text("vel");
-                               layout->get_pixel_size(tw, th);
-                               break;
-               }
-               Gdk::Color c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
-               cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
-               cairo_move_to (cr, 1, height - th - 1.5);
-               pango_cairo_show_layout (cr, layout->gobj());
-       }
-
-       cairo_pattern_t* pattern = cairo_pattern_create_for_surface (surface);
-       MetricPatterns::iterator p;
-
-       if ((p = metric_patterns.find (w.get_name())) != metric_patterns.end()) {
-               cairo_pattern_destroy (p->second);
        }
 
-       metric_patterns[w.get_name()] = pattern;
-
-       cairo_destroy (cr);
-       cairo_surface_destroy (surface);
+       meter_metric_area.queue_draw ();
+}
 
-       return pattern;
+void
+MeterStrip::set_pos (int pos)
+{
 }
 
-/* XXX code-copy from gain_meter.cc -- TODO consolidate */
 gint
-MeterStrip::meter_metrics_expose (GdkEventExpose *ev)
+MeterStrip::meter_ticks1_expose (GdkEventExpose *ev)
 {
-       Glib::RefPtr<Gdk::Window> win (meter_metric_area.get_window());
-       cairo_t* cr;
+       return meter_expose_ticks(ev, _types, &meter_ticks1_area);
+}
 
-       cr = gdk_cairo_create (win->gobj());
+gint
+MeterStrip::meter_ticks2_expose (GdkEventExpose *ev)
+{
+       return meter_expose_ticks(ev, _types, &meter_ticks2_area);
+}
 
-       /* clip to expose area */
+void
+MeterStrip::reset_route_peak_display (Route* route)
+{
+       if (_route && _route.get() == route) {
+               reset_peak_display ();
+       }
+}
 
-       gdk_cairo_rectangle (cr, &ev->area);
-       cairo_clip (cr);
+void
+MeterStrip::reset_group_peak_display (RouteGroup* group)
+{
+       if (_route && group == _route->route_group()) {
+               reset_peak_display ();
+       }
+}
 
-       cairo_pattern_t* pattern;
-       MetricPatterns::iterator i = metric_patterns.find (meter_metric_area.get_name());
+void
+MeterStrip::reset_peak_display ()
+{
+       _route->shared_peak_meter()->reset_max();
+       level_meter->clear_meters();
+       max_peak = -INFINITY;
+       peak_display.set_name ("meterbridge peakindicator");
+       peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
+}
 
-       if (i == metric_patterns.end()) {
-               pattern = render_metrics (meter_metric_area, _types);
+bool
+MeterStrip::peak_button_release (GdkEventButton* ev)
+{
+       if (ev->button == 1 && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) {
+               ResetAllPeakDisplays ();
+       } else if (ev->button == 1 && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+               if (_route) {
+                       ResetGroupPeakDisplays (_route->route_group());
+               }
        } else {
-               pattern = i->second;
+               ResetRoutePeakDisplays (_route.get());
        }
-
-       cairo_move_to (cr, 0, 0);
-       cairo_set_source (cr, pattern);
-
-       gint width, height;
-       win->get_size (width, height);
-
-       cairo_rectangle (cr, 0, 0, width, height);
-       cairo_fill (cr);
-
-       cairo_destroy (cr);
-
        return true;
 }
 
-cairo_pattern_t*
-MeterStrip::render_ticks (Gtk::Widget& w, vector<DataType> types)
+void
+MeterStrip::redraw_metrics ()
 {
-       Glib::RefPtr<Gdk::Window> win (w.get_window());
-
-       gint width, height;
-       win->get_size (width, height);
-
-       cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height);
-       cairo_t* cr = cairo_create (surface);
+       meter_metric_area.queue_draw();
+       meter_ticks1_area.queue_draw();
+       meter_ticks2_area.queue_draw();
+}
 
-       cairo_move_to (cr, 0, 0);
-       cairo_rectangle (cr, 0, 0, width, height);
-       {
-               Gdk::Color c = w.get_style()->get_bg (Gtk::STATE_NORMAL);
-               cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
+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();
        }
-       cairo_fill (cr);
-
-       height = min(1024, height); // XXX see FastMeter::max_pattern_metric_size
-       uint32_t peakcolor = ARDOUR_UI::config()->color_by_name ("meterbridge peaklabel");
-
-       for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
-
-               Gdk::Color c;
-
-               if (types.size() > 1) {
-                       /* we're overlaying more than 1 set of marks, so use different colours */
-                       Gdk::Color c;
-                       switch (*i) {
-                       case DataType::AUDIO:
-                               c = w.get_style()->get_fg (Gtk::STATE_NORMAL);
-                               cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
-                               break;
-                       case DataType::MIDI:
-                               c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
-                               cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
-                               break;
-                       }
-               } else {
-                       c = w.get_style()->get_fg (Gtk::STATE_NORMAL);
-                       cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
-               }
-
-               std::map<int,float> points;
-
-               switch (*i) {
-               case DataType::AUDIO:
-                       points.insert (std::pair<int,float>(-60, 0.5));
-                       points.insert (std::pair<int,float>(-50, 0.5));
-                       points.insert (std::pair<int,float>(-40, 0.5));
-                       points.insert (std::pair<int,float>(-30, 0.5));
-                       points.insert (std::pair<int,float>(-25, 0.5));
-                       points.insert (std::pair<int,float>(-20, 1.0));
-
-                       points.insert (std::pair<int,float>(-19, 0.5));
-                       points.insert (std::pair<int,float>(-18, 1.0));
-                       points.insert (std::pair<int,float>(-17, 0.5));
-                       points.insert (std::pair<int,float>(-16, 0.5));
-                       points.insert (std::pair<int,float>(-15, 1.0));
-
-                       points.insert (std::pair<int,float>(-14, 0.5));
-                       points.insert (std::pair<int,float>(-13, 0.5));
-                       points.insert (std::pair<int,float>(-12, 0.5));
-                       points.insert (std::pair<int,float>(-11, 0.5));
-                       points.insert (std::pair<int,float>(-10, 1.0));
-
-                       points.insert (std::pair<int,float>( -9, 0.5));
-                       points.insert (std::pair<int,float>( -8, 0.5));
-                       points.insert (std::pair<int,float>( -7, 0.5));
-                       points.insert (std::pair<int,float>( -6, 0.5));
-                       points.insert (std::pair<int,float>( -5, 1.0));
-                       points.insert (std::pair<int,float>( -4, 0.5));
-                       points.insert (std::pair<int,float>( -3, 0.5));
-                       points.insert (std::pair<int,float>( -2, 0.5));
-                       points.insert (std::pair<int,float>( -1, 0.5));
-
-                       points.insert (std::pair<int,float>(  0, 1.0));
-                       points.insert (std::pair<int,float>(  1, 0.5));
-                       points.insert (std::pair<int,float>(  2, 0.5));
-                       points.insert (std::pair<int,float>(  3, 0.5));
-                       points.insert (std::pair<int,float>(  4, 0.5));
-                       points.insert (std::pair<int,float>(  5, 0.5));
-                       break;
-
-               case DataType::MIDI:
-                       points.insert (std::pair<int,float>(  0, 1.0));
-                       points.insert (std::pair<int,float>( 16, 0.5));
-                       points.insert (std::pair<int,float>( 32, 0.5));
-                       points.insert (std::pair<int,float>( 48, 0.5));
-                       points.insert (std::pair<int,float>( 64, 1.0));
-                       points.insert (std::pair<int,float>( 80, 0.5));
-                       points.insert (std::pair<int,float>( 96, 0.5));
-                       points.insert (std::pair<int,float>(100, 1.0));
-                       points.insert (std::pair<int,float>(112, 0.5));
-                       points.insert (std::pair<int,float>(127, 1.0));
-                       break;
-               }
-
-               for (std::map<int,float>::const_iterator j = points.begin(); j != points.end(); ++j) {
-                       cairo_set_line_width (cr, (j->second));
-
-                       float fraction = 0;
-                       gint pos;
-
-                       switch (*i) {
-                       case DataType::AUDIO:
-                               if (j->first >= 0) {
-                                       cairo_set_source_rgb (cr,
-                                                       UINT_RGBA_R_FLT(peakcolor),
-                                                       UINT_RGBA_G_FLT(peakcolor),
-                                                       UINT_RGBA_B_FLT(peakcolor));
-                               }
-                               fraction = log_meter (j->first);
-                               pos = height - (gint) floor (height * fraction);
-                               cairo_move_to(cr, 0, pos + .5);
-                               cairo_line_to(cr, 3, pos + .5);
-                               cairo_stroke (cr);
-                               break;
-                       case DataType::MIDI:
-                               fraction = (j->first) / 127.0;
-                               pos = height - (gint) floor (height * fraction);
-                               cairo_arc(cr, 1.5, pos, 1.0, 0, 2 * M_PI);
-                               cairo_fill(cr);
-                               break;
-                       }
-               }
+       if (_session->config.get_show_solo_on_meterbridge()) {
+               height += 18;
+               solobox.show();
+       } else {
+               solobox.hide();
        }
-
-       cairo_pattern_t* pattern = cairo_pattern_create_for_surface (surface);
-       TickPatterns::iterator p;
-
-       if ((p = ticks_patterns.find (w.get_name())) != metric_patterns.end()) {
-               cairo_pattern_destroy (p->second);
+       if (_session->config.get_show_rec_on_meterbridge()) {
+               height += 18;
+               recbox.show();
+       } else {
+               recbox.hide();
        }
-
-       ticks_patterns[w.get_name()] = pattern;
-
-       cairo_destroy (cr);
-       cairo_surface_destroy (surface);
-
-       return pattern;
+       btnbox.set_size_request(16, height);
+       check_resize();
 }
 
-gint
-MeterStrip::meter_ticks1_expose (GdkEventExpose *ev)
+void
+MeterStrip::update_name_box ()
 {
-       return meter_ticks_expose(ev, &meter_ticks1_area);
+       if (!_session) return;
+       if (_session->config.get_show_name_on_meterbridge()) {
+               namebx.show();
+       } else {
+               namebx.hide();
+       }
 }
 
-gint
-MeterStrip::meter_ticks2_expose (GdkEventExpose *ev)
+void
+MeterStrip::parameter_changed (std::string const & p)
 {
-       return meter_ticks_expose(ev, &meter_ticks2_area);
+       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();
+       }
 }
 
-gint
-MeterStrip::meter_ticks_expose (GdkEventExpose *ev, Gtk::DrawingArea *mta)
+
+bool
+MeterStrip::level_meter_button_press (GdkEventButton* ev)
 {
-       Glib::RefPtr<Gdk::Window> win (mta->get_window());
-       cairo_t* cr;
+       if (ev->button == 3) {
+               popup_level_meter_menu (ev);
+               return true;
+       }
 
-       cr = gdk_cairo_create (win->gobj());
+       return false;
+}
 
-       /* clip to expose area */
+void
+MeterStrip::popup_level_meter_menu (GdkEventButton* ev)
+{
+       using namespace Gtk::Menu_Helpers;
 
-       gdk_cairo_rectangle (cr, &ev->area);
-       cairo_clip (cr);
+       Gtk::Menu* m = manage (new Menu);
+       MenuList& items = m->items ();
 
-       cairo_pattern_t* pattern;
-       TickPatterns::iterator i = ticks_patterns.find (mta->get_name());
+       RadioMenuItem::Group group;
 
-       if (i == ticks_patterns.end()) {
-               pattern = render_ticks (*mta, _types);
-       } else {
-               pattern = i->second;
-       }
+       _suspend_menu_callbacks = true;
+       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);
 
-       cairo_move_to (cr, 0, 0);
-       cairo_set_source (cr, pattern);
+       MeterType cmt = _route->meter_type();
+       const std::string cmn = ArdourMeter::meter_type_string(cmt);
 
-       gint width, height;
-       win->get_size (width, height);
+       items.push_back (SeparatorElem());
+       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)));
 
-       cairo_rectangle (cr, 0, 0, width, height);
-       cairo_fill (cr);
+       m->popup (ev->button, ev->time);
+       _suspend_menu_callbacks = false;
+}
 
-       cairo_destroy (cr);
+void
+MeterStrip::add_level_meter_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterType type)
+{
+       using namespace Menu_Helpers;
 
-       return true;
+       items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MeterStrip::set_meter_type), type)));
+       RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
+       i->set_active (_route->meter_type() == type);
 }
 
 void
-MeterStrip::reset_group_peak_display (RouteGroup* group)
+MeterStrip::set_meter_type (MeterType type)
 {
-       /* UNUSED -- need connection w/mixer || other meters */
-       if (_route && group == _route->route_group()) {
-               reset_peak_display ();
-       }
+       if (_suspend_menu_callbacks) return;
+       level_meter->set_type (type);
 }
 
 void
-MeterStrip::reset_peak_display ()
+MeterStrip::meter_type_changed (MeterType type)
 {
-       _route->shared_peak_meter()->reset_max();
-       level_meter->clear_meters();
-       max_peak = -INFINITY;
-       peak_display.set_name ("meterbridge peakindicator");
-       peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
+       _route->set_meter_type(type);
 }
 
-bool
-MeterStrip::peak_button_release (GdkEventButton* ev)
+void
+MeterStrip::set_meter_type_multi (int what, RouteGroup* group, MeterType type)
 {
-       reset_peak_display ();
-       return true;
+       switch (what) {
+               case -1:
+                       if (_route && group == _route->route_group()) {
+                               level_meter->set_type (type);
+                       }
+                       break;
+               case 0:
+                       level_meter->set_type (type);
+               default:
+                       if (what == _strip_type) {
+                               level_meter->set_type (type);
+                       }
+                       break;
+       }
 }