Remove wrong asserts
[ardour.git] / gtk2_ardour / gain_meter.cc
index a1ecd8586d879229cca27f55eb8d6a59291e1622..4b72a25de834c9f778385c9126e8efeb47dcbef6 100644 (file)
 
 #include <limits.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/amp.h"
+#include "ardour/route_group.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 <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/stop_signal.h>
-#include <gtkmm2ext/barcontroller.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include <midi++/manager.h>
-#include <pbd/fastlog.h>
+#include "pbd/fastlog.h"
+#include "pbd/stacktrace.h"
 
-#include "ardour_ui.h"
 #include "gain_meter.h"
-#include "utils.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/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 sigc;
 using namespace std;
+using Gtkmm2ext::Keyboard;
+using namespace ArdourMeter;
 
-sigc::signal<void> GainMeter::ResetAllPeakDisplays;
-sigc::signal<void,RouteGroup*> GainMeter::ResetGroupPeakDisplays;
-Glib::RefPtr<Gdk::Pixbuf> GainMeter::slider;
-Glib::RefPtr<Gdk::Pixbuf> GainMeter::rail;
-map<string,Glib::RefPtr<Gdk::Pixmap> > GainMeter::metric_pixmaps;
+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);
+       }
+}
 
-int
-GainMeter::setup_slider_pix ()
+static void
+reset_cursor_to_default_state (Gtk::StateType, Gtk::Entry* widget)
 {
-       slider = ::get_icon ("fader_belt");
-       return 0;
+       reset_cursor_to_default (widget);
 }
 
-GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
-       : _io (io),
-         _session (s),
-         gain_slider (0),
-         // 0.781787 is the value needed for gain to be set to 0.
-         gain_adjustment (0.781787, 0.0, 1.0, 0.01, 0.1),
-         gain_automation_style_button (""),
-         gain_automation_state_button ("")
-       
+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()),  // 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 ("")
+       , gain_astate_propagate (false)
+       , _data_type (DataType::AUDIO)
 {
-       if (slider == 0) {
-               setup_slider_pix ();
-       }
+       using namespace Menu_Helpers;
+
+       set_session (s);
 
        ignore_toggle = false;
        meter_menu = 0;
        next_release_selects = false;
-       style_changed = true;
+       _width = Wide;
 
-       gain_slider = manage (new VSliderController (slider,
-                                                    &gain_adjustment,
-                                                    *_io->gain_control().get(),
-                                                    false));
+       fader_length = rint (fader_length * UIConfiguration::instance().get_ui_scale());
+       fader_girth = rint (fader_girth * UIConfiguration::instance().get_ui_scale());
 
-       gain_slider->signal_button_press_event().connect (mem_fun(*this, &GainMeter::start_gain_touch));
-       gain_slider->signal_button_release_event().connect (mem_fun(*this, &GainMeter::end_gain_touch));
+       if (horizontal) {
+               gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
+       } else {
+               gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
+       }
+
+       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->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");
-       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 (mem_fun (*this, &GainMeter::gain_activated));
-       gain_display.signal_focus_in_event().connect (mem_fun (*this, &GainMeter::gain_focused), false);
-       gain_display.signal_focus_out_event().connect (mem_fun (*this, &GainMeter::gain_focused), false);
-
-       gain_display_box.set_name ("MeterMetricsStrip");
-       gain_display_box.set_homogeneous (true);
-       gain_display_box.set_spacing (2);
-       gain_display_box.pack_start (gain_display, true, true);
+       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");
-//     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.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);
 
-       meter_metric_area.set_name ("MeterMetricsStrip");
-       set_size_request_to_display_given_text (meter_metric_area, "-50", 0, 0);
-
-       meter_packer.set_spacing (2);
+       gain_automation_style_button.set_name ("mixer strip button");
+       gain_automation_state_button.set_name ("mixer strip button");
 
-       gain_automation_style_button.set_name ("MixerAutomationModeButton");
-       gain_automation_state_button.set_name ("MixerAutomationPlaybackButton");
-
-       ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_state_button, _("Fader automation mode"));
-       ARDOUR_UI::instance()->tooltips().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);
@@ -135,363 +158,234 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
        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);
+       gain_astyle_menu.items().push_back (MenuElem (_("Trim")));
+       gain_astyle_menu.items().push_back (MenuElem (_("Abs")));
+
+       gain_astate_menu.set_name ("ArdourContextMenu");
+       gain_astyle_menu.set_name ("ArdourContextMenu");
 
-       fader_vbox = manage (new Gtk::VBox());
-       fader_vbox->set_spacing (0);
-       fader_vbox->pack_start (*fader_centering_box, false, false, 0);
+       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);
 
