fix clicking when processors become active/inactive; reduce crazy 2.5sec delay for...
[ardour.git] / gtk2_ardour / gain_meter.cc
index 549620a1c85f40aeded89212afb349cd07afa6e8..e6f0c7404221f5bdf6fd37372dd29056d453e8ce 100644 (file)
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-  $Id$
 */
 
 #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 <gtkmm/style.h>
+#include <gdkmm/color.h>
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/pix.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 "logmeter.h"
 #include "gui_thread.h"
 #include "keyboard.h"
+#include "public_editor.h"
 
-#include <ardour/session.h>
-#include <ardour/route.h>
+#include "ardour/session.h"
+#include "ardour/route.h"
+#include "ardour/meter.h"
 
 #include "i18n.h"
-#include "misc_xpms"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace sigc;
 using namespace std;
 
-sigc::signal<void> GainMeter::ResetAllPeakDisplays;
-sigc::signal<void,RouteGroup*> GainMeter::ResetGroupPeakDisplays;
-Pix* GainMeter::slider_pix = 0;
-map<string,Glib::RefPtr<Gdk::Pixmap> > GainMeter::metric_pixmaps;
+sigc::signal<void> GainMeterBase::ResetAllPeakDisplays;
+sigc::signal<void,RouteGroup*> GainMeterBase::ResetGroupPeakDisplays;
 
-int
-GainMeter::setup_slider_pix ()
-{
-       vector<const char **> xpms;
-
-       xpms.push_back (vslider_rail_xpm);
-       xpms.push_back (vslider_slider_xpm);
-
-       if ((slider_pix = get_pix ("sliders", xpms, false)) == 0) {
-               error << _("Cannot create slider pixmaps") << endmsg;
-               return -1;
-       }
+map<string,Glib::RefPtr<Gdk::Pixmap> > GainMeter::metric_pixmaps;
+Glib::RefPtr<Gdk::Pixbuf> GainMeter::slider;
 
-       slider_pix->ref ();
-       return 0;
-}
 
 void
-was_pressed ()
-{
-       cerr << "was pressed\n";
-}
-
-bool
-was_button (GdkEventButton* ev)
+GainMeter::setup_slider_pix ()
 {
-       cerr << "Bp/R: " << ev->type << endl;
-       return false;
+       if ((slider = ::get_icon ("fader_belt")) == 0) {
+               throw failed_constructor();
+       }
 }
 
-GainMeter::GainMeter (IO& io, Session& s)
-       : _io (io),
-         _session (s),
-         gain_slider (0),
+GainMeterBase::GainMeterBase (Session& s, 
+                             const Glib::RefPtr<Gdk::Pixbuf>& pix,
+                             bool horizontal)
+       : _session (s),
          // 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_display (&gain_adjustment, "MixerStripGainDisplay"),
