Fix yet another oversight for the windows icon file update
[ardour.git] / gtk2_ardour / gain_meter.cc
index 99f1f75f0e8f2a7ac0255287b1c96c9190deaaf1..5e2cd62c624f3b2b31440f1ef47f6178b9b94520 100644 (file)
@@ -20,6 +20,7 @@
 #include <limits.h>
 
 #include "ardour/amp.h"
+#include "ardour/logmeter.h"
 #include "ardour/route_group.h"
 #include "ardour/session_route.h"
 #include "ardour/dB.h"
 #include <gdkmm/color.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/barcontroller.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include "midi++/manager.h"
 #include "pbd/fastlog.h"
 #include "pbd/stacktrace.h"
 
-#include "ardour_ui.h"
 #include "gain_meter.h"
-#include "global_signals.h"
-#include "logmeter.h"
 #include "gui_thread.h"
 #include "keyboard.h"
 #include "public_editor.h"
 #include "utils.h"
+#include "meter_patterns.h"
+#include "timers.h"
+#include "tooltips.h"
+#include "ui_config.h"
 
 #include "ardour/session.h"
 #include "ardour/route.h"
 #include "ardour/meter.h"
 #include "ardour/audio_track.h"
 #include "ardour/midi_track.h"
+#include "ardour/dB.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace std;
 using Gtkmm2ext::Keyboard;
+using namespace ArdourMeter;
 
-sigc::signal<void> GainMeterBase::ResetAllPeakDisplays;
-sigc::signal<void,RouteGroup*> GainMeterBase::ResetGroupPeakDisplays;
+static void
+reset_cursor_to_default (Gtk::Entry* widget)
+{
+       Glib::RefPtr<Gdk::Window> win = widget->get_text_window ();
+       if (win) {
+               /* C++ doesn't provide a pointer argument version of this
+                  (i.e. you cannot set to NULL to get the default/parent
+                  cursor)
+               */
+               gdk_window_set_cursor (win->gobj(), 0);
+       }
+}
 
-GainMeter::MetricPatterns GainMeter::metric_patterns;
+static void
+reset_cursor_to_default_state (Gtk::StateType, Gtk::Entry* widget)
+{
+       reset_cursor_to_default (widget);
+}
+
+sigc::signal<void, ARDOUR::AutoState> GainMeterBase::ChangeGainAutomationState;
 
 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_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()),  // value
+                          0.0,  // lower
+                          1.0,  // upper
+                          dB_coeff_step(Config->get_max_gain()) / 10.0,  // step increment
+                          dB_coeff_step(Config->get_max_gain()))  // page increment
        , gain_automation_style_button ("")
        , gain_automation_state_button ("")
-       , style_changed (false)
-       , dpi_changed (false)
+       , meter_point_button (_("pre"))
+       , gain_astate_propagate (false)
        , _data_type (DataType::AUDIO)
-
 {
        using namespace Menu_Helpers;
 
@@ -83,20 +105,24 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
        next_release_selects = false;
        _width = Wide;
 
+       fader_length = rint (fader_length * UIConfiguration::instance().get_ui_scale());
+       fader_girth = rint (fader_girth * UIConfiguration::instance().get_ui_scale());
+
        if (horizontal) {
-               gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, fader_girth, false));
+               gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
        } else {
-               gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, fader_girth, false));
+               gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
        }
 
-       level_meter = new LevelMeter(_session);
+       level_meter = new LevelMeterHBox(_session);
 
        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_tweaks (PixFader::Tweaks(PixFader::NoButtonForward | PixFader::NoVerticalScroll));
+       gain_slider->StartGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_start_touch));
+       gain_slider->StopGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_stop_touch));
        gain_slider->set_name ("GainFader");
 
        gain_display.set_name ("MixerStripGainDisplay");
@@ -104,18 +130,28 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
        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);
+       gain_display.set_alignment (0.5);
 
        peak_display.set_name ("MixerStripPeakDisplay");
        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.set_text (_("-inf"));
+       peak_display.set_alignment (0.5);
+
+       /* stuff related to the fact that the peak display is not, in
+          fact, supposed to be a text entry.
+       */
+       peak_display.set_events (peak_display.get_events() & ~(Gdk::EventMask (Gdk::LEAVE_NOTIFY_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::POINTER_MOTION_MASK)));
+       peak_display.signal_map().connect (sigc::bind (sigc::ptr_fun (reset_cursor_to_default), &peak_display));
+       peak_display.signal_state_changed().connect (sigc::bind (sigc::ptr_fun (reset_cursor_to_default_state), &peak_display));
        peak_display.unset_flags (Gtk::CAN_FOCUS);
+       peak_display.set_editable (false);
 
        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"));
