Make stuff in the automation menu apply to the track selection.
[ardour.git] / gtk2_ardour / gain_meter.cc
index 76be06e1a270771f943614a456a1bb5a1f42683e..8ef83cfad5b4e2e98446089992e17c1bcad4f3e4 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/io.h"
+#include "ardour/route.h"
+#include "ardour/route_group.h"
+#include "ardour/session.h"
+#include "ardour/session_route.h"
+#include "ardour/dB.h"
+#include "ardour/utils.h"
+
+#include <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 <midi++/manager.h>
-#include <pbd/fastlog.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 "utils.h"
+#include "global_signals.h"
 #include "logmeter.h"
 #include "gui_thread.h"
 #include "keyboard.h"
 #include "public_editor.h"
+#include "utils.h"
 
-#include <ardour/session.h>
-#include <ardour/route.h>
+#include "ardour/session.h"
+#include "ardour/route.h"
+#include "ardour/meter.h"
 
 #include "i18n.h"
 
@@ -50,59 +57,69 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
-using namespace sigc;
 using namespace std;
+using Gtkmm2ext::Keyboard;
+
+sigc::signal<void> GainMeterBase::ResetAllPeakDisplays;
+sigc::signal<void,RouteGroup*> GainMeterBase::ResetGroupPeakDisplays;
 
-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;
+Glib::RefPtr<Gdk::Pixbuf> GainMeter::slider;
 
-int
+
+void
 GainMeter::setup_slider_pix ()
 {
-       slider = ::get_icon ("fader_belt");
-       return 0;
+       if ((slider = ::get_icon ("fader_belt")) == 0) {
+               throw failed_constructor();
+       }
 }
 
-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 ("")
-       
+GainMeterBase::GainMeterBase (Session* s,
+                             const Glib::RefPtr<Gdk::Pixbuf>& pix,
+                             bool horizontal,
+                             int fader_length)
+       : gain_adjustment (0.781787, 0.0, 1.0, 0.01, 0.1)  // 0.781787 is the value needed for gain to be set to 0.
+       , gain_automation_style_button ("")
+       , gain_automation_state_button ("")
+       , style_changed (false)
+       , dpi_changed (false)
+       , _is_midi (false)
+
 {
-       if (slider == 0) {
-               setup_slider_pix ();
-       }
+       using namespace Menu_Helpers;
+
+       set_session (s);
 
        ignore_toggle = false;
        meter_menu = 0;
        next_release_selects = false;
+       _width = Wide;
+
+       if (horizontal) {
+               gain_slider = manage (new HSliderController (pix,       
+                                                            &gain_adjustment,
+                                                            fader_length,
+                                                            false));
+       } else {
+               gain_slider = manage (new VSliderController (pix,
+                                                            &gain_adjustment,
+                                                            fader_length,
+                                                            false));
+       }
 
-       gain_slider = manage (new VSliderController (slider,
-                                                    &gain_adjustment,
-                                                    _io->gain_control(),
-                                                    false));
+       level_meter = new LevelMeter(_session);
 
-       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));
+       gain_slider->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_press));
+       gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_release));
        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_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);
 
        peak_display.set_name ("MixerStripPeakDisplay");
 //     peak_display.set_has_frame (false);
@@ -112,16 +129,11 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
        peak_display.set_label (_("-inf"));
        peak_display.unset_flags (Gtk::CAN_FOCUS);
 
-       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 ("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"));
+       ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode"));
+       ARDOUR_UI::instance()->set_tip (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);
@@ -129,237 +141,109 @@ 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")));
 
-       fader_vbox = manage (new Gtk::VBox());
-       fader_vbox->set_spacing (0);
-       fader_vbox->pack_start (*fader_centering_box, false, false, 0);
-
-       hbox.set_spacing (2);
-       hbox.pack_start (*fader_vbox, true, true);
+       gain_astate_menu.set_name ("ArdourContextMenu");
+       gain_astyle_menu.set_name ("ArdourContextMenu");
 
-       set_width(Narrow);
+       gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::gain_adjusted));
+       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);
 