-         gain_unit_label (_("dbFS")),
-         meter_point_label (_("pre")),
-         top_table (1, 2)
+         gain_automation_style_button (""),
+         gain_automation_state_button (""),
+         dpi_changed (false)
        
 {
-       if (slider_pix == 0) {
-               setup_slider_pix ();
-       }
+       using namespace Menu_Helpers;
 
        ignore_toggle = false;
        meter_menu = 0;
-       
-       gain_slider = manage (new VSliderController (slider_pix,
-                                                    &gain_adjustment,
-                                                    & _io.midi_gain_control(),
-                                                    false));
-
-       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->set_name ("MixerGainMeter");
-
-       if (_session.midi_port()) {
-               _io.set_midi_to_gain_function (slider_position_to_gain);
-               _io.set_gain_to_midi_function (gain_to_slider_position);
+       next_release_selects = false;
+       style_changed = true;
+       _width = Wide;
+
+       if (horizontal) {
+               gain_slider = manage (new HSliderController (pix,
+                                                            &gain_adjustment,
+                                                            false));
+       } else {
+               gain_slider = manage (new VSliderController (pix,
+                                                            &gain_adjustment,
+                                                            false));
        }
 
-       gain_display.set_print_func (_gain_printer, this);
-
-       gain_unit_button.add (gain_unit_label);
-       gain_unit_button.set_name ("MixerStripGainUnitButton");
-       gain_unit_label.set_name ("MixerStripGainUnitButton");
-
-       gain_unit_button.signal_clicked().connect (ptr_fun (was_pressed));
-
-       meter_point_button.signal_button_press_event().connect (mem_fun (*this, &GainMeter::meter_press));
-       meter_point_button.signal_button_release_event().connect (mem_fun (*this, &GainMeter::meter_release));
-       g_signal_connect (meter_point_button.gobj(), "button-press-event", (void (*)()) was_button, 0);
-       g_signal_connect (meter_point_button.gobj(), "button-release-event", (void (*)()) was_button, 0);
-       
-
-       top_table.set_col_spacings (2);
-       top_table.set_homogeneous (true);
-       top_table.attach (gain_unit_button, 0, 1, 0, 1);
-
-       Route* r;
-
-       if ((r = dynamic_cast<Route*> (&_io)) != 0) {
-
-               r->meter_change.connect (mem_fun(*this, &GainMeter::meter_changed));
-               meter_point_button.add (meter_point_label);
-               meter_point_button.set_name ("MixerStripMeterPreButton");
-               meter_point_label.set_name ("MixerStripMeterPreButton");
-               
-               switch (r->meter_point()) {
-               case MeterInput:
-                       meter_point_label.set_text (_("input"));
-                       break;
-                       
-               case MeterPreFader:
-                       meter_point_label.set_text (_("pre"));
-                       break;
-                       
-               case MeterPostFader:
-                       meter_point_label.set_text (_("post"));
-                       break;
-               }
-               
-               /* TRANSLATORS: this string should be longest of the strings
-                  used to describe meter points. In english, its "input".
-               */
-               
-               set_size_request_to_display_given_text (meter_point_button, _("tupni"), 2, 2);
+       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->set_name ("GainFader");
 
-               top_table.attach (meter_point_button, 1, 2, 0, 1);
-       }
-       gain_display_box.set_spacing (2);
-       set_size_request_to_display_given_text (gain_display_frame, "-86.0", 2, 2);
-       gain_display_frame.set_shadow_type (Gtk::SHADOW_IN);
-       gain_display_frame.set_name ("BaseFrame");
-       gain_display_frame.add (gain_display);
-       gain_display_box.pack_start (gain_display_frame,  Gtk::PACK_SHRINK);
+       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);
 
        peak_display.set_name ("MixerStripPeakDisplay");
-       peak_display.add (peak_display_label);
-       set_size_request_to_display_given_text (peak_display_frame, "-86.0", 2, 2);
-       peak_display_frame.set_shadow_type (Gtk::SHADOW_IN);
-       peak_display_frame.set_name ("BaseFrame");
-       peak_display_frame.add (peak_display);
+//     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 */
        max_peak = minus_infinity();
-       peak_display_label.set_text (_("-inf"));
-
-       gain_display_box.pack_end (peak_display_frame,  Gtk::PACK_SHRINK);
-
-       meter_metric_area.set_size_request (25, -1);
-       meter_metric_area.set_name ("MeterMetricsStrip");
-
-       meter_packer.set_spacing (2);
-
-       hbox.set_spacing (4);
-       hbox.pack_start (*gain_slider, false, false, 2);
-       hbox.pack_start (meter_packer, true, false);
+       peak_display.set_label (_("-inf"));
+       peak_display.unset_flags (Gtk::CAN_FOCUS);
 
-       set_spacing (4);
+       gain_automation_style_button.set_name ("MixerAutomationModeButton");
+       gain_automation_state_button.set_name ("MixerAutomationPlaybackButton");
 
-       pack_start (top_table,  Gtk::PACK_SHRINK);
-       pack_start (gain_display_box,  Gtk::PACK_SHRINK);
-       pack_start (hbox,  Gtk::PACK_SHRINK);
+       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"));
 
-       _io.gain_changed.connect (mem_fun(*this, &GainMeter::gain_changed));
+       gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
+       gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
 
-       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));
-
-       _session.MeterHoldChanged.connect (mem_fun(*this, &GainMeter::meter_hold_changed));
+       gain_automation_state_button.set_size_request(15, 15);
+       gain_automation_style_button.set_size_request(15, 15);
+  
+       gain_astyle_menu.items().push_back (MenuElem (_("Trim")));
+       gain_astyle_menu.items().push_back (MenuElem (_("Abs")));
        
