shared peak-display reset in mixer+meterbridge
[ardour.git] / gtk2_ardour / gain_meter.cc
index 571f140bac6d7201c8712d0da7173e76ee923abf..124389e3ef00f28529bc47ded28aade499f99114 100644 (file)
 #include <limits.h>
 
 #include "ardour/amp.h"
-#include "ardour/io.h"
-#include "ardour/route.h"
 #include "ardour/route_group.h"
-#include "ardour/session.h"
 #include "ardour/session_route.h"
 #include "ardour/dB.h"
 #include "ardour/utils.h"
 
+#include <pangomm.h>
 #include <gtkmm/style.h>
 #include <gdkmm/color.h>
 #include <gtkmm2ext/utils.h>
 #include "keyboard.h"
 #include "public_editor.h"
 #include "utils.h"
+#include "meter_patterns.h"
 
 #include "ardour/session.h"
 #include "ardour/route.h"
 #include "ardour/meter.h"
+#include "ardour/audio_track.h"
+#include "ardour/midi_track.h"
 
 #include "i18n.h"
 
@@ -60,31 +61,11 @@ using namespace Gtk;
 using namespace std;
 using Gtkmm2ext::Keyboard;
 
-sigc::signal<void> GainMeterBase::ResetAllPeakDisplays;
-sigc::signal<void,RouteGroup*> GainMeterBase::ResetGroupPeakDisplays;
-
-map<string,Glib::RefPtr<Gdk::Pixmap> > GainMeter::metric_pixmaps;
-Glib::RefPtr<Gdk::Pixbuf> GainMeter::slider;
-
-
-void
-GainMeter::setup_slider_pix ()
-{
-       if ((slider = ::get_icon ("fader_belt")) == 0) {
-               throw failed_constructor();
-       }
-}
-
-GainMeterBase::GainMeterBase (Session* s,
-                             const Glib::RefPtr<Gdk::Pixbuf>& pix,
-                             bool horizontal,
-                             int fader_length)
-       : gain_adjustment (0.781787, 0.0, 1.0, 0.01, 0.1)  // 0.781787 is the value needed for gain to be set to 0.
+GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int fader_girth)
+       : gain_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0.0, 1.0, 0.01, 0.1)
        , gain_automation_style_button ("")
        , gain_automation_state_button ("")
-       , style_changed (false)
-       , dpi_changed (false)
-       , _is_midi (false)
+       , _data_type (DataType::AUDIO)
 
 {
        using namespace Menu_Helpers;
@@ -97,40 +78,35 @@ GainMeterBase::GainMeterBase (Session* s,
        _width = Wide;
 
        if (horizontal) {
-               gain_slider = manage (new HSliderController (pix,       
-                                                            &gain_adjustment,
-                                                            fader_length,
-                                                            false));
+               gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, fader_girth, false));
        } else {
-               gain_slider = manage (new VSliderController (pix,
-                                                            &gain_adjustment,
-                                                            fader_length,
-                                                            false));
+               gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, fader_girth, false));
        }
 
        level_meter = new LevelMeter(_session);
 
-       gain_slider->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::start_gain_touch));
-       gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::end_gain_touch));
+       level_meter->ButtonPress.connect_same_thread (_level_meter_connection, boost::bind (&GainMeterBase::level_meter_button_press, this, _1));
+       meter_metric_area.signal_button_press_event().connect (sigc::mem_fun (*this, &GainMeterBase::level_meter_button_press));
+       meter_metric_area.add_events (Gdk::BUTTON_PRESS_MASK);
+
+       gain_slider->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_press), false);
+       gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_release), false);
        gain_slider->set_name ("GainFader");
 
        gain_display.set_name ("MixerStripGainDisplay");
-       gain_display.set_has_frame (false);
        set_size_request_to_display_given_text (gain_display, "-80.g", 2, 6); /* note the descender */
        gain_display.signal_activate().connect (sigc::mem_fun (*this, &GainMeter::gain_activated));
        gain_display.signal_focus_in_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false);
        gain_display.signal_focus_out_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false);
 
        peak_display.set_name ("MixerStripPeakDisplay");