-       Route* r;
+       ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &GainMeterBase::reset_peak_display));
+       ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &GainMeterBase::reset_group_peak_display));
 
-       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
-
-               /* 
-                  if we have a route (ie. we're not the click), 
-                  pack some route-dependent stuff.
-               */
-
-               gain_display_box.pack_end (peak_display, true, true);
-
-               hbox.pack_end (meter_packer, true, true);
-
-               using namespace Menu_Helpers;
-       
-               gain_astate_menu.items().push_back (MenuElem (_("Off"), 
-                                                     bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Off)));
-               gain_astate_menu.items().push_back (MenuElem (_("Play"),
-                                                     bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Play)));
-               gain_astate_menu.items().push_back (MenuElem (_("Write"),
-                                                     bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Write)));
-               gain_astate_menu.items().push_back (MenuElem (_("Touch"),
-                                                     bind (mem_fun (*_io, &IO::set_gain_automation_state), (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_automation_curve().automation_state_changed.connect (mem_fun(*this, &GainMeter::gain_automation_state_changed));
-               r->gain_automation_curve().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);
-
-       pack_start (gain_display_box, Gtk::PACK_SHRINK);
-       pack_start (hbox, Gtk::PACK_SHRINK);
-
-       _io->gain_changed.connect (mem_fun(*this, &GainMeter::gain_changed));
-
-       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);
-
-       Config->ParameterChanged.connect (mem_fun (*this, &GainMeter::parameter_changed));
-
-       gain_changed (0);
-       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 (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));
 }
 
-void
-GainMeter::set_width (Width w)
+GainMeterBase::~GainMeterBase ()
 {
-       switch (w) {
-       case Wide:
-               peak_display.show();
-               break;
-       case Narrow:
-               peak_display.hide();
-               break;
-       }
-
-       _width = w;
-       setup_meters ();
+       delete meter_menu;
+       delete level_meter;
 }
 
-Glib::RefPtr<Gdk::Pixmap>
-GainMeter::render_metrics (Gtk::Widget& w)
+void
+GainMeterBase::set_controls (boost::shared_ptr<Route> r,
+                            boost::shared_ptr<PeakMeter> pm,
+                            boost::shared_ptr<Amp> amp)
 {
-       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);
+       connections.clear ();
+       model_connections.drop_connections ();
+
+       if (!pm && !amp) {
+               level_meter->set_meter (0);
+               gain_slider->set_controllable (boost::shared_ptr<PBD::Controllable>());
+               _meter.reset ();
+               _amp.reset ();
+               _route.reset ();
+               return;
        }
 
-       return pixmap;
-}
+       _meter = pm;
+       _amp = amp;
+       _route = r;
 
-gint
-GainMeter::meter_metrics_expose (GdkEventExpose *ev)
-{
-       Glib::RefPtr<Gdk::Window> win (meter_metric_area.get_window());
-       Glib::RefPtr<Gdk::GC> fg_gc (meter_metric_area.get_style()->get_fg_gc (Gtk::STATE_NORMAL));
-       Glib::RefPtr<Gdk::GC> bg_gc (meter_metric_area.get_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());
+       level_meter->set_meter (pm.get());
+       gain_slider->set_controllable (amp->gain_control());
 
-       if (i == metric_pixmaps.end()) {
-               pixmap = render_metrics (meter_metric_area);
+       if (!_route || _route->output()->n_ports().n_midi() == 0) {
+               _is_midi = false;
+               gain_adjustment.set_lower (0.0);
+               gain_adjustment.set_upper (1.0);
+               gain_adjustment.set_step_increment (0.01);
+               gain_adjustment.set_page_increment (0.1);
        } else {
-               pixmap = i->second;
+               _is_midi = true;
+               gain_adjustment.set_lower (0.0);
+               gain_adjustment.set_upper (2.0);
+               gain_adjustment.set_step_increment (0.05);
+               gain_adjustment.set_page_increment (0.1);
        }
 
-       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 (bg_gc, pixmap, draw_rect.x, draw_rect.y, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
-       
-       return true;
-}
-
-GainMeter::~GainMeter ()
-{
-       if (meter_menu) {
-               delete meter_menu;
-       }
+       if (!_route || !_route->is_hidden()) {
 
-       for (vector<MeterInfo>::iterator i = meters.begin(); i != meters.end(); i++) {
-               if ((*i).meter) {
-                       delete (*i).meter;
-               }
-       }
-}
+               using namespace Menu_Helpers;
 
-void
-GainMeter::update_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_input_power (n);
+               gain_astate_menu.items().clear ();
 
-                       (*i).meter->set (log_meter (peak), peak);
+               gain_astate_menu.items().push_back (MenuElem (_("Manual"),
+                                                             sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
+                                                                   Evoral::Parameter(GainAutomation), (AutoState) 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)));
+               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)));
+               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)));
 