-       gain_changed (0);
-       update_gain_sensitive ();
+       gain_astate_menu.set_name ("ArdourContextMenu");
+       gain_astyle_menu.set_name ("ArdourContextMenu");
 
-       ResetAllPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_peak_display));
-       ResetGroupPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_group_peak_display));
-}
+       gain_adjustment.signal_value_changed().connect (mem_fun(*this, &GainMeterBase::gain_adjusted));
+       peak_display.signal_button_release_event().connect (mem_fun(*this, &GainMeterBase::peak_button_release), false);
+       gain_display.signal_key_press_event().connect (mem_fun(*this, &GainMeterBase::gain_key_press), false);
 
-void
-GainMeter::set_width (Width w)
-{
-       switch (w) {
-       case Wide:
-               peak_display_frame.show_all();
-               break;
-       case Narrow:
-               peak_display_frame.hide_all();
-               break;
-       }
+       ResetAllPeakDisplays.connect (mem_fun(*this, &GainMeterBase::reset_peak_display));
+       ResetGroupPeakDisplays.connect (mem_fun(*this, &GainMeterBase::reset_group_peak_display));
 
-       _width = w;
-       setup_meters ();
+       UI::instance()->theme_changed.connect (mem_fun(*this, &GainMeterBase::on_theme_changed));
+       ColorsChanged.connect (bind(mem_fun (*this, &GainMeterBase::color_handler), false));
+       DPIReset.connect (bind(mem_fun (*this, &GainMeterBase::color_handler), true));
 }
 
-Glib::RefPtr<Gdk::Pixmap>
-GainMeter::render_metrics (Gtk::Widget& w)
+GainMeterBase::~GainMeterBase ()
 {
-       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 x, y, width, height, depth;
-       int  db_points[] = { -50, -40, -20, -30, -10, -3, 0, 4 };
-       char buf[32];
-       int theight;
-       int twidth;
-
-       win->get_geometry (x, y, width, height, depth);
-       
-       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);
-               layout->get_pixel_size (twidth, theight);
-
-               pixmap->draw_line (fg_gc, 0, pos, 4, pos);
-               pixmap->draw_layout (fg_gc, 6, pos - (theight/2), layout);
-       }
-
-       return pixmap;
-}
-
-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 x, y, width, height, depth;
-
-       win->get_geometry (x, y, width, height, depth);
-       
-       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()) {
-               pixmap = render_metrics (meter_metric_area);
-       } else {
-               pixmap = i->second;
-       }
-
-       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;
-       }
-
-       for (vector<MeterInfo>::iterator i = meters.begin(); i != meters.end(); i++) {
-               if ((*i).meter) {
-                       delete (*i).meter;
-               }
-       }
+       delete meter_menu;
+       delete level_meter;
 }
 
 void