-//     peak_display.set_has_frame (false);
-//     peak_display.set_editable (false);
-       set_size_request_to_display_given_text  (peak_display, "-80.g", 2, 6); /* note the descender */
+       set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */
        max_peak = minus_infinity();
        peak_display.set_label (_("-inf"));
        peak_display.unset_flags (Gtk::CAN_FOCUS);
 
-       gain_automation_style_button.set_name ("MixerAutomationModeButton");
-       gain_automation_state_button.set_name ("MixerAutomationPlaybackButton");
+       gain_automation_style_button.set_name ("mixer strip button");
+       gain_automation_state_button.set_name ("mixer strip button");
 
        ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode"));
        ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type"));
@@ -157,6 +133,16 @@ GainMeterBase::GainMeterBase (Session* s,
        UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &GainMeterBase::on_theme_changed));
        ColorsChanged.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), false));
        DPIReset.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), true));
+       
+//     PBD::ScopedConnection _config_connection;
+//     Config->ParameterChanged.connect ( _config_connection, MISSING_INVALIDATOR, boost::bind(&GainMeterBase::set_flat_buttons, this, _1), gui_context() );
+}
+
+void
+GainMeterBase::set_flat_buttons ()
+{
+printf("set_flat_butt\n");
+//     gain_slider->set_flat_buttons( ARDOUR_UI::config()->flat_buttons.get() );
 }
 
 GainMeterBase::~GainMeterBase ()
@@ -189,29 +175,23 @@ GainMeterBase::set_controls (boost::shared_ptr<Route> r,
        level_meter->set_meter (pm.get());
        gain_slider->set_controllable (amp->gain_control());
 
-       if (!_route || _route->output()->n_ports().n_midi() == 0) {
-               _is_midi = false;
-               gain_adjustment.set_lower (0.0);
-               gain_adjustment.set_upper (1.0);
-               gain_adjustment.set_step_increment (0.01);
-               gain_adjustment.set_page_increment (0.1);
-       } else {
-               _is_midi = true;
-               gain_adjustment.set_lower (0.0);
-               gain_adjustment.set_upper (2.0);
-               gain_adjustment.set_step_increment (0.05);
-               gain_adjustment.set_page_increment (0.1);
+       if (amp) {
+               amp->ConfigurationChanged.connect (
+                       model_connections, invalidator (*this), boost::bind (&GainMeterBase::setup_gain_adjustment, this), gui_context ()
+                       );
        }
 
-       if (!_route || !_route->is_hidden()) {
+       setup_gain_adjustment ();
+
+       if (!_route || !_route->is_auditioner()) {
 
                using namespace Menu_Helpers;
 
                gain_astate_menu.items().clear ();
 
-               gain_astate_menu.items().push_back (MenuElem (_("Manual"),
+               gain_astate_menu.items().push_back (MenuElem (S_("Automation|Manual"),
                                                              sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
-                                                                   Evoral::Parameter(GainAutomation), (AutoState) Off)));
+                                                                         Evoral::Parameter(GainAutomation), (AutoState) ARDOUR::Off)));
                gain_astate_menu.items().push_back (MenuElem (_("Play"),
                                                              sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
                                                                    Evoral::Parameter(GainAutomation), (AutoState) Play)));
@@ -226,13 +206,13 @@ GainMeterBase::set_controls (boost::shared_ptr<Route> r,
                connections.push_back (gain_automation_state_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_state_button_event), false));
 
                boost::shared_ptr<AutomationControl> gc = amp->gain_control();
-               
+
                gc->alist()->automation_state_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_state_changed, this), gui_context());
                gc->alist()->automation_style_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_style_changed, this), gui_context());
-               
+
                gain_automation_state_changed ();
        }
-       
+
        amp->gain_control()->Changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeterBase::gain_changed, this), gui_context());
 
        gain_changed ();
@@ -240,6 +220,42 @@ GainMeterBase::set_controls (boost::shared_ptr<Route> r,
        update_gain_sensitive ();
 }
 