+       set_tooltip (gain_automation_state_button, _("Fader automation mode"));
+       set_tooltip (gain_automation_style_button, _("Fader automation type"));
 
        gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
        gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
@@ -127,28 +163,50 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
        gain_astyle_menu.items().push_back (MenuElem (_("Abs")));
 
        gain_astate_menu.set_name ("ArdourContextMenu");
+       gain_astate_menu.set_reserve_toggle_size(false);
        gain_astyle_menu.set_name ("ArdourContextMenu");
 
-       gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::gain_adjusted));
+       meter_point_button.set_name ("mixer strip button");
+
+       set_tooltip (&meter_point_button, _("Metering point"));
+
+       meter_point_button.unset_flags (Gtk::CAN_FOCUS);
+
+       meter_point_button.set_size_request(15, 15);
+
+       meter_point_menu.set_name ("ArdourContextMenu");
+       meter_point_menu.set_reserve_toggle_size(false);
+
+       meter_point_menu.items().clear ();
+       meter_point_menu.items().push_back (MenuElem(_("Input"),
+        sigc::bind (sigc::mem_fun (*this,
+        &GainMeterBase::meter_point_clicked), (MeterPoint) MeterInput)));
+       meter_point_menu.items().push_back (MenuElem(_("Pre Fader"),
+        sigc::bind (sigc::mem_fun (*this,
+        &GainMeterBase::meter_point_clicked), (MeterPoint) MeterPreFader)));
+       meter_point_menu.items().push_back (MenuElem(_("Post Fader"),
+        sigc::bind (sigc::mem_fun (*this,
+        &GainMeterBase::meter_point_clicked), (MeterPoint) MeterPostFader)));
+       meter_point_menu.items().push_back (MenuElem(_("Output"),
+        sigc::bind (sigc::mem_fun (*this,
+        &GainMeterBase::meter_point_clicked), (MeterPoint) MeterOutput)));
+       meter_point_menu.items().push_back (MenuElem(_("Custom"),
+        sigc::bind (sigc::mem_fun (*this,
+        &GainMeterBase::meter_point_clicked), (MeterPoint) MeterCustom)));
+       meter_point_button.signal_button_press_event().connect (sigc::mem_fun (*this, &GainMeter::meter_press), false);
+
+       gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::fader_moved));
        peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeterBase::peak_button_release), false);
        gain_display.signal_key_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_key_press), false);
 
        ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &GainMeterBase::reset_peak_display));
+       ResetRoutePeakDisplays.connect (sigc::mem_fun(*this, &GainMeterBase::reset_route_peak_display));
        ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &GainMeterBase::reset_group_peak_display));
+       RedrawMetrics.connect (sigc::mem_fun(*this, &GainMeterBase::redraw_metrics));
 
        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() );
+       UIConfiguration::instance().ColorsChanged.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), false));
+       UIConfiguration::instance().DPIReset.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), true));
 }
 
 GainMeterBase::~GainMeterBase ()
@@ -160,26 +218,31 @@ GainMeterBase::~GainMeterBase ()
 void
 GainMeterBase::set_controls (boost::shared_ptr<Route> r,
                             boost::shared_ptr<PeakMeter> pm,
-                            boost::shared_ptr<Amp> amp)
+                             boost::shared_ptr<Amp> amp,
+                             boost::shared_ptr<GainControl> control)
 {
-       connections.clear ();
+       connections.clear ();
        model_connections.drop_connections ();
 
-       if (!pm && !amp) {
+       /* no meter and no control? nothing to do ... */
+
+       if (!pm && !control) {
                level_meter->set_meter (0);
                gain_slider->set_controllable (boost::shared_ptr<PBD::Controllable>());
                _meter.reset ();
                _amp.reset ();
                _route.reset ();
+               _control.reset ();
                return;
        }
 
        _meter = pm;
        _amp = amp;
        _route = r;
+       _control = control;
 
-       level_meter->set_meter (pm.get());
-       gain_slider->set_controllable (amp->gain_control());
+       level_meter->set_meter (pm.get());
+       gain_slider->set_controllable (_control);
 
        if (amp) {
                amp->ConfigurationChanged.connect (
@@ -196,34 +259,46 @@ GainMeterBase::set_controls (boost::shared_ptr<Route> r,
                gain_astate_menu.items().clear ();
 
                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) ARDOUR::Off)));
+                                                             sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (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)));
+                                                             sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Play)));
                gain_astate_menu.items().push_back (MenuElem (_("Write"),
-                                                             sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
-                                                                   Evoral::Parameter(GainAutomation), (AutoState) Write)));
+                                                             sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Write)));
                gain_astate_menu.items().push_back (MenuElem (_("Touch"),
-                                                             sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
-                                                                   Evoral::Parameter(GainAutomation), (AutoState) Touch)));
+                                                             sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Touch)));
 
                connections.push_back (gain_automation_style_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_style_button_event), false));
                connections.push_back (gain_automation_state_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_state_button_event), false));