-GainMeter::update_meters ()
-{
-       vector<MeterInfo>::iterator i;
-       uint32_t n;
-       float peak;
-       char buf[32];
-       
-       for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
-                if ((*i).packed) {
-                        peak = _io.peak_input_power (n);
+GainMeterBase::set_controls (boost::shared_ptr<Route> r,
+                            boost::shared_ptr<PeakMeter> pm, 
+                            boost::shared_ptr<Amp> amp)
+{
+       connections.clear ();
+
+       if (!pm && !amp) {
+               level_meter->set_meter (0);
+               gain_slider->set_controllable (boost::shared_ptr<PBD::Controllable>());
+               _meter.reset ();
+               _amp.reset ();
+               _route.reset ();
+               return;
+       } 
 
-                       if (_session.meter_falloff() == 0.0f || peak > (*i).meter->get_user_level()) {
-                               (*i).meter->set (log_meter (peak), peak);
-                       }
+       _meter = pm;
+       _amp = amp;
+       _route = r;
 
-                        if (peak > max_peak) {
-                                max_peak = peak;
-                                /* set peak display */
-                                snprintf (buf, sizeof(buf), "%.1f", max_peak);
-                                peak_display_label.set_text (buf);
+       level_meter->set_meter (pm.get());
+       gain_slider->set_controllable (amp->gain_control());
+       
+       if (!_route || !_route->is_hidden()) {
+               
+               using namespace Menu_Helpers;
+               
+               gain_astate_menu.items().clear ();
+               
+               gain_astate_menu.items().push_back (MenuElem (_("Manual"), 
+                                                             bind (mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
+                                                                   Evoral::Parameter(GainAutomation), (AutoState) Off)));
+               gain_astate_menu.items().push_back (MenuElem (_("Play"),
+                                                             bind (mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
+                                                                   Evoral::Parameter(GainAutomation), (AutoState) Play)));
+               gain_astate_menu.items().push_back (MenuElem (_("Write"),
+                                                             bind (mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
+                                                                   Evoral::Parameter(GainAutomation), (AutoState) Write)));
+               gain_astate_menu.items().push_back (MenuElem (_("Touch"),
+                                                             bind (mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
+                                                                   Evoral::Parameter(GainAutomation), (AutoState) Touch)));
+               
+               connections.push_back (gain_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &GainMeterBase::gain_automation_style_button_event), false));
+               connections.push_back (gain_automation_state_button.signal_button_press_event().connect (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();
 
-}
+               connections.push_back (gc->alist()->automation_state_changed.connect (mem_fun(*this, &GainMeter::gain_automation_state_changed)));
+               connections.push_back (gc->alist()->automation_style_changed.connect (mem_fun(*this, &GainMeter::gain_automation_style_changed)));
+               
+               gain_automation_state_changed ();
+       }
 
-void
-GainMeter::update_meters_falloff ()
-{
-       vector<MeterInfo>::iterator i;
-       uint32_t n;
-       float dbpeak;
-       
-       for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
-               if ((*i).packed) {
-                       // just do falloff
-                       //peak = (*i).meter->get_level() * _falloff_rate;
-                       dbpeak = (*i).meter->get_user_level() - _session.meter_falloff();
+       connections.push_back (amp->gain_control()->Changed.connect (mem_fun (*this, &GainMeterBase::gain_changed)));
 
-                       dbpeak = std::max(dbpeak, -200.0f);
-                       
-                       // cerr << "tmplevel: " << tmplevel << endl;
-                       (*i).meter->set (log_meter (dbpeak), dbpeak);
-               }
-       }
-       
+       gain_changed ();
+       show_gain ();
+       update_gain_sensitive ();
 }
 
-
 void
-GainMeter::meter_hold_changed()
+GainMeterBase::hide_all_meters ()
 {
-       ENSURE_GUI_THREAD(mem_fun(*this, &GainMeter::meter_hold_changed));
-       
-       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(_session.meter_hold()));
-       }
+       level_meter->hide_meters();
 }
 
 void
@@ -394,142 +231,80 @@ 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)) != 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());
-       }
-
-       for (uint32_t n = 0; n < nmeters; ++n) {
-               if (meters[n].width != width) {
-                       delete meters[n].meter;
-                       meters[n].meter = new FastMeter ((uint32_t) floor (_session.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));
-               }
+       level_meter->setup_meters(len, 5);
+}
 