+void
+GainMeterBase::setup_gain_adjustment ()
+{
+       if (!_amp) {
+               return;
+       }
+
+       if (_previous_amp_output_streams == _amp->output_streams ()) {
+               return;
+       }
+
+       ignore_toggle = true;
+
+       if (_amp->output_streams().n_midi() <=  _amp->output_streams().n_audio()) {
+               _data_type = DataType::AUDIO;
+               gain_adjustment.set_lower (0.0);
+               gain_adjustment.set_upper (1.0);
+               gain_adjustment.set_step_increment (0.01);
+               gain_adjustment.set_page_increment (0.1);
+               gain_slider->set_default_value (gain_to_slider_position (1));
+       } else {
+               _data_type = DataType::MIDI;
+               gain_adjustment.set_lower (0.0);
+               gain_adjustment.set_upper (2.0);
+               gain_adjustment.set_step_increment (1.0/128.0);
+               gain_adjustment.set_page_increment (10.0/128.0);
+               gain_slider->set_default_value (1.0);
+       }
+
+       ignore_toggle = false;
+
+       effective_gain_display ();
+       
+       _previous_amp_output_streams = _amp->output_streams ();
+}
+
 void
 GainMeterBase::hide_all_meters ()
 {
@@ -263,16 +279,29 @@ GainMeter::hide_all_meters ()
 void
 GainMeterBase::setup_meters (int len)
 {
-       level_meter->setup_meters(len, 5);
+       int meter_width = 5;
+       if (_width == Wide && _route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
+               meter_width = 10;
+       }
+       level_meter->setup_meters(len, meter_width);
+
+       switch (_width) {
+       case Wide:
+               //meter_metric_area.show();
+               meter_ticks1_area.show();
+               meter_ticks2_area.show();
+               break;
+       case Narrow:
+               //meter_metric_area.hide();
+               meter_ticks1_area.hide();
+               meter_ticks2_area.hide();
+               break;
+       }
 }
 
 void
 GainMeter::setup_meters (int len)
 {
-       if (!meter_metric_area.get_parent()) {
-               level_meter->pack_end (meter_metric_area, false, false);
-               meter_metric_area.show_all ();
-       }
        GainMeterBase::setup_meters (len);
 }
 
@@ -311,7 +340,7 @@ GainMeterBase::reset_peak_display ()
        _meter->reset_max();
        level_meter->clear_meters();
        max_peak = -INFINITY;
-       peak_display.set_label (_("-Inf"));
+       peak_display.set_label (_("-inf"));
        peak_display.set_name ("MixerStripPeakDisplay");
 }
 
@@ -320,7 +349,7 @@ GainMeterBase::reset_group_peak_display (RouteGroup* group)
 {
        if (_route && group == _route->route_group()) {
                reset_peak_display ();
-               }
+       }
 }
 
 void
@@ -360,16 +389,40 @@ GainMeterBase::gain_activated ()
 {
        float f;
 
-       if (sscanf (gain_display.get_text().c_str(), "%f", &f) == 1) {
+       {
+               // Switch to user's preferred locale so that
+               // if they use different LC_NUMERIC conventions,
+               // we will honor them.
 
-               /* clamp to displayable values */
+               PBD::LocaleGuard lg ("");
+               if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) {
+                       return;
+               }
+       }
 
+       /* clamp to displayable values */
+       if (_data_type == DataType::AUDIO) {
                f = min (f, 6.0f);
-
                _amp->set_gain (dB_to_coefficient(f), this);
+       } else {
+               f = min (fabs (f), 2.0f);
+               _amp->set_gain (f, this);
+       }
+
+       if (gain_display.has_focus()) {
+               Gtk::Widget* w = gain_display.get_toplevel();
+               if (w) {
+                       Gtk::Window* win = dynamic_cast<Gtk::Window*> (w);
+
+                       /* sigh. gtkmm doesn't wrap get_default_widget() */
 
-               if (gain_display.has_focus()) {
-                       PublicEditor::instance().reset_focus();
+                       if (win) {
+                               GtkWidget* f = gtk_window_get_default_widget (win->gobj());
+                               if (f) {
+                                       gtk_widget_grab_focus (f);
+                                       return;
+                               }
+                       }
                }
        }
 }
@@ -381,14 +434,17 @@ GainMeterBase::show_gain ()
 
        float v = gain_adjustment.get_value();
 
-       if (!_is_midi) {
+       switch (_data_type) {
+       case DataType::AUDIO:
                if (v == 0.0) {
                        strcpy (buf, _("-inf"));
                } else {
-                       snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain (v)));
+                       snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain_with_max (v, Config->get_max_gain())));
                }