+               connections.push_back (ChangeGainAutomationState.connect (sigc::mem_fun(*this, &GainMeterBase::set_gain_astate)));
 
-               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());
+               _control->alist()->automation_state_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_state_changed, this), gui_context());
+               _control->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());
+       _control->Changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeterBase::gain_changed, this), gui_context());
 
        gain_changed ();
        show_gain ();
        update_gain_sensitive ();
+
+       if (!_meter) {
+               peak_display.hide ();
+       } else {
+               peak_display.show ();
+       }
+}
+
+void
+GainMeterBase::set_gain_astate (AutoState as)
+{
+       if (gain_astate_propagate) {
+               gain_astate_propagate = false;
+               ChangeGainAutomationState (as);
+               return;
+       }
+       _amp->set_parameter_automation_state (Evoral::Parameter (GainAutomation), as);
 }
 
 void
@@ -241,11 +316,11 @@ GainMeterBase::setup_gain_adjustment ()
 
        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));
+               gain_adjustment.set_lower (GAIN_COEFF_ZERO);
+               gain_adjustment.set_upper (GAIN_COEFF_UNITY);
+               gain_adjustment.set_step_increment (dB_coeff_step(Config->get_max_gain()) / 10.0);
+               gain_adjustment.set_page_increment (dB_coeff_step(Config->get_max_gain()));
+               gain_slider->set_default_value (gain_to_slider_position (GAIN_COEFF_UNITY));
        } else {
                _data_type = DataType::MIDI;
                gain_adjustment.set_lower (0.0);
@@ -258,7 +333,7 @@ GainMeterBase::setup_gain_adjustment ()
        ignore_toggle = false;
 
        effective_gain_display ();
-       
+
        _previous_amp_output_streams = _amp->output_streams ();
 }
 
@@ -271,33 +346,75 @@ GainMeterBase::hide_all_meters ()
 void
 GainMeter::hide_all_meters ()
 {
-       bool remove_metric_area = false;
-
        GainMeterBase::hide_all_meters ();
+}
 
-       if (remove_metric_area) {
-               if (meter_metric_area.get_parent()) {
-                       level_meter->remove (meter_metric_area);
-               }
+void
+GainMeterBase::setup_meters (int len)
+{
+       int meter_width = 5;
+       uint32_t meter_channels = 0;
+       if (_meter) {
+               meter_channels = _meter->input_streams().n_total();
+       } else if (_route) {
+               meter_channels = _route->shared_peak_meter()->input_streams().n_total();
        }
+
+       switch (_width) {
+               case Wide:
+                       //meter_ticks1_area.show();
+                       //meter_ticks2_area.show();
+                       meter_metric_area.show();
+                       if (meter_channels == 1) {
+                               meter_width = 10;
+                       }
+                       break;
+               case Narrow:
+                       if (meter_channels > 1) {
+                               meter_width = 4;
+                       }
+                       //meter_ticks1_area.hide();
+                       //meter_ticks2_area.hide();
+                       meter_metric_area.hide();
+                       break;
+       }
+       level_meter->setup_meters(len, meter_width);
 }
 
 void
-GainMeterBase::setup_meters (int len)
+GainMeterBase::set_type (MeterType t)
 {
-       level_meter->setup_meters(len, 5);
+       level_meter->set_meter_type(t);
 }
 
 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 ();
+       switch (_width) {
+               case Wide:
+                       {
+                               uint32_t meter_channels = 0;
+                               if (_meter) {
+                                       meter_channels = _meter->input_streams().n_total();
+                               } else if (_route) {
+                                       meter_channels = _route->shared_peak_meter()->input_streams().n_total();
+                               }
+                               hbox.set_homogeneous(meter_channels < 7 ? true : false);
+                       }
+                       break;
+               case Narrow:
+                       hbox.set_homogeneous(false);
+                       break;
        }
        GainMeterBase::setup_meters (len);
 }
 
+void
+GainMeter::set_type (MeterType t)
+{
+       GainMeterBase::set_type (t);
+}
+
 bool
 GainMeterBase::gain_key_press (GdkEventKey* ev)
 {
@@ -321,7 +438,7 @@ GainMeterBase::peak_button_release (GdkEventButton* ev)
                        ResetGroupPeakDisplays (_route->route_group());
                }
        } else {
-               reset_peak_display ();
+               ResetRoutePeakDisplays (_route.get());
        }
 
        return true;