-       hbox.set_spacing (2);
+       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));
 
-       if (_io->default_type() == ARDOUR::DataType::AUDIO) {
-               hbox.pack_start (*fader_vbox, true, true);
+       UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &GainMeterBase::on_theme_changed));
+       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 ()
+{
+       delete meter_menu;
+       delete level_meter;
+}
+
+void
+GainMeterBase::set_controls (boost::shared_ptr<Route> r,
+                            boost::shared_ptr<PeakMeter> pm,
+                             boost::shared_ptr<Amp> amp,
+                             boost::shared_ptr<GainControl> control)
+{
+       connections.clear ();
+       model_connections.drop_connections ();
+
+       /* 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;
        }
-       
-       set_width (Narrow);
 
-       Route* r;
+       _meter = pm;
+       _amp = amp;
+       _route = r;
+       _control = control;
 
-       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
+       level_meter->set_meter (pm.get());
+       gain_slider->set_controllable (_control);
 
-               /* 
-                  if we have a route (ie. we're not the click), 
-                  pack some route-dependent stuff.
-               */
+       if (amp) {
+               amp->ConfigurationChanged.connect (
+                       model_connections, invalidator (*this), boost::bind (&GainMeterBase::setup_gain_adjustment, this), gui_context ()
+                       );
+       }
 
-               gain_display_box.pack_end (peak_display, true, true);
+       setup_gain_adjustment ();
 
-               hbox.pack_end (meter_packer, true, true);
+       if (!_route || !_route->is_auditioner()) {
 
                using namespace Menu_Helpers;
-       
-               gain_astate_menu.items().push_back (MenuElem (_("Manual"), 
-                                                     bind (mem_fun (*_io, &IO::set_parameter_automation_state),
-                                                                 Parameter(GainAutomation), (AutoState) Off)));
+
+               gain_astate_menu.items().clear ();
+
+               gain_astate_menu.items().push_back (MenuElem (S_("Automation|Manual"),
+                                                             sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Off)));
                gain_astate_menu.items().push_back (MenuElem (_("Play"),
-                                                     bind (mem_fun (*_io, &IO::set_parameter_automation_state),
-                                                                 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"),
-                                                     bind (mem_fun (*_io, &IO::set_parameter_automation_state),
-                                                                 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"),
-                                                     bind (mem_fun (*_io, &IO::set_parameter_automation_state),
-                                                                 Parameter(GainAutomation), (AutoState) Touch)));
-       
-               gain_astyle_menu.items().push_back (MenuElem (_("Trim")));
-               gain_astyle_menu.items().push_back (MenuElem (_("Abs")));
-       
-               gain_astate_menu.set_name ("ArdourContextMenu");
-               gain_astyle_menu.set_name ("ArdourContextMenu");
-
-               gain_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &GainMeter::gain_automation_style_button_event), false);
-               gain_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &GainMeter::gain_automation_state_button_event), false);
-               
-               r->gain_control()->list()->automation_state_changed.connect (mem_fun(*this, &GainMeter::gain_automation_state_changed));
-               r->gain_control()->list()->automation_style_changed.connect (mem_fun(*this, &GainMeter::gain_automation_style_changed));
-               fader_vbox->pack_start (gain_automation_state_button, false, false, 0);
-
-               gain_automation_state_changed ();
-       }
-
-       set_spacing (2);
+                                                             sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Touch)));
 
-       pack_start (gain_display_box, Gtk::PACK_SHRINK);
-       pack_start (hbox, Gtk::PACK_SHRINK);
+               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)));
 
-       _io->gain_control()->Changed.connect (mem_fun(*this, &GainMeter::gain_changed));
+               _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());
 
-       meter_metric_area.signal_expose_event().connect (mem_fun(*this, &GainMeter::meter_metrics_expose));
-       gain_adjustment.signal_value_changed().connect (mem_fun(*this, &GainMeter::gain_adjusted));
-       peak_display.signal_button_release_event().connect (mem_fun(*this, &GainMeter::peak_button_release), false);
-       gain_display.signal_key_press_event().connect (mem_fun(*this, &GainMeter::gain_key_press), false);
+               gain_automation_state_changed ();
+       }
 
-       Config->ParameterChanged.connect (mem_fun (*this, &GainMeter::parameter_changed));
+       _control->Changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeterBase::gain_changed, this), gui_context());
 
        gain_changed ();
        show_gain ();
-
        update_gain_sensitive ();
-       
-       ResetAllPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_peak_display));
-       ResetGroupPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_group_peak_display));
 