-               meter_packer.pack_start (*meters[n].meter, Gtk::PACK_SHRINK);
-               meters[n].meter->show_all ();
-               meters[n].packed = true;
+void 
+GainMeter::setup_meters (int len)
+{
+       if (!meter_metric_area.get_parent()) {
+               level_meter->pack_end (meter_metric_area, false, false);
+               meter_metric_area.show_all ();
        }
+       GainMeterBase::setup_meters (len);
+}
 
-       if (_width == Wide) {
-               meter_packer.pack_start (meter_metric_area, Gtk::PACK_SHRINK);
-               meter_metric_area.show_all ();
+bool
+GainMeterBase::gain_key_press (GdkEventKey* ev)
+{
+       if (key_is_legal_for_numeric_entry (ev->keyval)) {
+               /* drop through to normal handling */
+               return false;
        }
-}      
+       /* illegal key for gain entry */
+       return true;
+}
 
-gint
-GainMeter::peak_button_release (GdkEventButton* ev)
+bool
+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)) != 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 ();
        }
-       return TRUE;
+
+       return true;
 }
 
 void
-GainMeter::reset_peak_display ()
+GainMeterBase::reset_peak_display ()
 {
-       max_peak = minus_infinity();
-       peak_display_label.set_text (_("-inf"));
+       _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)) != 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_label.set_text (_("-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;
 
@@ -549,69 +324,109 @@ GainMeter::popup_meter_menu (GdkEventButton *ev)
        meter_menu->popup (1, ev->time);
 }
 
+bool
+GainMeterBase::gain_focused (GdkEventFocus* ev)
+{
+       if (ev->in) {
+               gain_display.select_region (0, -1);
+       } else {
+               gain_display.select_region (0, 0);
+       }
+       return false;
+}
+
 void
-GainMeter::_gain_printer (char buf[32], Gtk::Adjustment& adj, void *arg)
+GainMeterBase::gain_activated ()
 {
-       static_cast<GainMeter *>(arg)->gain_printer (buf, adj);
+       float f;
+
+       if (sscanf (gain_display.get_text().c_str(), "%f", &f) == 1) {
+
+               /* clamp to displayable values */
+
+               f = min (f, 6.0f);
+
+               _amp->set_gain (dB_to_coefficient(f), this);
+
+               if (gain_display.has_focus()) {
+                       PublicEditor::instance().reset_focus();
+               }
+       }
 }
 
 void
-GainMeter::gain_printer (char buf[32], Gtk::Adjustment& adj)
+GainMeterBase::show_gain ()
 {
-       float v = adj.get_value();
+       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)));
        }
+       
+       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) {
+                       if (_route->amp() == _amp) {
+                               _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 = gain_to_slider_position (_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 (mem_fun(*this, &GainMeterBase::effective_gain_display));
 }
 
 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);
 }
 
 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)
 {
@@ -633,15 +448,11 @@ next_meter_point (MeterPoint mp)
 }
 
 gint
-GainMeter::meter_press(GdkEventButton* ev)
+GainMeterBase::meter_press(GdkEventButton* ev)
 {
-       Route* _route;
-
        wait_for_release = false;
-
-       cerr << "meter point button press\n";
-
-       if ((_route = dynamic_cast<Route*>(&_io)) == 0) {
+       
+       if (!_route) {
                return FALSE;
        }
 
@@ -653,38 +464,51 @@ GainMeter::meter_press(GdkEventButton* ev)
 
                } 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 (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::Control|Keyboard::Shift))) {
+                       if (_route && (ev->button == 1 || Keyboard::is_button2_event (ev))) {
 
-                                       /* ctrl-shift-click applies change to all routes */
-
-                                       _session.foreach_route (this, &GainMeter::set_meter_point, next_meter_point (_route->meter_point()));
+                               if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
+                                       
+                                       /* 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, &GainMeterBase::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)) {
+                                       
+                               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 
-                                       /* ctrl-click: solo mix group.
-                                          ctrl-button2 is MIDI learn.
+                                       /* 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 ();
                                        }
                                        
                                } else {
                                        
-                                       /* click: solo this route */
+                                       /* click: change just this route */
+
+                                       // XXX no undo yet
                                        
                                        _route->set_meter_point (next_meter_point (_route->meter_point()), this);
                                }
@@ -697,31 +521,33 @@ GainMeter::meter_press(GdkEventButton* ev)
 }
 
 gint