@@ -330,13 +447,25 @@ GainMeterBase::peak_button_release (GdkEventButton* ev)
 void
 GainMeterBase::reset_peak_display ()
 {
+       if (!_route) {
+               // catch "reset all" for VCAs
+               return;
+       }
        _meter->reset_max();
        level_meter->clear_meters();
-       max_peak = -INFINITY;
-       peak_display.set_label (_("-Inf"));
+       max_peak = minus_infinity ();
+       peak_display.set_text (_("-inf"));
        peak_display.set_name ("MixerStripPeakDisplay");
 }
 
+void
+GainMeterBase::reset_route_peak_display (Route* route)
+{
+       if (_route && _route.get() == route) {
+               reset_peak_display ();
+       }
+}
+
 void
 GainMeterBase::reset_group_peak_display (RouteGroup* group)
 {
@@ -382,24 +511,18 @@ GainMeterBase::gain_activated ()
 {
        float f;
 
-       {
-               // Switch to user's preferred locale so that
-               // if they use different LC_NUMERIC conventions,
-               // we will honor them.
-
-               PBD::LocaleGuard lg ("");
-               if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) {
-                       return;
-               }
+       // Use the user's preferred locale/LC_NUMERIC setting
+       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);
+               _control->set_value (dB_to_coefficient(f), Controllable::UseGroup);
        } else {
                f = min (fabs (f), 2.0f);
-               _amp->set_gain (f, this);
+               _control->set_value (f, Controllable::UseGroup);
        }
 
        if (gain_display.has_focus()) {
@@ -444,23 +567,27 @@ GainMeterBase::show_gain ()
 }
 
 void
-GainMeterBase::gain_adjusted ()
+GainMeterBase::fader_moved ()
 {
-       gain_t value;
+       if (!ignore_toggle) {
 
-       /* convert from adjustment range (0..1) to gain coefficient */
+               gain_t value;
 
-       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 && _route->amp() == _amp) {
-                       _route->set_gain (value, this);
+               /* 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();
+               }
+
+               // XXX hack allow to override group
+               // (this breaks group'ed  shift+click reset)
+               if (Keyboard::the_keyboard().key_is_down (GDK_Shift_R)
+                               || Keyboard::the_keyboard().key_is_down (GDK_Shift_L)) {
+                       _control->set_value (value, Controllable::NoGroup);
                } else {
-                       _amp->set_gain (value, this);
+                       _control->set_value (value, Controllable::UseGroup);
                }
        }
 
@@ -470,20 +597,23 @@ GainMeterBase::gain_adjusted ()
 void
 GainMeterBase::effective_gain_display ()
 {
-       float value = 0.0;
+       gain_t fader_position = 0;
 
        switch (_data_type) {
        case DataType::AUDIO:
-               value = gain_to_slider_position_with_max (_amp->gain(), Config->get_max_gain());
+               /* the position of the fader should reflect any master gain,
+                * not just the control's own inherent value
+                */
+               fader_position = gain_to_slider_position_with_max (_control->get_value(), Config->get_max_gain());
                break;
        case DataType::MIDI:
-               value = _amp->gain ();
+               fader_position = _control->get_value ();
                break;
        }
 
-       if (gain_adjustment.get_value() != value) {
+       if (gain_adjustment.get_value() != fader_position) {
                ignore_toggle = true;
-               gain_adjustment.set_value (value);
+               gain_adjustment.set_value (fader_position);
                ignore_toggle = false;
        }
 }
@@ -497,7 +627,12 @@ GainMeterBase::gain_changed ()
 void
 GainMeterBase::set_meter_strip_name (const char * name)
 {
+       char tmp[256];
        meter_metric_area.set_name (name);
+       sprintf(tmp, "Mark%sLeft", name);
+       meter_ticks1_area.set_name (tmp);
+       sprintf(tmp, "Mark%sRight", name);
+       meter_ticks2_area.set_name (tmp);
 }
 
 void
@@ -509,115 +644,45 @@ GainMeterBase::set_fader_name (const char * name)
 void
 GainMeterBase::update_gain_sensitive ()
 {
-       bool x = !(_amp->gain_control()->alist()->automation_state() & Play);
+       bool x = !(_control->alist()->automation_state() & Play);
        static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (x);
 }
 
-static MeterPoint
-next_meter_point (MeterPoint mp)
-{
-       switch (mp) {
-       case MeterInput:
-               return MeterPreFader;
-               break;
-
-       case MeterPreFader:
-               return MeterPostFader;
-               break;
-
-       case MeterPostFader:
-               return MeterOutput;
-               break;
-
-       case MeterOutput:
-               return MeterCustom;
-               break;
-
-       case MeterCustom:
-               return MeterInput;
-               break;
-       }
-
-       /*NOTREACHED*/
-       return MeterInput;
-}
-
 gint
 GainMeterBase::meter_press(GdkEventButton* ev)
 {
-       wait_for_release = false;
-
        if (!_route) {
-               return FALSE;
+               return false;
        }
-
        if (!ignore_toggle) {
-
-               if (Keyboard::is_context_menu_event (ev)) {
-
-                       // no menu at this time.
-
-               } else {
-
-                       if (Keyboard::is_button2_event(ev)) {
-
-                               // Primary-button2 click is the midi binding click
-                               // button2-click is "momentary"
-
-                               if (!Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) {
-                                       wait_for_release = true;
-                                       old_meter_point = _route->meter_point ();
-                               }
-                       }
-
-                       if (_route && (ev->button == 1 || Keyboard::is_button2_event (ev))) {
-
+               switch (ev->button) {
+                       case 1:
                                if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
 
                                        /* Primary+Tertiary-click applies change to all routes */
 
-                                       _session->foreach_route (this, &GainMeterBase::set_meter_point, next_meter_point (_route->meter_point()));
-
+                                       meter_point_change_target = MeterPointChangeAll;
 
                                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 
-                                       /* Primary-click: solo mix group.
-                                          NOTE: Primary-button2 is MIDI learn.
-                                       */
+                                       /* Primary-click: apply change to all routes in group */
 
-                                       if (ev->button == 1) {
-                                               set_route_group_meter_point (*_route, next_meter_point (_route->meter_point()));
-                                       }
+                                       meter_point_change_target = MeterPointChangeGroup;
 
                                } else {
 
                                        /* click: change just this route */
 
-                                       // XXX no undo yet
-
-                                       _route->set_meter_point (next_meter_point (_route->meter_point()));
+                                       meter_point_change_target = MeterPointChangeSingle;
                                }
-                       }
-               }
-       }
-
-       return true;
-
-}
-
-gint
-GainMeterBase::meter_release(GdkEventButton*)
-{
-       if (!ignore_toggle) {
-               if (wait_for_release) {
-                       wait_for_release = false;
-
-                       if (_route) {
-                               set_meter_point (*_route, old_meter_point);
-                       }
+                               Gtkmm2ext::anchored_menu_popup(&meter_point_menu,
+                                                            &meter_point_button,
+                                                          "", 1, ev->time);
+                               break;
+                       default:
+                               break;
                }
        }
-
        return true;
 }
 
@@ -640,32 +705,34 @@ GainMeterBase::set_route_group_meter_point (Route& route, MeterPoint mp)
 }
 
 void