-                       mpeak = _io->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);
-                               }
+               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));
 
-                               if (max_peak >= 0.0f) {
-                                       peak_display.set_name ("MixerStripPeakDisplayPeak");
-                               }
-                       }
-               }
+               boost::shared_ptr<AutomationControl> gc = amp->gain_control();
+               
+               gc->alist()->automation_state_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_state_changed, this), gui_context());
+               gc->alist()->automation_style_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_style_changed, this), gui_context());
+               
+               gain_automation_state_changed ();
        }
+       
+       amp->gain_control()->Changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeterBase::gain_changed, this), gui_context());
+
+       gain_changed ();
+       show_gain ();
+       update_gain_sensitive ();
 }
 
 void
-GainMeter::parameter_changed(const char* parameter_name)
+GainMeterBase::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
+       level_meter->hide_meters();
 }
 
 void
@@ -367,96 +251,33 @@ GainMeter::hide_all_meters ()
 {
        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;
-               }
-       }
+       GainMeterBase::hide_all_meters ();
 
        if (remove_metric_area) {
                if (meter_metric_area.get_parent()) {
-                       meter_packer.remove (meter_metric_area);
+                       level_meter->remove (meter_metric_area);
                }
        }
 }
 
 void
-GainMeter::setup_meters ()
+GainMeterBase::setup_meters (int len)
 {
-       uint32_t nmeters = _io->n_outputs();
-       guint16 width;
-
-       hide_all_meters ();
-
-       Route* r;
-
-       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
-
-               switch (r->meter_point()) {
-               case MeterPreFader:
-               case MeterInput:
-                       nmeters = r->n_inputs();
-                       break;
-               case MeterPostFader:
-                       nmeters = r->n_outputs();
-                       break;
-               }
-
-       } else {
-
-               nmeters = _io->n_outputs();
-
-       }
-
-       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 */
+       level_meter->setup_meters(len, 5);
+}
 
-       if (_width == Wide) {
-               meter_packer.pack_end (meter_metric_area, false, false);
+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 ();
        }
-
-       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 ()
-{
-       Gtk::Requisition sz;
-       hbox.size_request (sz);
-       return sz.width;
+       GainMeterBase::setup_meters (len);
 }
 
 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 */
@@ -467,16 +288,15 @@ 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 ();
@@ -486,50 +306,25 @@ GainMeter::peak_button_release (GdkEventButton* ev)
 }
 
 void
-GainMeter::reset_peak_display ()
+GainMeterBase::reset_peak_display ()
 {
-       Route * r;
-       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
-               r->reset_max_peak_meters();
-       }
-
+       _meter->reset_max();
+       level_meter->clear_meters();
        max_peak = -INFINITY;
        peak_display.set_label (_("-Inf"));
        peak_display.set_name ("MixerStripPeakDisplay");
 }
 
 void
-GainMeter::reset_group_peak_display (RouteGroup* group)
+GainMeterBase::reset_group_peak_display (RouteGroup* group)
 {
-       Route* r;
-       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
-               if (group == r->mix_group()) {
-                       reset_peak_display ();
+       if (_route && group == _route->route_group()) {
+               reset_peak_display ();
                }
-       }
-}
-
-gint
-GainMeter::meter_button_release (GdkEventButton* ev, uint32_t which)
-{
-       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;
 }
 
 void