-       UI::instance()->theme_changed.connect (mem_fun(*this, &GainMeter::on_theme_changed));
+       if (!_meter) {
+               peak_display.hide ();
+       } else {
+               peak_display.show ();
+       }
 }
 
 void
-GainMeter::set_width (Width w)
+GainMeterBase::set_gain_astate (AutoState as)
 {
-       switch (w) {
-       case Wide:
-               peak_display.show();
-               break;
-       case Narrow:
-               peak_display.hide();
-               break;
+       if (gain_astate_propagate) {
+               gain_astate_propagate = false;
+               ChangeGainAutomationState (as);
+               return;
        }
-
-       _width = w;
-       setup_meters ();
+       _amp->set_parameter_automation_state (Evoral::Parameter (GainAutomation), as);
 }
 
-Glib::RefPtr<Gdk::Pixmap>
-GainMeter::render_metrics (Gtk::Widget& w)
+void
+GainMeterBase::setup_gain_adjustment ()
 {
-       //cerr << "GainMeter::render_metrics() called, red = " << w.get_style()->get_bg(Gtk::STATE_NORMAL).get_red() << endl;//DEBUG
-       Glib::RefPtr<Gdk::Window> win (w.get_window());
-       Glib::RefPtr<Gdk::GC> fg_gc (w.get_style()->get_fg_gc (Gtk::STATE_NORMAL));
-       Glib::RefPtr<Gdk::GC> bg_gc (w.get_style()->get_bg_gc (Gtk::STATE_NORMAL));
-       gint width, height;
-       int  db_points[] = { -50, -40, -20, -30, -10, -3, 0, 4 };
-       char buf[32];
-
-       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 (uint32_t i = 0; i < sizeof (db_points)/sizeof (db_points[0]); ++i) {
-
-               float fraction = log_meter (db_points[i]);
-               gint pos = height - (gint) floor (height * fraction);
-
-               snprintf (buf, sizeof (buf), "%d", abs (db_points[i]));
-
-               layout->set_text (buf);
-
-               /* we want logical extents, not ink extents here */
-
-               int width, height;
-               layout->get_pixel_size (width, height);
-
-               pixmap->draw_line (fg_gc, 0, pos, 4, pos);
-               pixmap->draw_layout (fg_gc, 6, pos - (height/2), layout);
+       if (!_amp) {
+               return;
        }
 
-       return pixmap;
-}
-
-gint
-GainMeter::meter_metrics_expose (GdkEventExpose *ev)
-{
-       /* Only draw dB scale if we're metering audio */
-       if (_io->n_inputs().n_audio() + _io->n_outputs().n_audio() == 0)
-               return true;
-
-       static Glib::RefPtr<Gtk::Style> meter_style;
-       
-       if (style_changed) {
-               meter_style = meter_metric_area.get_style();
+       if (_previous_amp_output_streams == _amp->output_streams ()) {
+               return;
        }
-               
-       Glib::RefPtr<Gdk::Window> win (meter_metric_area.get_window());
-       Glib::RefPtr<Gdk::GC> fg_gc (meter_style->get_fg_gc (Gtk::STATE_NORMAL));
-       Glib::RefPtr<Gdk::GC> bg_gc (meter_style->get_bg_gc (Gtk::STATE_NORMAL));
-
-       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());
+       ignore_toggle = true;
 
-       if (i == metric_pixmaps.end() || style_changed) {
-               pixmap = render_metrics (meter_metric_area);
+       if (_amp->output_streams().n_midi() <=  _amp->output_streams().n_audio()) {
+               _data_type = DataType::AUDIO;
+               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 {
-               pixmap = i->second;
+               _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);
        }
 
-       gdk_rectangle_intersect (&ev->area, &base_rect, &draw_rect);
-       win->draw_rectangle (bg_gc, true, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
-       win->draw_drawable (fg_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;
-}
-
-void
-GainMeter::on_theme_changed()
-{
-       style_changed = true;
-}
+       ignore_toggle = false;
 
-GainMeter::~GainMeter ()
-{
-       if (meter_menu) {
-               delete meter_menu;
-       }
+       effective_gain_display ();
 
-       for (vector<MeterInfo>::iterator i = meters.begin(); i != meters.end(); i++) {
-               if ((*i).meter) {
-                       delete (*i).meter;
-               }
-       }
+       _previous_amp_output_streams = _amp->output_streams ();
 }
 
 void
-GainMeter::update_meters ()
+GainMeterBase::hide_all_meters ()
 {
-       vector<MeterInfo>::iterator i;
-       uint32_t n;
-       float peak, mpeak;
-       char buf[32];
-       
-       for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
-               if ((*i).packed) {
-                       peak = _io->peak_meter().peak_power (n);
-
-                       (*i).meter->set (log_meter (peak));
-
-                       mpeak = _io->peak_meter().max_peak_power(n);
-                       
-                       if (mpeak > max_peak) {
-                               max_peak = mpeak;
-                               /* set peak display */
-                               if (max_peak <= -200.0f) {
-                                       peak_display.set_label (_("-inf"));
-                               } else {
-                                       snprintf (buf, sizeof(buf), "%.1f", max_peak);
-                                       peak_display.set_label (buf);
-                               }
-
-                               if (max_peak >= 0.0f) {
-                                       peak_display.set_name ("MixerStripPeakDisplayPeak");
-                               }
-                       }
-               }
-       }
+       level_meter->hide_meters();
 }
 
 void
-GainMeter::parameter_changed(const char* parameter_name)
+GainMeter::hide_all_meters ()
 {
-#define PARAM_IS(x) (!strcmp (parameter_name, (x)))
-
-       ENSURE_GUI_THREAD (bind (mem_fun(*this, &GainMeter::parameter_changed), parameter_name));
-
-       if (PARAM_IS ("meter-hold")) {
-       
-               vector<MeterInfo>::iterator i;
-               uint32_t n;
-               
-               for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
-                       
-                       (*i).meter->set_hold_count ((uint32_t) floor(Config->get_meter_hold()));
-               }
-       }
-
-#undef PARAM_IS
+       GainMeterBase::hide_all_meters ();
 }
 
 void
-GainMeter::hide_all_meters ()
+GainMeterBase::setup_meters (int len)
 {
-       bool remove_metric_area = false;
-
-       for (vector<MeterInfo>::iterator i = meters.begin(); i != meters.end(); ++i) {
-               if ((*i).packed) {
-                       remove_metric_area = true;
-                       meter_packer.remove (*((*i).meter));
-                       (*i).packed = false;
-               }
+       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();
        }
 
-       if (remove_metric_area) {
-               if (meter_metric_area.get_parent()) {
-                       meter_packer.remove (meter_metric_area);
-               }
+       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
-GainMeter::setup_meters ()
+GainMeterBase::set_type (MeterType t)
 {
-       uint32_t nmeters = _io->n_outputs().n_total();
-       guint16 width;
-
-       hide_all_meters ();
-
-       Route* r;
-
-       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
+       level_meter->set_type(t);
+}
 
-               switch (r->meter_point()) {
-               case MeterInput:
-                       nmeters = r->n_inputs().n_total();
-                       break;
-               case MeterPreFader:
-                       nmeters = r->pre_fader_streams().n_total();
+void
+GainMeter::setup_meters (int len)
+{
+       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 MeterPostFader:
-                       nmeters = r->n_outputs().n_total();
+               case Narrow:
+                       hbox.set_homogeneous(false);
                        break;
-               }
-
-       } else {
-
-               nmeters = _io->n_outputs().n_total();
-
-       }
-
-       if (nmeters == 0) {
-               return;
-       }
-
-       if (nmeters <= 2) {
-               width = regular_meter_width;
-       } else {
-               width = thin_meter_width;
-       }
-
-       while (meters.size() < nmeters) {
-               meters.push_back (MeterInfo());
-       }
-
-       /* pack them backwards */
-
-       if (_width == Wide) {
-               meter_packer.pack_end (meter_metric_area, false, false);
-               meter_metric_area.show_all ();
        }
+       GainMeterBase::setup_meters (len);
+}
 
-       for (int32_t n = nmeters-1; nmeters && n >= 0 ; --n) {
-               if (meters[n].width != width) {
-                       delete meters[n].meter;
-                       meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, FastMeter::Vertical);
-                       meters[n].width = width;
-
-                       meters[n].meter->add_events (Gdk::BUTTON_RELEASE_MASK);
-                       meters[n].meter->signal_button_release_event().connect (bind (mem_fun(*this, &GainMeter::meter_button_release), n));
-               }
-
-               meter_packer.pack_end (*meters[n].meter, false, false);
-               meters[n].meter->show_all ();
-               meters[n].packed = true;
-       }
-}      
-
-int
-GainMeter::get_gm_width ()
+void
+GainMeter::set_type (MeterType t)
 {
-       Gtk::Requisition sz = hbox.size_request ();
-       return sz.width;
+       GainMeterBase::set_type (t);
 }
 
 bool
-GainMeter::gain_key_press (GdkEventKey* ev)
+GainMeterBase::gain_key_press (GdkEventKey* ev)
 {
        if (key_is_legal_for_numeric_entry (ev->keyval)) {
                /* drop through to normal handling */
@@ -502,69 +396,51 @@ GainMeter::gain_key_press (GdkEventKey* ev)
 }
 
 bool
-GainMeter::peak_button_release (GdkEventButton* ev)
+GainMeterBase::peak_button_release (GdkEventButton* ev)
 {
        /* reset peak label */
 
-       if (ev->button == 1 && Keyboard::modifier_state_equals (ev->state, Keyboard::Control|Keyboard::Shift)) {
+       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::Control)) {
-               Route* r;
-               if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
-                       ResetGroupPeakDisplays (r->mix_group());
+       } else if (ev->button == 1 && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+               if (_route) {
+                       ResetGroupPeakDisplays (_route->route_group());
                }
        } else {
-               reset_peak_display ();
+               ResetRoutePeakDisplays (_route.get());
        }
 
        return true;
 }
 
 void
-GainMeter::reset_peak_display ()
+GainMeterBase::reset_peak_display ()
 {
-       Route * r;
-       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
-               r->peak_meter().reset_max();
-       }
-
-       max_peak = -INFINITY;
-       peak_display.set_label (_("-Inf"));
+       _meter->reset_max();
+       level_meter->clear_meters();
+       max_peak = minus_infinity ();
+       peak_display.set_text (_("-inf"));
        peak_display.set_name ("MixerStripPeakDisplay");
 }
 
 void
-GainMeter::reset_group_peak_display (RouteGroup* group)
+GainMeterBase::reset_route_peak_display (Route* route)
 {
-       Route* r;
-       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
-               if (group == r->mix_group()) {
-                       reset_peak_display ();
-               }
+       if (_route && _route.get() == route) {
+               reset_peak_display ();
        }
 }
 
-gint
-GainMeter::meter_button_release (GdkEventButton* ev, uint32_t which)
+void
+GainMeterBase::reset_group_peak_display (RouteGroup* group)
 {
-       switch (ev->button) {
-       case 1:
-               meters[which].meter->clear();
-               max_peak = minus_infinity();
-               peak_display.set_label (_("-inf"));
-               peak_display.set_name ("MixerStripPeakDisplay");
-               break;
-
-       case 3:
-               // popup_meter_menu (ev);
-               break;
-       };
-
-       return TRUE;
+       if (_route && group == _route->route_group()) {
+               reset_peak_display ();
+       }
 }
 
 void
-GainMeter::popup_meter_menu (GdkEventButton *ev)
+GainMeterBase::popup_meter_menu (GdkEventButton *ev)
 {
        using namespace Menu_Helpers;
 
@@ -585,7 +461,7 @@ GainMeter::popup_meter_menu (GdkEventButton *ev)
 }
 
 bool
-GainMeter::gain_focused (GdkEventFocus* ev)
+GainMeterBase::gain_focused (GdkEventFocus* ev)
 {
        if (ev->in) {
                gain_display.select_region (0, -1);
@@ -596,86 +472,146 @@ GainMeter::gain_focused (GdkEventFocus* ev)
 }
 
 void
-GainMeter::gain_activated ()
+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);
+               _control->set_value (dB_to_coefficient(f), Controllable::UseGroup);
+       } else {
+               f = min (fabs (f), 2.0f);
+               _control->set_value (f, Controllable::UseGroup);
+       }
+
+       if (gain_display.has_focus()) {
+               Gtk::Widget* w = gain_display.get_toplevel();
+               if (w) {
+                       Gtk::Window* win = dynamic_cast<Gtk::Window*> (w);
 
-               _io->gain_control()->set_value (dB_to_coefficient(f));
+                       /* 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;
+                               }
+                       }
                }
        }
 }
 
 void
-GainMeter::show_gain ()
+GainMeterBase::show_gain ()
 {
        char buf[32];
 
        float v = gain_adjustment.get_value();
-       
-       if (v == 0.0) {
-               strcpy (buf, _("-inf"));
-       } else {
-               snprintf (buf, 32, "%.1f", coefficient_to_dB (slider_position_to_gain (v)));
+
+       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_with_max (v, Config->get_max_gain())));
+               }
+               break;
+       case DataType::MIDI:
+               snprintf (buf, sizeof (buf), "%.1f", v);
+               break;
        }
-       
+
        gain_display.set_text (buf);
 }
 
 void
-GainMeter::gain_adjusted ()
+GainMeterBase::fader_moved ()
 {
        if (!ignore_toggle) {
-               _io->gain_control()->set_value (slider_position_to_gain (gain_adjustment.get_value()));
+
+               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();
+               }
+
+               _control->set_value (value, Controllable::UseGroup);
        }
+
        show_gain ();
 }
 
 void
-GainMeter::effective_gain_display ()
+GainMeterBase::effective_gain_display ()
 {
-       gfloat value = gain_to_slider_position (_io->effective_gain());
-       
-       if (gain_adjustment.get_value() != value) {
-               ignore_toggle = true; 
-               gain_adjustment.set_value (value);
+       gain_t fader_position = 0;
+
+       switch (_data_type) {
+       case DataType::AUDIO:
+               /* 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:
+               fader_position = _control->get_value ();
+               break;
+       }
+
+       if (gain_adjustment.get_value() != fader_position) {
+               ignore_toggle = true;
+               gain_adjustment.set_value (fader_position);
                ignore_toggle = false;
        }
 }
 
 void
-GainMeter::gain_changed ()
+GainMeterBase::gain_changed ()
 {
-       Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &GainMeter::effective_gain_display));
+       Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&GainMeterBase::effective_gain_display, this));
 }
 
 void
-GainMeter::set_meter_strip_name (const char * name)
+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
-GainMeter::set_fader_name (const char * name)
+GainMeterBase::set_fader_name (const char * name)
 {
        gain_slider->set_name (name);
 }
 
 void
-GainMeter::update_gain_sensitive ()
+GainMeterBase::update_gain_sensitive ()
 {
-       static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (!(_io->gain_control()->list()->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)
 {
@@ -683,85 +619,82 @@ next_meter_point (MeterPoint 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*/
+
+       abort(); /*NOTREACHED*/
        return MeterInput;
 }
 
 gint
-GainMeter::meter_press(GdkEventButton* ev)
+GainMeterBase::meter_press(GdkEventButton* ev)
 {
-       Route* _route;
-
        wait_for_release = false;
 
-       if ((_route = dynamic_cast<Route*>(_io.get())) == 0) {
+       if (!_route) {
                return FALSE;
        }
 
        if (!ignore_toggle) {
 
                if (Keyboard::is_context_menu_event (ev)) {
-                       
+
                        // no menu at this time.
 
                } else {
 
-                       if (ev->button == 2) {
+                       if (Keyboard::is_button2_event(ev)) {
 
-                               // ctrl-button2 click is the midi binding click
+                               // Primary-button2 click is the midi binding click
                                // button2-click is "momentary"
-                               
-                               if (!Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::Control))) {
+
+                               if (!Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) {
                                        wait_for_release = true;
                                        old_meter_point = _route->meter_point ();
                                }
                        }
 
-                       if (ev->button == 1 || ev->button == 2) {
+                       if (_route && (ev->button == 1 || Keyboard::is_button2_event (ev))) {
 
-                               if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::Control|Keyboard::Shift))) {
+                               if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
 
-                                       /* ctrl-shift-click applies change to all routes */
+                                       /* Primary+Tertiary-click applies change to all routes */
 
-                                       _session.begin_reversible_command (_("meter point change"));
-                                        Session::GlobalMeteringStateCommand *cmd = new Session::GlobalMeteringStateCommand (_session, this);
-                                       _session.foreach_route (this, &GainMeter::set_meter_point, next_meter_point (_route->meter_point()));
-                                        cmd->mark();
-                                       _session.add_command (cmd);
-                                       _session.commit_reversible_command ();
-                                       
-                                       
-                               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
+                                       _session->foreach_route (this, &GainMeterBase::set_meter_point, next_meter_point (_route->meter_point()));
 
-                                       /* ctrl-click: solo mix group.
-                                          ctrl-button2 is MIDI learn.
+
+                               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+
+                                       /* Primary-click: solo mix group.
+                                          NOTE: Primary-button2 is MIDI learn.
                                        */
-                                       
+
                                        if (ev->button == 1) {
-                                               _session.begin_reversible_command (_("meter point change"));
-                                               Session::GlobalMeteringStateCommand *cmd = new Session::GlobalMeteringStateCommand (_session, this);
-                                               set_mix_group_meter_point (*_route, next_meter_point (_route->meter_point()));
-                                               cmd->mark();
-                                               _session.add_command (cmd);
-                                               _session.commit_reversible_command ();
+                                               set_route_group_meter_point (*_route, next_meter_point (_route->meter_point()));
                                        }
-                                       
+
                                } else {
-                                       
+
                                        /* click: change just this route */
 
                                        // XXX no undo yet
-                                       
-                                       _route->set_meter_point (next_meter_point (_route->meter_point()), this);
+
+                                       _route->set_meter_point (next_meter_point (_route->meter_point()));
                                }
                        }
                }
@@ -772,69 +705,69 @@ GainMeter::meter_press(GdkEventButton* ev)
 }
 
 gint
-GainMeter::meter_release(GdkEventButton* ev)
+GainMeterBase::meter_release(GdkEventButton*)
 {
-
-       if(!ignore_toggle){
-               if (wait_for_release){
+       if (!ignore_toggle) {
+               if (wait_for_release) {
                        wait_for_release = false;
-                       set_meter_point (*(dynamic_cast<Route*>(_io.get())), old_meter_point);
+
+                       if (_route) {
+                               set_meter_point (*_route, old_meter_point);
+                       }
                }
        }
+
        return true;
 }
 
 void
-GainMeter::set_meter_point (Route& route, MeterPoint mp)
+GainMeterBase::set_meter_point (Route& route, MeterPoint mp)
 {
-       route.set_meter_point (mp, this);
+       route.set_meter_point (mp);
 }
 
 void
-GainMeter::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.mix_group()) != 0){
-               mix_group->apply (&Route::set_meter_point, mp, this);
+       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, this);
+               route.set_meter_point (mp);
        }
 }
 
 void