-GainMeterBase::meter_point_clicked ()
+GainMeterBase::meter_point_clicked (MeterPoint mp)
 {
        if (_route) {
-               /* WHAT? */
+               switch (meter_point_change_target) {
+                       case MeterPointChangeAll:
+                               _session->foreach_route (this, &GainMeterBase::set_meter_point, mp);
+                               break;
+                       case MeterPointChangeGroup:
+                               set_route_group_meter_point (*_route, mp);
+                               break;
+                       case MeterPointChangeSingle:
+                               _route->set_meter_point (mp);
+                               break;
+               }
        }
 }
 
-bool
-GainMeterBase::gain_slider_button_press (GdkEventButton* ev)
+void
+GainMeterBase::amp_start_touch ()
 {
-       switch (ev->type) {
-       case GDK_BUTTON_PRESS:
-               _amp->gain_control()->start_touch (_amp->session().transport_frame());
-               break;
-       default:
-               return false;
-       }
-
-       return false;
+       _control->start_touch (_control->session().transport_frame());
 }
 
-bool
-GainMeterBase::gain_slider_button_release (GdkEventButton*)
+void
+GainMeterBase::amp_stop_touch ()
 {
-       _amp->gain_control()->stop_touch (false, _amp->session().transport_frame());
-       return false;
+       _control->stop_touch (false, _control->session().transport_frame());
+       effective_gain_display ();
 }
 
 gint
@@ -677,7 +744,10 @@ GainMeterBase::gain_automation_state_button_event (GdkEventButton *ev)
 
        switch (ev->button) {
                case 1:
-                       gain_astate_menu.popup (1, ev->time);
+                       gain_astate_propagate = Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier));
+                       Gtkmm2ext::anchored_menu_popup(&gain_astate_menu,
+                                                      &gain_automation_state_button,
+                                                      "", 1, ev->time);
                        break;
                default:
                        break;
@@ -767,10 +837,10 @@ GainMeterBase::gain_automation_style_changed ()
 {
        switch (_width) {
        case Wide:
-               gain_automation_style_button.set_text (astyle_string(_amp->gain_control()->alist()->automation_style()));
+               gain_automation_style_button.set_text (astyle_string(_control->alist()->automation_style()));
                break;
        case Narrow:
-               gain_automation_style_button.set_text  (short_astyle_string(_amp->gain_control()->alist()->automation_style()));
+               gain_automation_style_button.set_text  (short_astyle_string(_control->alist()->automation_style()));
                break;
        }
 }