-GainMeter::popup_meter_menu (GdkEventButton *ev)
+GainMeterBase::popup_meter_menu (GdkEventButton *ev)
 {
        using namespace Menu_Helpers;
 
@@ -550,7 +345,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);
@@ -561,7 +356,7 @@ GainMeter::gain_focused (GdkEventFocus* ev)
 }
 
 void
-GainMeter::gain_activated ()
+GainMeterBase::gain_activated ()
 {
        float f;
 
@@ -571,7 +366,7 @@ GainMeter::gain_activated ()
 
                f = min (f, 6.0f);
 
-               _io->set_gain (dB_to_coefficient(f), this);
+               _amp->set_gain (dB_to_coefficient(f), this);
 
                if (gain_display.has_focus()) {
                        PublicEditor::instance().reset_focus();
@@ -580,67 +375,93 @@ GainMeter::gain_activated ()
 }
 
 void
-GainMeter::show_gain ()
+GainMeterBase::show_gain ()
 {
        char buf[32];
 
        float v = gain_adjustment.get_value();
-       
-       if (v == 0.0) {
-               strcpy (buf, _("-inf"));
+
+       if (!_is_midi) {
+               if (v == 0.0) {
+                       strcpy (buf, _("-inf"));
+               } else {
+                       snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain (v)));
+               }
        } else {
-               snprintf (buf, 32, "%.1f", coefficient_to_dB (slider_position_to_gain (v)));
+               snprintf (buf, sizeof (buf), "%.1f", v);
        }
-       
+
        gain_display.set_text (buf);
 }
 
 void
-GainMeter::gain_adjusted ()
+GainMeterBase::gain_adjusted ()
 {
        if (!ignore_toggle) {
-               _io->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this);
+               if (_route && _route->amp() == _amp) {
+                       if (_is_midi) {
+                               _route->set_gain (gain_adjustment.get_value(), this);
+                       } else {
+                               _route->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this);
+                       }
+               } else {
+                       _amp->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this);
+               }
        }
+
        show_gain ();
 }
 
 void
-GainMeter::effective_gain_display ()
+GainMeterBase::effective_gain_display ()
 {
-       gfloat value = gain_to_slider_position (_io->effective_gain());
-       
+       gfloat value;
+
+       if (!_route || _route->output()->n_ports().n_midi() == 0) {
+               value = gain_to_slider_position (_amp->gain());
+       } else {
+               value = _amp->gain ();
+       }
+
+       //cerr << this << " for " << _io->name() << " EGAIN = " << value
+       //              << " AGAIN = " << gain_adjustment.get_value () << endl;
+       // stacktrace (cerr, 20);
+
        if (gain_adjustment.get_value() != value) {
-               ignore_toggle = true; 
+               ignore_toggle = true;
                gain_adjustment.set_value (value);
                ignore_toggle = false;
        }
 }
 
 void
-GainMeter::gain_changed (void *src)
+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)
 {
        meter_metric_area.set_name (name);
 }
 
 void
-GainMeter::set_fader_name (const char * name)
+GainMeterBase::set_fader_name (const char * name)
 {
-       gain_slider->set_name (name);
+        uint32_t rgb_active = rgba_from_style (name, 0xff, 0, 0xff, 0, "bg", STATE_ACTIVE, false);
+        uint32_t rgb_normal = rgba_from_style (name, 0xff, 0xff, 0, 0, "bg", STATE_NORMAL, false);
+
+       gain_slider->set_border_colors (rgb_normal, rgb_active);
 }
 
 void
-GainMeter::update_gain_sensitive ()
+GainMeterBase::update_gain_sensitive ()
 {
-       static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (!(_io->gain_automation_state() & Play));
+       bool x = !(_amp->gain_control()->alist()->automation_state() & Play);
+       static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (x);
 }
 