-GainMeter::meter_point_clicked ()
+GainMeterBase::meter_point_clicked ()
 {
-       Route* r;
-
-       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
-
+       if (_route) {
+               /* WHAT? */
        }
 }
 
-gint
-GainMeter::start_gain_touch (GdkEventButton* ev)
+void
+GainMeterBase::amp_start_touch ()
 {
-       _io->gain_control()->list()->start_touch ();
-       return FALSE;
+       _control->start_touch (_control->session().transport_frame());
 }
 
-gint
-GainMeter::end_gain_touch (GdkEventButton* ev)
+void
+GainMeterBase::amp_stop_touch ()
 {
-       _io->gain_control()->list()->stop_touch ();
-       return FALSE;
+       _control->stop_touch (false, _control->session().transport_frame());
 }
 
 gint
-GainMeter::gain_automation_state_button_event (GdkEventButton *ev)
+GainMeterBase::gain_automation_state_button_event (GdkEventButton *ev)
 {
        if (ev->type == GDK_BUTTON_RELEASE) {
                return TRUE;
        }
-       
+
        switch (ev->button) {
                case 1:
+                       gain_astate_propagate = Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier));
                        gain_astate_menu.popup (1, ev->time);
                        break;
                default:
@@ -845,7 +778,7 @@ GainMeter::gain_automation_state_button_event (GdkEventButton *ev)
 }
 
 gint