@@ -778,38 +848,44 @@ GainMeterBase::gain_automation_style_changed ()
 void
 GainMeterBase::gain_automation_state_changed ()
 {
-       ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed)
-
-       bool x;
+       ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed);
 
        switch (_width) {
        case Wide:
-               gain_automation_state_button.set_text (astate_string(_amp->gain_control()->alist()->automation_state()));
+               gain_automation_state_button.set_text (astate_string(_control->alist()->automation_state()));
                break;
        case Narrow:
-               gain_automation_state_button.set_text (short_astate_string(_amp->gain_control()->alist()->automation_state()));
+               gain_automation_state_button.set_text (short_astate_string(_control->alist()->automation_state()));
                break;
        }
 
-       x = (_amp->gain_control()->alist()->automation_state() != ARDOUR::Off);
+       const bool automation_watch_required = (_control->alist()->automation_state() != ARDOUR::Off);
 
-       if (gain_automation_state_button.get_active() != x) {
+       if (gain_automation_state_button.get_active() != automation_watch_required) {
                ignore_toggle = true;
-               gain_automation_state_button.set_active (x);
+               gain_automation_state_button.set_active (automation_watch_required);
                ignore_toggle = false;
        }
 
        update_gain_sensitive ();
 
-       /* start watching automation so that things move */
-
        gain_watching.disconnect();
 
-       if (x) {
-               gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display));
+       if (automation_watch_required) {
+               /* start watching automation so that things move */
+               gain_watching = Timers::rapid_connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display));
+       } else {
+               /* update once to get the correct value shown as we re-enter off/manual mode */
+               effective_gain_display();
        }
 }
 
+const ChanCount
+GainMeterBase::meter_channels() const
+{
+               if (_meter) { return _meter->input_streams(); }
+               else { return ChanCount(); }
+}
 void
 GainMeterBase::update_meters()
 {
@@ -819,22 +895,19 @@ GainMeterBase::update_meters()
        if (mpeak > max_peak) {
                max_peak = mpeak;
                if (mpeak <= -200.0f) {
-                       peak_display.set_label (_("-inf"));
+                       peak_display.set_text (_("-inf"));
                } else {
                        snprintf (buf, sizeof(buf), "%.1f", mpeak);
-                       peak_display.set_label (buf);
-               }
-
-               if (mpeak >= 0.0f) {
-                       peak_display.set_name ("MixerStripPeakDisplayPeak");
+                       peak_display.set_text (buf);
                }
        }
+       if (mpeak >= UIConfiguration::instance().get_meter_peak()) {
+               peak_display.set_name ("MixerStripPeakDisplayPeak");
+       }
 }
 
-void GainMeterBase::color_handler(bool dpi)
+void GainMeterBase::color_handler(bool /*dpi*/)
 {
-       color_changed = true;
-       dpi_changed = (dpi) ? true : false;
        setup_meters();
 }
 
@@ -842,16 +915,29 @@ 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;
 }
 
+void
+GainMeterBase::redraw_metrics()
+{
+       meter_metric_area.queue_draw ();
+       meter_ticks1_area.queue_draw ();
+       meter_ticks2_area.queue_draw ();
+}
+
+#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale()))
+
 GainMeter::GainMeter (Session* s, int fader_length)
        : GainMeterBase (s, false, fader_length, 24)
        , gain_display_box(true, 0)
@@ -862,283 +948,170 @@ GainMeter::GainMeter (Session* s, int fader_length)
        }
        gain_display_box.pack_start (gain_display, true, true);
 
+       if (peak_display.get_parent()) {
+               peak_display.get_parent()->remove (gain_display);
+       }
+       gain_display_box.pack_start (peak_display, true, true);
+
        meter_metric_area.set_name ("AudioTrackMetrics");
-       set_size_request_to_display_given_text (meter_metric_area, "-127", 1, 0);
+       meter_metric_area.set_size_request(PX_SCALE(24, 24), -1);
 
        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"));
+       set_tooltip (gain_automation_state_button, _("Fader automation mode"));
+       set_tooltip (gain_automation_style_button, _("Fader automation type"));
 
        gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
        gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
 
-       gain_automation_state_button.set_size_request(15, 15);
-       gain_automation_style_button.set_size_request(15, 15);
+       gain_automation_state_button.set_size_request (PX_SCALE(12, 15), PX_SCALE(12, 15));
+       gain_automation_style_button.set_size_request (PX_SCALE(12, 15), PX_SCALE(12, 15));
 