-       } else {
+               break;
+       case DataType::MIDI:
                snprintf (buf, sizeof (buf), "%.1f", v);
+               break;
        }
 
        gain_display.set_text (buf);
@@ -397,17 +453,21 @@ GainMeterBase::show_gain ()
 void
 GainMeterBase::gain_adjusted ()
 {
+       gain_t value;
+
+       /* convert from adjustment range (0..1) to gain coefficient */
+
+       if (_data_type == DataType::AUDIO) {
+               value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain());
+       } else {
+               value = gain_adjustment.get_value();
+       }
+       
        if (!ignore_toggle) {
-               if (_route) {
-                       if (_route->amp() == _amp) {
-                               if (_is_midi) {
-                                       _route->set_gain (gain_adjustment.get_value(), this);
-                               } else {
-                                       _route->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this);
-                               }
-                       } else {
-                               _amp->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this);
-                       }
+               if (_route && _route->amp() == _amp) {
+                       _route->set_gain (value, this);
+               } else {
+                       _amp->set_gain (value, this);
                }
        }
 
@@ -417,18 +477,17 @@ GainMeterBase::gain_adjusted ()
 void
 GainMeterBase::effective_gain_display ()
 {
-       gfloat value;
+       float value = 0.0;
 
-       if (!_route || _route->output()->n_ports().n_midi() == 0) {
-               value = gain_to_slider_position (_amp->gain());
-       } else {
+       switch (_data_type) {
+       case DataType::AUDIO:
+               value = gain_to_slider_position_with_max (_amp->gain(), Config->get_max_gain());
+               break;
+       case DataType::MIDI:
                value = _amp->gain ();
+               break;
        }
 
-       //cerr << this << " for " << _io->name() << " EGAIN = " << value
-       //              << " AGAIN = " << gain_adjustment.get_value () << endl;
-       // stacktrace (cerr, 20);
-
        if (gain_adjustment.get_value() != value) {
                ignore_toggle = true;
                gain_adjustment.set_value (value);
@@ -446,6 +505,8 @@ void
 GainMeterBase::set_meter_strip_name (const char * name)
 {
        meter_metric_area.set_name (name);
+       meter_ticks1_area.set_name (name);
+       meter_ticks2_area.set_name (name);
 }
 
 void
@@ -474,11 +535,15 @@ next_meter_point (MeterPoint mp)
                break;
 
        case MeterPostFader:
+               return MeterOutput;
+               break;
+
+       case MeterOutput:
                return MeterCustom;
                break;
 
        case MeterCustom:
-               return MeterInput;              
+               return MeterInput;
                break;
        }
 
@@ -530,7 +595,7 @@ GainMeterBase::meter_press(GdkEventButton* ev)
                                        */
 
                                        if (ev->button == 1) {
-                                               set_mix_group_meter_point (*_route, next_meter_point (_route->meter_point()));
+                                               set_route_group_meter_point (*_route, next_meter_point (_route->meter_point()));
                                        }
 
                                } else {
@@ -552,8 +617,8 @@ GainMeterBase::meter_press(GdkEventButton* ev)
 gint
 GainMeterBase::meter_release(GdkEventButton*)
 {
-       if(!ignore_toggle){
-               if (wait_for_release){
+       if (!ignore_toggle) {
+               if (wait_for_release) {
                        wait_for_release = false;
 
                        if (_route) {
@@ -572,12 +637,12 @@ GainMeterBase::set_meter_point (Route& route, MeterPoint mp)
 }
 
 void
-GainMeterBase::set_mix_group_meter_point (Route& route, MeterPoint mp)
+GainMeterBase::set_route_group_meter_point (Route& route, MeterPoint mp)
 {
-       RouteGroup* mix_group;
+       RouteGroup* route_group;
 
-       if((mix_group = route.route_group()) != 0){
-               mix_group->foreach_route (boost::bind (&Route::set_meter_point, _1, mp));
+       if ((route_group = route.route_group ()) != 0) {
+               route_group->foreach_route (boost::bind (&Route::set_meter_point, _1, mp, false));
        } else {
                route.set_meter_point (mp);
        }
@@ -591,18 +656,25 @@ GainMeterBase::meter_point_clicked ()
        }
 }
 
-gint
-GainMeterBase::start_gain_touch (GdkEventButton*)
+bool
+GainMeterBase::gain_slider_button_press (GdkEventButton* ev)
 {
-       _amp->gain_control()->start_touch (_amp->session().transport_frame());
-       return FALSE;
+       switch (ev->type) {
+       case GDK_BUTTON_PRESS:
+               _amp->gain_control()->start_touch (_amp->session().transport_frame());
+               break;
+       default:
+               return false;
+       }
+
+       return false;
 }
 
-gint
-GainMeterBase::end_gain_touch (GdkEventButton*)
+bool
+GainMeterBase::gain_slider_button_release (GdkEventButton*)
 {
        _amp->gain_control()->stop_touch (false, _amp->session().transport_frame());
-       return FALSE;
+       return false;
 }
 
 gint
@@ -658,7 +730,7 @@ GainMeterBase::_astate_string (AutoState state, bool shrt)
        string sstr;
 
        switch (state) {
-       case Off:
+       case ARDOUR::Off:
                sstr = (shrt ? "M" : _("M"));
                break;
        case Play:
@@ -704,10 +776,10 @@ GainMeterBase::gain_automation_style_changed ()
 {
        switch (_width) {
        case Wide:
-               gain_automation_style_button.set_label (astyle_string(_amp->gain_control()->alist()->automation_style()));
+               gain_automation_style_button.set_text (astyle_string(_amp->gain_control()->alist()->automation_style()));
                break;
        case Narrow:
-               gain_automation_style_button.set_label  (short_astyle_string(_amp->gain_control()->alist()->automation_style()));
+               gain_automation_style_button.set_text  (short_astyle_string(_amp->gain_control()->alist()->automation_style()));
                break;
        }
 }
@@ -721,14 +793,14 @@ GainMeterBase::gain_automation_state_changed ()
 
        switch (_width) {
        case Wide:
-               gain_automation_state_button.set_label (astate_string(_amp->gain_control()->alist()->automation_state()));
+               gain_automation_state_button.set_text (astate_string(_amp->gain_control()->alist()->automation_state()));
                break;
        case Narrow:
-               gain_automation_state_button.set_label (short_astate_string(_amp->gain_control()->alist()->automation_state()));
+               gain_automation_state_button.set_text (short_astate_string(_amp->gain_control()->alist()->automation_state()));
                break;
        }
 
-       x = (_amp->gain_control()->alist()->automation_state() != Off);
+       x = (_amp->gain_control()->alist()->automation_state() != ARDOUR::Off);
 
        if (gain_automation_state_button.get_active() != x) {
                ignore_toggle = true;
@@ -770,37 +842,49 @@ GainMeterBase::update_meters()
 
 void GainMeterBase::color_handler(bool dpi)
 {
-       color_changed = true;
-       dpi_changed = (dpi) ? true : false;
+       meter_clear_pattern_cache();
        setup_meters();
+       meter_metric_area.queue_draw ();
+       meter_ticks1_area.queue_draw ();
+       meter_ticks2_area.queue_draw ();
 }
 
 void
 GainMeterBase::set_width (Width w, int len)
 {
        _width = w;
-       level_meter->setup_meters (len);
+       int meter_width = 5;
+       if (_width == Wide && _route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
+               meter_width = 10;
+       }
+       level_meter->setup_meters(len, meter_width);
 }
 
 
 void
 GainMeterBase::on_theme_changed()
 {
-       style_changed = true;
+       meter_clear_pattern_cache();
+       meter_metric_area.queue_draw ();
+       meter_ticks1_area.queue_draw ();
+       meter_ticks2_area.queue_draw ();
 }
 
 GainMeter::GainMeter (Session* s, int fader_length)
-       : GainMeterBase (s, slider, false, fader_length)
+       : GainMeterBase (s, false, fader_length, 24)
+       , gain_display_box(true, 0)
+       , hbox(true, 2)
 {
-       gain_display_box.set_homogeneous (true);
-       gain_display_box.set_spacing (2);
+       if (gain_display.get_parent()) {
+               gain_display.get_parent()->remove (gain_display);
+       }
        gain_display_box.pack_start (gain_display, true, true);
 
        meter_metric_area.set_name ("AudioTrackMetrics");
-       set_size_request_to_display_given_text (meter_metric_area, "-127", 0, 0);
+       set_size_request_to_display_given_text (meter_metric_area, "-8888", 1, 0);
 
-       gain_automation_style_button.set_name ("MixerAutomationModeButton");
-       gain_automation_state_button.set_name ("MixerAutomationPlaybackButton");
+       gain_automation_style_button.set_name ("mixer strip button");
+       gain_automation_state_button.set_name ("mixer strip button");
 
        ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode"));
        ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type"));
@@ -811,22 +895,38 @@ GainMeter::GainMeter (Session* s, int fader_length)
        gain_automation_state_button.set_size_request(15, 15);
        gain_automation_style_button.set_size_request(15, 15);
 
-       HBox* fader_centering_box = manage (new HBox);
-       fader_centering_box->pack_start (*gain_slider, true, false);
-
        fader_vbox = manage (new Gtk::VBox());
        fader_vbox->set_spacing (0);
-       fader_vbox->pack_start (*fader_centering_box, false, false, 0);
+       fader_vbox->pack_start (*gain_slider, true, true);
+
+       fader_alignment.set (0.5, 0.5, 0.0, 1.0);
+       fader_alignment.add (*fader_vbox);
 
-       hbox.set_spacing (2);
-       hbox.pack_start (*fader_vbox, true, true);
+       hbox.pack_start (fader_alignment, true, true);
 
        set_spacing (2);
 
        pack_start (gain_display_box, Gtk::PACK_SHRINK);
        pack_start (hbox, Gtk::PACK_SHRINK);
 
-       meter_metric_area.signal_expose_event().connect (sigc::mem_fun(*this, &GainMeter::meter_metrics_expose));
+       meter_alignment.set (0.5, 0.5, 0.0, 1.0);
+       meter_alignment.add (*level_meter);
+
+       meter_metric_area.signal_expose_event().connect (
+               sigc::mem_fun(*this, &GainMeter::meter_metrics_expose));
+
+       meter_ticks1_area.set_size_request(3,-1);
+       meter_ticks2_area.set_size_request(3,-1);
+
+       meter_ticks1_area.signal_expose_event().connect (
+                       sigc::mem_fun(*this, &GainMeter::meter_ticks1_expose));
+       meter_ticks2_area.signal_expose_event().connect (
+                       sigc::mem_fun(*this, &GainMeter::meter_ticks2_expose));
+
+       meter_hbox.pack_start (meter_ticks1_area, false, false);
+       meter_hbox.pack_start (meter_alignment, true, true);
+       meter_hbox.pack_start (meter_ticks2_area, false, false);
+       meter_hbox.pack_start (meter_metric_area, false, false);
 }
 
 void
@@ -834,43 +934,38 @@ GainMeter::set_controls (boost::shared_ptr<Route> r,
                         boost::shared_ptr<PeakMeter> meter,
                         boost::shared_ptr<Amp> amp)
 {
-       if (level_meter->get_parent()) {
-               hbox.remove (*level_meter);
+       if (meter_alignment.get_parent()) {
+               hbox.remove (meter_hbox);
        }
 
-       if (peak_display.get_parent()) {
-               gain_display_box.remove (peak_display);
-       }
-
-       if (gain_automation_state_button.get_parent()) {
-               fader_vbox->remove (gain_automation_state_button);
-       }
+//     if (gain_automation_state_button.get_parent()) {
+//             fader_vbox->remove (gain_automation_state_button);
+//     }
 
        GainMeterBase::set_controls (r, meter, amp);
 
        if (_meter) {
                _meter->ConfigurationChanged.connect (
-                       model_connections, invalidator (*this), ui_bind (&GainMeter::meter_configuration_changed, this, _1), gui_context()
+                       model_connections, invalidator (*this), boost::bind (&GainMeter::meter_configuration_changed, this, _1), gui_context()
                        );
-               
+
                meter_configuration_changed (_meter->input_streams ());
        }
 
-       
+
        /*
           if we have a non-hidden route (ie. we're not the click or the auditioner),
           pack some route-dependent stuff.
        */
 
-       gain_display_box.pack_end (peak_display, true, true);
-       hbox.pack_end (*level_meter, true, true);
+       hbox.pack_start (meter_hbox, true, true);
 
-       if (r && !r->is_hidden()) {
-               fader_vbox->pack_start (gain_automation_state_button, false, false, 0);
-       }
+//     if (r && !r->is_auditioner()) {
+//             fader_vbox->pack_start (gain_automation_state_button, false, false, 0);
+//     }
 
-       setup_meters ();
        hbox.show_all ();
+       setup_meters ();
 }
 
 int
@@ -881,137 +976,22 @@ GainMeter::get_gm_width ()
        return sz.width;
 }
 
-Glib::RefPtr<Gdk::Pixmap>
-GainMeter::render_metrics (Gtk::Widget& w, vector<DataType> types)
+gint
+GainMeter::meter_metrics_expose (GdkEventExpose *ev)
 {
-       Glib::RefPtr<Gdk::Window> win (w.get_window());
-       Glib::RefPtr<Gdk::GC> bg_gc (w.get_style()->get_bg_gc (Gtk::STATE_NORMAL));
-
-       gint width, height;
-       win->get_size (width, height);
-
-       Glib::RefPtr<Gdk::Pixmap> pixmap = Gdk::Pixmap::create (win, width, height);
-
-       metric_pixmaps[w.get_name()] = pixmap;
-
-       pixmap->draw_rectangle (bg_gc, true, 0, 0, width, height);
-
-       Glib::RefPtr<Pango::Layout> layout = w.create_pango_layout ("");
-
-       for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
-
-               Glib::RefPtr<Gdk::GC> fg_gc (w.get_style()->get_fg_gc (Gtk::STATE_NORMAL));
-               
-               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.set_rgb_p (1, 1, 1);
-                               break;
-                       case DataType::MIDI:
-                               c.set_rgb_p (0.2, 0.2, 0.5);
-                               break;
-                       }
-                       
-                       fg_gc->set_rgb_fg_color (c);
-               }
-
-               vector<int> points;
-               
-               switch (*i) {
-               case DataType::AUDIO:
-                       points.push_back (-50);
-                       points.push_back (-40);
-                       points.push_back (-30);
-                       points.push_back (-20);
-                       points.push_back (-10);
-                       points.push_back (-3);
-                       points.push_back (0);
-                       points.push_back (4);
-                       break;
-                       
-               case DataType::MIDI:
-                       points.push_back (0);
-                       if (types.size() == 1) {
-                               points.push_back (32);
-                       } else {
-                               /* tweak so as not to overlay the -30dB mark */                         
-                               points.push_back (48);
-                       }
-                       points.push_back (64);
-                       points.push_back (96);
-                       points.push_back (127);
-                       break;
-               }
-               
-               char buf[32];
-               
-               for (vector<int>::const_iterator j = points.begin(); j != points.end(); ++j) {
-                       
-                       float fraction = 0;
-                       switch (*i) {
-                       case DataType::AUDIO:
-                               fraction = log_meter (*j);
-                               break;
-                       case DataType::MIDI:
-                               fraction = *j / 127.0;
-                               break;
-                       }
-                       
-                       gint const pos = height - (gint) floor (height * fraction);
-                       
-                       snprintf (buf, sizeof (buf), "%d", abs (*j));
-                       
-                       layout->set_text (buf);
-                       
-                       /* we want logical extents, not ink extents here */
-                       
-                       int tw, th;
-                       layout->get_pixel_size (tw, th);
-                       
-                       pixmap->draw_line (fg_gc, 0, pos, 4, pos);
-                       
-                       int p = pos - (th / 2);
-                       p = min (p, height - th);
-                       p = max (p, 0);
-                       
-                       pixmap->draw_layout (fg_gc, 6, p, layout);
-               }
-       }
-
-       return pixmap;
+       return meter_expose_metrics(ev, _types, &meter_metric_area);
 }
 
 gint
-GainMeter::meter_metrics_expose (GdkEventExpose *ev)
+GainMeter::meter_ticks1_expose (GdkEventExpose *ev)
 {
-       Glib::RefPtr<Gdk::Window> win (meter_metric_area.get_window());
-       Glib::RefPtr<Gdk::GC> bg_gc (meter_metric_area.get_style()->get_bg_gc (Gtk::STATE_INSENSITIVE));
-       GdkRectangle base_rect;
-       GdkRectangle draw_rect;
-       gint width, height;
-
-       win->get_size (width, height);
-
-       base_rect.width = width;
-       base_rect.height = height;
-       base_rect.x = 0;
-       base_rect.y = 0;
-
-       Glib::RefPtr<Gdk::Pixmap> pixmap;
-       std::map<string,Glib::RefPtr<Gdk::Pixmap> >::iterator i = metric_pixmaps.find (meter_metric_area.get_name());
-
-       if (i == metric_pixmaps.end() || style_changed || dpi_changed) {
-               pixmap = render_metrics (meter_metric_area, _types);
-       } else {
-               pixmap = i->second;
-       }
+       return meter_expose_ticks(ev, _types, &meter_ticks1_area);
+}
 
-       gdk_rectangle_intersect (&ev->area, &base_rect, &draw_rect);
-       win->draw_drawable (bg_gc, pixmap, draw_rect.x, draw_rect.y, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
-       style_changed = false;
-       return true;
+gint
+GainMeter::meter_ticks2_expose (GdkEventExpose *ev)
+{
+       return meter_expose_ticks(ev, _types, &meter_ticks2_area);
 }
 
 boost::shared_ptr<PBD::Controllable>
@@ -1024,17 +1004,59 @@ GainMeterBase::get_controllable()
        }
 }
 
+bool
+GainMeterBase::level_meter_button_press (GdkEventButton* ev)
+{
+       return LevelMeterButtonPress (ev); /* EMIT SIGNAL */
+}
+
 void
 GainMeter::meter_configuration_changed (ChanCount c)
 {
+       int type = 0;
        _types.clear ();
 
        for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
                if (c.get (*i) > 0) {
                        _types.push_back (*i);
+                       type |= 1 << (*i);
                }
        }
 
-       style_changed = true;
+       if (_route
+                       && boost::dynamic_pointer_cast<AudioTrack>(_route) == 0
+                       && boost::dynamic_pointer_cast<MidiTrack>(_route) == 0
+                       ) {
+               if (_route->active()) {
+                       set_meter_strip_name ("AudioBusMetrics");
+               } else {
+                       set_meter_strip_name ("AudioBusMetricsInactive");
+               }
+       }
+       else if (type == (1 << DataType::AUDIO)) {
+               if (!_route || _route->active()) {
+                       set_meter_strip_name ("AudioTrackMetrics");
+               } else {
+                       set_meter_strip_name ("AudioTrackMetricsInactive");
+               }
+       }
+       else if (type == (1 << DataType::MIDI)) {
+               if (!_route || _route->active()) {
+                       set_meter_strip_name ("MidiTrackMetrics");
+               } else {
+                       set_meter_strip_name ("MidiTrackMetricsInactive");
+               }
+       } else {
+               if (!_route || _route->active()) {
+                       set_meter_strip_name ("AudioMidiTrackMetrics");
+               } else {
+                       set_meter_strip_name ("AudioMidiTrackMetricsInactive");
+               }
+       }
+
+       meter_clear_pattern_cache();
        meter_metric_area.queue_draw ();
+       meter_ticks1_area.queue_draw ();
+       meter_ticks2_area.queue_draw ();
 }
+