-GainMeter::gain_automation_style_button_event (GdkEventButton *ev)
+GainMeterBase::gain_automation_style_button_event (GdkEventButton *ev)
 {
        if (ev->type == GDK_BUTTON_RELEASE) {
                return TRUE;
@@ -862,24 +795,24 @@ GainMeter::gain_automation_style_button_event (GdkEventButton *ev)
 }
 
 string
-GainMeter::astate_string (AutoState state)
+GainMeterBase::astate_string (AutoState state)
 {
        return _astate_string (state, false);
 }
 
 string
-GainMeter::short_astate_string (AutoState state)
+GainMeterBase::short_astate_string (AutoState state)
 {
        return _astate_string (state, true);
 }
 
 string
-GainMeter::_astate_string (AutoState state, bool shrt)
+GainMeterBase::_astate_string (AutoState state, bool shrt)
 {
        string sstr;
 
        switch (state) {
-       case Off:
+       case ARDOUR::Off:
                sstr = (shrt ? "M" : _("M"));
                break;
        case Play:
@@ -897,19 +830,19 @@ GainMeter::_astate_string (AutoState state, bool shrt)
 }
 
 string
-GainMeter::astyle_string (AutoStyle style)
+GainMeterBase::astyle_string (AutoStyle style)
 {
        return _astyle_string (style, false);
 }
 
 string
-GainMeter::short_astyle_string (AutoStyle style)
+GainMeterBase::short_astyle_string (AutoStyle style)
 {
        return _astyle_string (style, true);
 }
 
 string
-GainMeter::_astyle_string (AutoStyle style, bool shrt)
+GainMeterBase::_astyle_string (AutoStyle style, bool shrt)
 {
        if (style & Trim) {
                return _("Trim");
@@ -921,51 +854,359 @@ GainMeter::_astyle_string (AutoStyle style, bool shrt)
 }
 
 void
-GainMeter::gain_automation_style_changed ()
+GainMeterBase::gain_automation_style_changed ()
 {
-  // Route* _route = dynamic_cast<Route*>(&_io);
        switch (_width) {
        case Wide:
-               gain_automation_style_button.set_label (astyle_string(_io->gain_control()->list()->automation_style()));
+               gain_automation_style_button.set_text (astyle_string(_control->alist()->automation_style()));
                break;
        case Narrow:
-               gain_automation_style_button.set_label  (short_astyle_string(_io->gain_control()->list()->automation_style()));
+               gain_automation_style_button.set_text  (short_astyle_string(_control->alist()->automation_style()));
                break;
        }
 }
 
 void
-GainMeter::gain_automation_state_changed ()
+GainMeterBase::gain_automation_state_changed ()
 {
-       ENSURE_GUI_THREAD(mem_fun(*this, &GainMeter::gain_automation_state_changed));
-       //Route* _route = dynamic_cast<Route*>(&_io);
-       
-       bool x;
+       ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed);
 
        switch (_width) {
        case Wide:
-               gain_automation_state_button.set_label (astate_string(_io->gain_control()->list()->automation_state()));
+               gain_automation_state_button.set_text (astate_string(_control->alist()->automation_state()));
                break;
        case Narrow:
-               gain_automation_state_button.set_label (short_astate_string(_io->gain_control()->list()->automation_state()));
+               gain_automation_state_button.set_text (short_astate_string(_control->alist()->automation_state()));
                break;
        }
 
-       x = (_io->gain_control()->list()->automation_state() != Off);
-       
-       if (gain_automation_state_button.get_active() != x) {
+       const bool automation_watch_required = (_control->alist()->automation_state() != ARDOUR::Off);
+
+       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 (mem_fun (*this, &GainMeter::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()
+{
+       char buf[32];
+       float mpeak = level_meter->update_meters();
+
+       if (mpeak > max_peak) {
+               max_peak = mpeak;
+               if (mpeak <= -200.0f) {
+                       peak_display.set_text (_("-inf"));
+               } else {
+                       snprintf (buf, sizeof(buf), "%.1f", mpeak);
+                       peak_display.set_text (buf);
+               }
+       }
+       if (mpeak >= UIConfiguration::instance().get_meter_peak()) {
+               peak_display.set_name ("MixerStripPeakDisplayPeak");
+       }
+}
+
+void GainMeterBase::color_handler(bool /*dpi*/)
+{
+       setup_meters();
+}
+
+void
+GainMeterBase::set_width (Width w, int len)
+{
+       _width = w;
+       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()
+{
+}
+
+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)
+       , hbox(true, 2)
+{
+       if (gain_display.get_parent()) {
+               gain_display.get_parent()->remove (gain_display);
+       }
+       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");
+       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");
+
+       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 (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.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);
+
+       hbox.pack_start (fader_alignment, true, true);
+
+       set_spacing (PX_SCALE(2, 2));
+
+       pack_start (gain_display_box, 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<GainControl> control)
+{
+       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, 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 (_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 ();
+}
+
+int
+GainMeter::get_gm_width ()
+{
+       Gtk::Requisition sz;
+       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;
+
+}
+
+gint
+GainMeter::meter_metrics_expose (GdkEventExpose *ev)
+{
+       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);
+}
+
+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);
+       }
+       return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks1_area);
+}
+
+gint
+GainMeter::meter_ticks2_expose (GdkEventExpose *ev)
+{
+       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);
+}
+
+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 _control;
+       } else {
+               return boost::shared_ptr<PBD::Controllable>();
+       }
+}
+
+bool
+GainMeterBase::level_meter_button_press (GdkEventButton* ev)
+{
+       return static_cast<bool>(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);
+               }
+       }
+
+       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::MIDI))
+                       || (_route && boost::dynamic_pointer_cast<MidiTrack>(_route))
+                       ) {
+               if (!_route || _route->active()) {
+                       set_meter_strip_name ("MidiTrackMetrics");
+               } else {
+                       set_meter_strip_name ("MidiTrackMetricsInactive");
+               }
+       }
+       else if (type == (1 << DataType::AUDIO)) {
+               if (!_route || _route->active()) {
+                       set_meter_strip_name ("AudioTrackMetrics");
+               } else {
+                       set_meter_strip_name ("AudioTrackMetricsInactive");
+               }
+       } else {
+               if (!_route || _route->active()) {
+                       set_meter_strip_name ("AudioMidiTrackMetrics");
+               } else {
+                       set_meter_strip_name ("AudioMidiTrackMetricsInactive");
+               }
+       }
+
+       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();
+}