-       fader_vbox = manage (new Gtk::VBox());
-       fader_vbox->set_spacing (0);
-       fader_vbox->pack_start (*gain_slider, true, true);
+       fader_vbox.set_spacing (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);
+       fader_alignment.add (fader_vbox);
 
        hbox.pack_start (fader_alignment, true, true);
 
-       set_spacing (2);
+       set_spacing (PX_SCALE(2, 2));
 
        pack_start (gain_display_box, Gtk::PACK_SHRINK);
-       pack_start (hbox, Gtk::PACK_SHRINK);
+       pack_start (hbox, true, true);
 
        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 (PX_SCALE(3, 3), -1);
+       meter_ticks2_area.set_size_request (PX_SCALE(3, 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, false, false);
+       meter_hbox.pack_start (meter_ticks2_area, false, false);
+       meter_hbox.pack_start (meter_metric_area, false, false);
 }
+#undef PX_SCALE
+
+GainMeter::~GainMeter () { }
 
 void
 GainMeter::set_controls (boost::shared_ptr<Route> r,
                         boost::shared_ptr<PeakMeter> meter,
-                        boost::shared_ptr<Amp> amp)
+                         boost::shared_ptr<Amp> amp,
+                        boost::shared_ptr<GainControl> control)
 {
-       if (meter_alignment.get_parent()) {
-               hbox.remove (meter_alignment);
+       if (meter_hbox.get_parent()) {
+               hbox.remove (meter_hbox);
        }
 
 //     if (gain_automation_state_button.get_parent()) {
 //             fader_vbox->remove (gain_automation_state_button);
 //     }
 
-       GainMeterBase::set_controls (r, meter, amp);
+       GainMeterBase::set_controls (r, meter, amp, control);
 
        if (_meter) {
                _meter->ConfigurationChanged.connect (
                        model_connections, invalidator (*this), boost::bind (&GainMeter::meter_configuration_changed, this, _1), gui_context()
                        );
+               _meter->TypeChanged.connect (
+                       model_connections, invalidator (*this), boost::bind (&GainMeter::meter_type_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.
-       */
-
-       hbox.pack_start (meter_alignment, true, true);
+       if (_route) {
+               _route->active_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::route_active_changed, this), gui_context ());
+               hbox.pack_start (meter_hbox, true, true);
+               meter_hbox.show ();
+       }
 
 //     if (r && !r->is_auditioner()) {
 //             fader_vbox->pack_start (gain_automation_state_button, false, false, 0);
 //     }
 
+       gain_display_box.show ();
+       gain_display.show ();
+       gain_slider->show ();
+       fader_vbox.show ();
+       fader_alignment.show ();
+       hbox.show ();
        setup_meters ();
-       hbox.show_all ();
 }
 
 int
 GainMeter::get_gm_width ()
 {
        Gtk::Requisition sz;
-       hbox.size_request (sz);
-       return sz.width;
+       int min_w = 0;
+       sz.width = 0;
+       meter_metric_area.size_request (sz);
+       min_w += sz.width;
+       level_meter->size_request (sz);
+       min_w += sz.width;
+
+       fader_alignment.size_request (sz);
+       if (_width == Wide)
+               return max(sz.width * 2, min_w * 2) + 6;
+       else
+               return sz.width + min_w + 6;
+
 }
 
-cairo_pattern_t*
-GainMeter::render_metrics (Gtk::Widget& w, vector<DataType> types)
+gint
+GainMeter::meter_metrics_expose (GdkEventExpose *ev)
 {
-       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::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 (10.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;
-
-
-       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);
-
-       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());
-               }
-
-               vector<int> points;
-
-               switch (*i) {
-               case DataType::AUDIO:
-                       layout->set_attributes (audio_font_attributes);
-                       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:
-                       layout->set_attributes (midi_font_attributes);
-                       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);
-
-                       cairo_set_line_width (cr, 1.0);
-                       cairo_move_to (cr, 0, pos);
-                       cairo_line_to (cr, 3.5, pos);
-                       cairo_stroke (cr);
-                       
-                       snprintf (buf, sizeof (buf), "%2d", abs (*j));
-                       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, 5, p);
-                       pango_cairo_show_layout (cr, layout->gobj());
-               }
+       if (!_route) {
+               if (_types.empty()) { _types.push_back(DataType::AUDIO); }
+               return meter_expose_metrics(ev, MeterPeak, _types, &meter_metric_area);
        }
+       return meter_expose_metrics(ev, _route->meter_type(), _types, &meter_metric_area);
+}
 
-       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);
+gint
+GainMeter::meter_ticks1_expose (GdkEventExpose *ev)
+{
+       if (!_route) {
+               if (_types.empty()) { _types.push_back(DataType::AUDIO); }
+               return meter_expose_ticks(ev, MeterPeak, _types, &meter_ticks1_area);
        }
-
-       metric_patterns[w.get_name()] = pattern;
-       
-       cairo_destroy (cr);
-       cairo_surface_destroy (surface);
-
-       return pattern;
+       return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks1_area);
 }
 
 gint