-GainMeter::meter_release(GdkEventButton* ev)
+GainMeterBase::meter_release(GdkEventButton* ev)
 {
-       cerr << "meter point button release\n";
-
        if(!ignore_toggle){
                if (wait_for_release){
                        wait_for_release = false;
-                       set_meter_point (*(dynamic_cast<Route*>(&_io)), 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);
 }
 
 void
-GainMeter::set_mix_group_meter_point (Route& route, MeterPoint mp)
+GainMeterBase::set_mix_group_meter_point (Route& route, MeterPoint mp)
 {
        RouteGroup* mix_group;
 
-       if((mix_group = route.mix_group()) != 0){
+       if((mix_group = route.route_group()) != 0){
                mix_group->apply (&Route::set_meter_point, mp, this);
        } else {
                route.set_meter_point (mp, this);
@@ -729,52 +555,378 @@ GainMeter::set_mix_group_meter_point (Route& route, MeterPoint mp)
 }
 
 void
-GainMeter::meter_changed (void *src)
+GainMeterBase::meter_point_clicked ()
 {
-       Route* r;
+       if (_route) {
+               /* WHAT? */
+       }
+}
 
-       ENSURE_GUI_THREAD (bind (mem_fun(*this, &GainMeter::meter_changed), src));
+gint
+GainMeterBase::start_gain_touch (GdkEventButton* ev)
+{
+       _amp->gain_control()->start_touch ();
+       return FALSE;
+}
 
-       if ((r = dynamic_cast<Route*> (&_io)) != 0) {
+gint
+GainMeterBase::end_gain_touch (GdkEventButton* ev)
+{
+       _amp->gain_control()->stop_touch ();
+       return FALSE;
+}
 
-               switch (r->meter_point()) {
-               case MeterInput:
-                       meter_point_label.set_text (_("input"));
-                       break;
-                       
-               case MeterPreFader:
-                       meter_point_label.set_text (_("pre"));
+gint
+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);
                        break;
-                       
-               case MeterPostFader:
-                       meter_point_label.set_text (_("post"));
+               default:
                        break;
+       }
+
+       return TRUE;
+}
+
+gint
+GainMeterBase::gain_automation_style_button_event (GdkEventButton *ev)
+{
+       if (ev->type == GDK_BUTTON_RELEASE) {
+               return TRUE;
+       }
+
+       switch (ev->button) {
+       case 1:
+               gain_astyle_menu.popup (1, ev->time);
+               break;
+       default:
+               break;
+       }
+       return TRUE;
+}
+
+string
+GainMeterBase::astate_string (AutoState state)
+{
+       return _astate_string (state, false);
+}
+
+string
+GainMeterBase::short_astate_string (AutoState state)
+{
+       return _astate_string (state, true);
+}
+
+string
+GainMeterBase::_astate_string (AutoState state, bool shrt)
+{
+       string sstr;
+
+       switch (state) {
+       case Off:
+               sstr = (shrt ? "M" : _("M"));
+               break;
+       case Play:
+               sstr = (shrt ? "P" : _("P"));
+               break;
+       case Touch:
+               sstr = (shrt ? "T" : _("T"));
+               break;
+       case Write:
+               sstr = (shrt ? "W" : _("W"));
+               break;
+       }
+
+       return sstr;
+}
+
+string
+GainMeterBase::astyle_string (AutoStyle style)
+{
+       return _astyle_string (style, false);
+}
+
+string
+GainMeterBase::short_astyle_string (AutoStyle style)
+{
+       return _astyle_string (style, true);
+}
+
+string
+GainMeterBase::_astyle_string (AutoStyle style, bool shrt)
+{
+       if (style & Trim) {
+               return _("Trim");
+       } else {
+               /* XXX it might different in different languages */
+
+               return (shrt ? _("Abs") : _("Abs"));
+       }
+}
+
+void
+GainMeterBase::gain_automation_style_changed ()
+{
+       switch (_width) {
+       case Wide:
+               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(_amp->gain_control()->alist()->automation_style()));
+               break;
+       }
+}
+
+void
+GainMeterBase::gain_automation_state_changed ()
+{
+       ENSURE_GUI_THREAD(mem_fun(*this, &GainMeterBase::gain_automation_state_changed));
+       
+       bool x;
+
+       switch (_width) {
+       case Wide:
+               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(_amp->gain_control()->alist()->automation_state()));
+               break;
+       }
+
+       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);
+               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, &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);
                }
 