-
 static MeterPoint
 next_meter_point (MeterPoint mp)
 {
@@ -648,85 +469,82 @@ next_meter_point (MeterPoint mp)
        case MeterInput:
                return MeterPreFader;
                break;
-               
+
        case MeterPreFader:
                return MeterPostFader;
                break;
-               
+
        case MeterPostFader:
-               return MeterInput;
+               return MeterOutput;
+               break;
+
+       case MeterOutput:
+               return MeterCustom;
+               break;
+
+       case MeterCustom:
+               return MeterInput;              
                break;
        }
+
        /*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::PrimaryModifier|Keyboard::TertiaryModifier))) {
 
-                               if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::Control|Keyboard::Shift))) {
+                                       /* Primary+Tertiary-click applies change to all routes */
 
-                                       /* ctrl-shift-click applies change to all routes */
+                                       _session->foreach_route (this, &GainMeterBase::set_meter_point, next_meter_point (_route->meter_point()));
 
-                                       _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)) {
 
-                                       /* 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()));
                                }
                        }
                }
@@ -737,67 +555,75 @@ 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)
+bool
+GainMeterBase::gain_slider_button_press (GdkEventButton* ev)
 {
-       _io->start_gain_touch ();
-       return FALSE;
+       switch (ev->type) {
+       case GDK_BUTTON_PRESS:
+               _amp->gain_control()->start_touch (_amp->session().transport_frame());
+               break;
+       default:
+               return false;
+       }
+
+       return true;
 }
 
-gint
-GainMeter::end_gain_touch (GdkEventButton* ev)
+bool
+GainMeterBase::gain_slider_button_release (GdkEventButton* ev)
 {
-       _io->end_gain_touch ();
-       return FALSE;
+       _amp->gain_control()->stop_touch (false, _amp->session().transport_frame());
+       return true;
 }
 
 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_menu.popup (1, ev->time);
@@ -810,7 +636,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;
@@ -827,25 +653,25 @@ 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:
-               sstr = (shrt ? "O" : _("O"));
+               sstr = (shrt ? "M" : _("M"));
                break;
        case Play:
                sstr = (shrt ? "P" : _("P"));
@@ -862,19 +688,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");
@@ -886,38 +712,36 @@ 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_automation_curve().automation_style()));
+               gain_automation_style_button.set_label (astyle_string(_amp->gain_control()->alist()->automation_style()));
                break;
        case Narrow:
-               gain_automation_style_button.set_label  (short_astyle_string(_io->gain_automation_curve().automation_style()));
+               gain_automation_style_button.set_label  (short_astyle_string(_amp->gain_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);
-       
+       ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed)
+
        bool x;
 
        switch (_width) {
        case Wide:
-               gain_automation_state_button.set_label (astate_string(_io->gain_automation_curve().automation_state()));
+               gain_automation_state_button.set_label (astate_string(_amp->gain_control()->alist()->automation_state()));
                break;
        case Narrow:
-               gain_automation_state_button.set_label (short_astate_string(_io->gain_automation_curve().automation_state()));
+               gain_automation_state_button.set_label (short_astate_string(_amp->gain_control()->alist()->automation_state()));
                break;
        }
 
-       x = (_io->gain_automation_state() != Off);
-       
+       x = (_amp->gain_control()->alist()->automation_state() != Off);
+
        if (gain_automation_state_button.get_active() != x) {
                ignore_toggle = true;
                gain_automation_state_button.set_active (x);
@@ -925,12 +749,301 @@ GainMeter::gain_automation_state_changed ()
        }
 
        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));
+               gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display));
        }
 }
+
+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_label (_("-inf"));
+               } else {
+                       snprintf (buf, sizeof(buf), "%.1f", mpeak);
+                       peak_display.set_label (buf);
+               }
+
+               if (mpeak >= 0.0f) {
+                       peak_display.set_name ("MixerStripPeakDisplayPeak");
+               }
+       }
+}
+
+void GainMeterBase::color_handler(bool dpi)
+{
+       color_changed = true;
+       dpi_changed = (dpi) ? true : false;
+       setup_meters();
+}
+
+void
+GainMeterBase::set_width (Width w, int len)
+{
+       _width = w;
+       level_meter->setup_meters (len);
+}
+
+
+void
+GainMeterBase::on_theme_changed()
+{
+       style_changed = true;
+}
+
+GainMeter::GainMeter (Session* s, int fader_length)
+       : GainMeterBase (s, slider, false, fader_length)
+{
+       gain_display_box.set_homogeneous (true);
+       gain_display_box.set_spacing (2);
+       gain_display_box.pack_start (gain_display, true, true);
+
+       meter_metric_area.set_name ("AudioTrackMetrics");
+       set_size_request_to_display_given_text (meter_metric_area, "-127", 0, 0);
+
+       gain_automation_style_button.set_name ("MixerAutomationModeButton");
+       gain_automation_state_button.set_name ("MixerAutomationPlaybackButton");
+
+       ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode"));
+       ARDOUR_UI::instance()->set_tip (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);
+
+       fader_vbox = manage (new Gtk::VBox());
+       fader_vbox->set_spacing (0);
+       fader_vbox->pack_start (*gain_slider, false, false, 0);
+
+       hbox.set_spacing (2);
+        hbox.pack_start (*fader_vbox, false, false, 4);
+
+       set_spacing (2);
+
+       pack_start (gain_display_box, Gtk::PACK_SHRINK);
+       pack_start (hbox, Gtk::PACK_SHRINK);
+
+       meter_metric_area.signal_expose_event().connect (sigc::mem_fun(*this, &GainMeter::meter_metrics_expose));
+}
+
+void
+GainMeter::set_controls (boost::shared_ptr<Route> r,
+                        boost::shared_ptr<PeakMeter> meter,
+                        boost::shared_ptr<Amp> amp)
+{
+       if (level_meter->get_parent()) {
+               hbox.remove (*level_meter);
+       }
+
+       if (peak_display.get_parent()) {
+               gain_display_box.remove (peak_display);
+       }
+
+       if (gain_automation_state_button.get_parent()) {
+               fader_vbox->remove (gain_automation_state_button);
+       }
+
+       GainMeterBase::set_controls (r, meter, amp);
+
+       if (_meter) {
+               _meter->ConfigurationChanged.connect (
+                       model_connections, invalidator (*this), ui_bind (&GainMeter::meter_configuration_changed, this, _1), gui_context()
+                       );
+               
+               meter_configuration_changed (_meter->input_streams ());
+       }
+
+       
+       /*
+          if we have a non-hidden route (ie. we're not the click or the auditioner),
+          pack some route-dependent stuff.
+       */
+
+       gain_display_box.pack_end (peak_display, true, true);
+       hbox.pack_start (*level_meter, true, true);
+
+       if (r && !r->is_hidden()) {
+               fader_vbox->pack_start (gain_automation_state_button, false, false, 0);
+       }
+
+       setup_meters ();
+       hbox.show_all ();
+}
+
+int
+GainMeter::get_gm_width ()
+{
+       Gtk::Requisition sz;
+       hbox.size_request (sz);
+       return sz.width;
+}
+
+Glib::RefPtr<Gdk::Pixmap>
+GainMeter::render_metrics (Gtk::Widget& w, vector<DataType> types)
+{
+       Glib::RefPtr<Gdk::Window> win (w.get_window());
+       Glib::RefPtr<Gdk::GC> bg_gc (w.get_style()->get_bg_gc (Gtk::STATE_NORMAL));
+
+       gint width, height;
+       win->get_size (width, height);
+
+       Glib::RefPtr<Gdk::Pixmap> pixmap = Gdk::Pixmap::create (win, width, height);
+
+       metric_pixmaps[w.get_name()] = pixmap;
+
+       pixmap->draw_rectangle (bg_gc, true, 0, 0, width, height);
+
+       Glib::RefPtr<Pango::Layout> layout = w.create_pango_layout ("");
+
+       for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
+
+               Glib::RefPtr<Gdk::GC> fg_gc (w.get_style()->get_fg_gc (Gtk::STATE_NORMAL));
+               
+               if (types.size() > 1) {
+                       /* we're overlaying more than 1 set of marks, so use different colours */
+                       Gdk::Color c;
+                       switch (*i) {
+                       case DataType::AUDIO:
+                               c.set_rgb_p (1, 1, 1);
+                               break;
+                       case DataType::MIDI:
+                               c.set_rgb_p (0.2, 0.2, 0.5);
+                               break;
+                       }
+                       
+                       fg_gc->set_rgb_fg_color (c);
+               }
+
+               vector<int> points;
+               
+               switch (*i) {
+               case DataType::AUDIO:
+                       points.push_back (-50);
+                       points.push_back (-40);
+                       points.push_back (-30);
+                       points.push_back (-20);
+                       points.push_back (-10);
+                       points.push_back (-3);
+                       points.push_back (0);
+                       points.push_back (4);
+                       break;
+                       
+               case DataType::MIDI:
+                       points.push_back (0);
+                       if (types.size() == 1) {
+                               points.push_back (32);
+                       } else {
+                               /* tweak so as not to overlay the -30dB mark */                         
+                               points.push_back (48);
+                       }
+                       points.push_back (64);
+                       points.push_back (96);
+                       points.push_back (127);
+                       break;
+               }
+               
+               char buf[32];
+               
+               for (vector<int>::const_iterator j = points.begin(); j != points.end(); ++j) {
+                       
+                       float fraction = 0;
+                       switch (*i) {
+                       case DataType::AUDIO:
+                               fraction = log_meter (*j);
+                               break;
+                       case DataType::MIDI:
+                               fraction = *j / 127.0;
+                               break;
+                       }
+                       
+                       gint const pos = height - (gint) floor (height * fraction);
+                       
+                       snprintf (buf, sizeof (buf), "%d", abs (*j));
+                       
+                       layout->set_text (buf);
+                       
+                       /* we want logical extents, not ink extents here */
+                       
+                       int tw, th;
+                       layout->get_pixel_size (tw, th);
+                       
+                       pixmap->draw_line (fg_gc, 0, pos, 4, pos);
+                       
+                       int p = pos - (th / 2);
+                       p = min (p, height - th);
+                       p = max (p, 0);
+                       
+                       pixmap->draw_layout (fg_gc, 6, p, layout);
+               }
+       }
+
+       return pixmap;
+}
+
+gint
+GainMeter::meter_metrics_expose (GdkEventExpose *ev)
+{
+       Glib::RefPtr<Gdk::Window> win (meter_metric_area.get_window());
+       Glib::RefPtr<Gdk::GC> bg_gc (meter_metric_area.get_style()->get_bg_gc (Gtk::STATE_INSENSITIVE));
+       GdkRectangle base_rect;
+       GdkRectangle draw_rect;
+       gint width, height;
+
+       win->get_size (width, height);
+
+       base_rect.width = width;
+       base_rect.height = height;
+       base_rect.x = 0;
+       base_rect.y = 0;
+
+       Glib::RefPtr<Gdk::Pixmap> pixmap;
+       std::map<string,Glib::RefPtr<Gdk::Pixmap> >::iterator i = metric_pixmaps.find (meter_metric_area.get_name());
+
+       if (i == metric_pixmaps.end() || style_changed || dpi_changed) {
+               pixmap = render_metrics (meter_metric_area, _types);
+       } else {
+               pixmap = i->second;
+       }
+
+       gdk_rectangle_intersect (&ev->area, &base_rect, &draw_rect);
+       win->draw_drawable (bg_gc, pixmap, draw_rect.x, draw_rect.y, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
+       style_changed = false;
+       return true;
+}
+
+boost::shared_ptr<PBD::Controllable>
+GainMeterBase::get_controllable()
+{
+       if (_amp) {
+               return _amp->gain_control();
+       } else {
+               return boost::shared_ptr<PBD::Controllable>();
+       }
+}
+
+void
+GainMeter::meter_configuration_changed (ChanCount c)
+{
+       _types.clear ();
+
+       for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
+               if (c.get (*i) > 0) {
+                       _types.push_back (*i);
+               }
+       }
+
+       style_changed = true;
+       meter_metric_area.queue_draw ();
+}