-GainMeter::meter_metrics_expose (GdkEventExpose *ev)
+GainMeter::meter_ticks2_expose (GdkEventExpose *ev)
 {
-       Glib::RefPtr<Gdk::Window> win (meter_metric_area.get_window());
-       cairo_t* cr;
-
-       cr = gdk_cairo_create (win->gobj());
-       
-       /* clip to expose area */
-
-       gdk_cairo_rectangle (cr, &ev->area);
-       cairo_clip (cr);
-
-       cairo_pattern_t* pattern;
-       MetricPatterns::iterator i = metric_patterns.find (meter_metric_area.get_name());
-
-       if (i == metric_patterns.end() || style_changed || dpi_changed) {
-               pattern = render_metrics (meter_metric_area, _types);
-       } else {
-               pattern = i->second;
+       if (!_route) {
+               if (_types.empty()) { _types.push_back(DataType::AUDIO); }
+               return meter_expose_ticks(ev, MeterPeak, _types, &meter_ticks2_area);
        }
+       return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks2_area);
+}
 
-       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);
-
-       style_changed = false;
-       dpi_changed = false;
-
-       cairo_destroy (cr);
-
-       return true;
+void
+GainMeter::on_style_changed (const Glib::RefPtr<Gtk::Style>&)
+{
+       gain_display.queue_draw();
+       peak_display.queue_draw();
 }
 
 boost::shared_ptr<PBD::Controllable>
 GainMeterBase::get_controllable()
 {
        if (_amp) {
-               return _amp->gain_control();
+               return _control;
        } else {
                return boost::shared_ptr<PBD::Controllable>();
        }
@@ -1147,7 +1120,7 @@ GainMeterBase::get_controllable()
 bool
 GainMeterBase::level_meter_button_press (GdkEventButton* ev)
 {
-       return LevelMeterButtonPress (ev); /* EMIT SIGNAL */
+       return static_cast<bool>(LevelMeterButtonPress (ev)); /* EMIT SIGNAL */
 }
 
 void
@@ -1163,7 +1136,8 @@ GainMeter::meter_configuration_changed (ChanCount c)
                }
        }
 
-       if (boost::dynamic_pointer_cast<AudioTrack>(_route) == 0
+       if (_route
+                       && boost::dynamic_pointer_cast<AudioTrack>(_route) == 0
                        && boost::dynamic_pointer_cast<MidiTrack>(_route) == 0
                        ) {
                if (_route->active()) {
@@ -1172,28 +1146,46 @@ GainMeter::meter_configuration_changed (ChanCount c)
                        set_meter_strip_name ("AudioBusMetricsInactive");
                }
        }
-       else if (type == (1 << DataType::AUDIO)) {
-               if (_route->active()) {
-                       set_meter_strip_name ("AudioTrackMetrics");
+       else if (
+                          (type == (1 << DataType::MIDI))
+                       || (_route && boost::dynamic_pointer_cast<MidiTrack>(_route))
+                       ) {
+               if (!_route || _route->active()) {
+                       set_meter_strip_name ("MidiTrackMetrics");
                } else {
-                       set_meter_strip_name ("AudioTrackMetricsInactive");
+                       set_meter_strip_name ("MidiTrackMetricsInactive");
                }
        }
-       else if (type == (1 << DataType::MIDI)) {
-               if (_route->active()) {
-                       set_meter_strip_name ("MidiTrackMetrics");
+       else if (type == (1 << DataType::AUDIO)) {
+               if (!_route || _route->active()) {
+                       set_meter_strip_name ("AudioTrackMetrics");
                } else {
-                       set_meter_strip_name ("MidiTrackMetricsInactive");
+                       set_meter_strip_name ("AudioTrackMetricsInactive");
                }
        } else {
-               if (_route->active()) {
+               if (!_route || _route->active()) {
                        set_meter_strip_name ("AudioMidiTrackMetrics");
                } else {
                        set_meter_strip_name ("AudioMidiTrackMetricsInactive");
                }
        }
 
-       style_changed = true;
-       meter_metric_area.queue_draw ();
+       setup_meters();
+       meter_clear_pattern_cache(4);
+       on_style_changed(Glib::RefPtr<Gtk::Style>());
+}
+
+void
+GainMeter::route_active_changed ()
+{
+       if (_meter) {
+               meter_configuration_changed (_meter->input_streams ());
+       }
 }
 
+void
+GainMeter::meter_type_changed (MeterType t)
+{
+       _route->set_meter_type(t);
+       RedrawMetrics();
+}