-               setup_meters ();
+               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
-GainMeter::meter_point_clicked ()
+GainMeterBase::on_theme_changed()
+{
+       style_changed = true;
+}
+
+GainMeter::GainMeter (Session& s)
+       : GainMeterBase (s, slider, false)
+{
+       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, "-50", 0, 0);
+
+       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"));
+
+       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);
+
+       HBox* fader_centering_box = manage (new HBox);
+       fader_centering_box->pack_start (*gain_slider, true, false);
+
+       fader_vbox = manage (new Gtk::VBox());
+       fader_vbox->set_spacing (0);
+       fader_vbox->pack_start (*fader_centering_box, false, false, 0);
+
+       hbox.set_spacing (2);
+       hbox.pack_start (*fader_vbox, true, true);
+
+       set_spacing (2);
+
+       pack_start (gain_display_box, Gtk::PACK_SHRINK);
+       pack_start (hbox, Gtk::PACK_SHRINK);
+
+       meter_metric_area.signal_expose_event().connect (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)
 {
-       Route* r;
+       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);
+       }
 
-       if ((r = dynamic_cast<Route*> (&_io)) != 0) {
+       GainMeterBase::set_controls (r, meter, amp);
 
+       /* 
+          if we have a non-hidden route (ie. we're not the click or the auditioner), 
+          pack some route-dependent stuff.
+       */
+       
+       gain_display_box.pack_end (peak_display, true, true);
+       hbox.pack_end (*level_meter, true, true);
+       
+       if (!r->is_hidden()) {
+               fader_vbox->pack_start (gain_automation_state_button, false, false, 0);
        }
+
+       setup_meters ();
+       hbox.show_all ();
 }
 
-gint
-GainMeter::start_gain_touch (GdkEventButton* ev)
+int
+GainMeter::get_gm_width ()
 {
-       _io.start_gain_touch ();
-       return FALSE;
+       Gtk::Requisition sz;
+       hbox.size_request (sz);
+       return sz.width;
+}
+
+Glib::RefPtr<Gdk::Pixmap>
+GainMeter::render_metrics (Gtk::Widget& w)
+{
+       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);
+       }
+
+       return pixmap;
 }
 
 gint
-GainMeter::end_gain_touch (GdkEventButton* ev)
+GainMeter::meter_metrics_expose (GdkEventExpose *ev)
 {
-       _io.end_gain_touch ();
-       return FALSE;
+       static Glib::RefPtr<Gtk::Style> meter_style;
+       if (style_changed) {
+               meter_style = meter_metric_area.get_style();
+       }
+       Glib::RefPtr<Gdk::Window> win (meter_metric_area.get_window());
+       Glib::RefPtr<Gdk::GC> bg_gc (meter_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);
+       } 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>();
+       }
+}
+
+