some fixes/improvements for track selection; add upload target to manual makefile...
[ardour.git] / gtk2_ardour / gain_meter.cc
index 4368bf809ffb73a600828b0ed59fe9da3c23f7c0..6a1a41418d61e107525e7826bfa87b5f993f0937 100644 (file)
@@ -28,7 +28,6 @@
 #include <ardour/dB.h>
 
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/pix.h>
 #include <gtkmm2ext/fastmeter.h>
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/barcontroller.h>
 #include "logmeter.h"
 #include "gui_thread.h"
 #include "keyboard.h"
+#include "public_editor.h"
 
 #include <ardour/session.h>
 #include <ardour/route.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;
+Glib::RefPtr<Gdk::Pixbuf> GainMeter::slider;
+Glib::RefPtr<Gdk::Pixbuf> GainMeter::rail;
+map<string,Glib::RefPtr<Gdk::Pixmap> > GainMeter::metric_pixmaps;
 
 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;
-       }
-
-       slider_pix->ref ();
+       slider = ::get_icon ("fader_belt");
        return 0;
 }
 
-GainMeter::GainMeter (IO& io, Session& s)
+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_display (&gain_adjustment, "MixerStripGainDisplay"),
-         gain_unit_label (_("dbFS")),
-         meter_point_label (_("pre")),
-         top_table (1, 2)
+         gain_automation_style_button (""),
+         gain_automation_state_button ("")
        
 {
-       if (slider_pix == 0) {
+       if (slider == 0) {
                setup_slider_pix ();
        }
 
        ignore_toggle = false;
        meter_menu = 0;
-       
-       gain_slider = manage (new VSliderController (slider_pix,
+       next_release_selects = false;
+
+       gain_slider = manage (new VSliderController (slider,
                                                     &gain_adjustment,
-                                                    & _io.midi_gain_control(),
+                                                    _io->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");
+       gain_slider->set_name ("GainFader");
 
-       if (_session.midi_port()) {
-               _io.set_midi_to_gain_function (slider_position_to_gain);
-               _io.set_gain_to_midi_function (gain_to_slider_position);
-       }
+       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.set_print_func (_gain_printer, this);
+       gain_display_box.set_homogeneous (true);
+       gain_display_box.set_spacing (2);
+       gain_display_box.pack_start (gain_display, true, true);
 
-       gain_unit_button.add (gain_unit_label);
-       gain_unit_button.set_name ("MixerStripGainUnitButton");
-       gain_unit_label.set_name ("MixerStripGainUnitButton");
+       peak_display.set_name ("MixerStripPeakDisplay");
+       peak_display.set_has_frame (false);
+       peak_display.set_editable (false);
+       set_size_request_to_display_given_text  (peak_display, "-80.g", 2, 6); /* note the descender */
+       max_peak = minus_infinity();
+       peak_display.set_text (_("-inf"));
+       peak_display.unset_flags (Gtk::CAN_FOCUS);
 
-       top_table.set_col_spacings (2);
-       top_table.set_homogeneous (true);
-       top_table.attach (gain_unit_button, 0, 1, 0, 1);
+       meter_metric_area.set_name ("MeterMetricsStrip");
+       set_size_request_to_display_given_text (meter_metric_area, "-50", 0, 0);
 
-       Route* r;
+       meter_packer.set_spacing (2);
 
-       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);
+       gain_automation_style_button.set_name ("MixerAutomationModeButton");
+       gain_automation_state_button.set_name ("MixerAutomationPlaybackButton");
 
-               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));
+       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"));
 
-               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_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
+       gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
 
-       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);
-       max_peak = minus_infinity();
-       peak_display_label.set_text (_("-inf"));
+       gain_automation_state_button.set_size_request(15, 15);
+       gain_automation_style_button.set_size_request(15, 15);
 
-       gain_display_box.pack_end (peak_display_frame,  Gtk::PACK_SHRINK);
+       HBox* fader_centering_box = manage (new HBox);
+       fader_centering_box->pack_start (*gain_slider, true, false);
 
-       meter_metric_area.set_size_request (18, -1);
-       meter_metric_area.set_name ("MeterMetricsStrip");
+       fader_vbox = manage (new Gtk::VBox());
+       fader_vbox->set_spacing (0);
+       fader_vbox->pack_start (*fader_centering_box, false, false, 0);
 
-       meter_packer.set_spacing (2);
-       fader_box.set_spacing (2);
+       hbox.set_spacing (2);
+       hbox.pack_start (*fader_vbox, true, true);
+
+       set_width(Narrow);
+
+       Route* r;
+
+       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);
 
-       fader_box.pack_start (*gain_slider,  Gtk::PACK_SHRINK);
+               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 ();
+       }
 
-       hbox.set_spacing (4);
-       hbox.pack_start (fader_box,  Gtk::PACK_SHRINK);
-       hbox.pack_start (meter_packer,  Gtk::PACK_SHRINK);
+       set_spacing (2);
 
-       set_spacing (4);
-       pack_start (top_table,  Gtk::PACK_SHRINK);
-       /* here's the culprit  gain display box*/
-       pack_start (gain_display_box,  Gtk::PACK_SHRINK);
-       pack_start (hbox,  Gtk::PACK_SHRINK);
+       pack_start (gain_display_box, Gtk::PACK_SHRINK);
+       pack_start (hbox, Gtk::PACK_SHRINK);
 
-       _io.gain_changed.connect (mem_fun(*this, &GainMeter::gain_changed));
+       _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));
+       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));
 
-       _session.MeterHoldChanged.connect (mem_fun(*this, &GainMeter::meter_hold_changed));
-       
        gain_changed (0);
-       update_gain_sensitive ();
+       show_gain ();
 
+       update_gain_sensitive ();
+       
        ResetAllPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_peak_display));
        ResetGroupPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_group_peak_display));
 }
@@ -206,10 +210,10 @@ GainMeter::set_width (Width w)
 {
        switch (w) {
        case Wide:
-               peak_display_frame.show_all();
+               peak_display.show();
                break;
        case Narrow:
-               peak_display_frame.hide_all();
+               peak_display.hide();
                break;
        }
 
@@ -217,24 +221,56 @@ GainMeter::set_width (Width w)
        setup_meters ();
 }
 
-gint
-GainMeter::meter_metrics_expose (GdkEventExpose *ev)
+Glib::RefPtr<Gdk::Pixmap>
+GainMeter::render_metrics (Gtk::Widget& w)
 {
-       /* XXX optimize this so that it doesn't do it all everytime */
+       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];
+
+       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) {
 
-       double fraction;
+               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::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));
-       Pango::FontDescription font (meter_metric_area.get_style()->get_font());
-       gint x, y, width, height, depth;
-       gint pos;
-       int  db_points[] = { -50, -10, -3, 0, 6 };
-       uint32_t i;
-       char buf[32];
        GdkRectangle base_rect;
        GdkRectangle draw_rect;
+       gint x, y, width, height, depth;
 
        win->get_geometry (x, y, width, height, depth);
        
@@ -243,26 +279,24 @@ GainMeter::meter_metrics_expose (GdkEventExpose *ev)
        base_rect.x = 0;
        base_rect.y = 0;
 
-       gdk_rectangle_intersect (&ev->area, &base_rect, &draw_rect);
-       win->draw_rectangle (bg_gc, true, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
-
-       for (i = 0; i < sizeof (db_points)/sizeof (db_points[0]); ++i) {
-               fraction = log_meter (db_points[i]);
-               pos = height - (gint) floor (height * fraction);
-
-               snprintf (buf, sizeof (buf), "%d", db_points[i]);
+       Glib::RefPtr<Gdk::Pixmap> pixmap;
+       std::map<string,Glib::RefPtr<Gdk::Pixmap> >::iterator i = metric_pixmaps.find (meter_metric_area.get_name());
 
-               Glib::RefPtr<Pango::Layout> Layout = meter_metric_area.create_pango_layout(buf);
-               // GTK2FIX - how to get twidth, ascent
-               win->draw_layout(fg_gc, width /* - twidth */, pos /*  + ascent */, Layout);
+       if (i == metric_pixmaps.end()) {
+               pixmap = render_metrics (meter_metric_area);
+       } else {
+               pixmap = i->second;
        }
 
-       return TRUE;
+       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;
        }
@@ -279,68 +313,54 @@ GainMeter::update_meters ()
 {
        vector<MeterInfo>::iterator i;
        uint32_t n;
-       float peak;
+       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);
-
-                       if (_session.meter_falloff() == 0.0f || peak > (*i).meter->get_user_level()) {
-                               (*i).meter->set (log_meter (peak), peak);
-                       }
-
-                        if (peak > max_peak) {
-                                max_peak = peak;
-                                /* set peak display */
-                                snprintf (buf, sizeof(buf), "%.1f", max_peak);
-                                peak_display_label.set_text (buf);
-
-                                if (max_peak >= 0.0f) {
-                                        peak_display.set_name ("MixerStripPeakDisplayPeak");
-                                }
-                        }
-                }
-        }
-
-}
-
-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();
+                       peak = _io->peak_input_power (n);
 
-                       dbpeak = std::max(dbpeak, -200.0f);
+                       (*i).meter->set (log_meter (peak), peak);
+
+                       mpeak = _io->max_peak_power(n);
                        
-                       // cerr << "tmplevel: " << tmplevel << endl;
-                       (*i).meter->set (log_meter (dbpeak), dbpeak);
+                       if (mpeak > max_peak) {
+                               max_peak = mpeak;
+                               /* set peak display */
+                               if (max_peak <= -200.0f) {
+                                       peak_display.set_text (_("-inf"));
+                               } else {
+                                       snprintf (buf, sizeof(buf), "%.1f", max_peak);
+                                       peak_display.set_text (buf);
+                               }
+
+                               if (max_peak >= 0.0f) {
+                                       peak_display.set_name ("MixerStripPeakDisplayPeak");
+                               }
+                       }
                }
        }
-       
 }
 
-
 void
-GainMeter::meter_hold_changed()
+GainMeter::parameter_changed(const char* parameter_name)
 {
-       ENSURE_GUI_THREAD(mem_fun(*this, &GainMeter::meter_hold_changed));
-       
-       vector<MeterInfo>::iterator i;
-       uint32_t n;
+#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")) {
        
-       for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
+               vector<MeterInfo>::iterator i;
+               uint32_t n;
                
-               (*i).meter->set_hold_count ((uint32_t) floor(_session.meter_hold()));
+               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
 }
 
 void
@@ -366,14 +386,14 @@ GainMeter::hide_all_meters ()
 void
 GainMeter::setup_meters ()
 {
-       uint32_t nmeters = _io.n_outputs();
+       uint32_t nmeters = _io->n_outputs();
        guint16 width;
 
        hide_all_meters ();
 
        Route* r;
 
-       if ((r = dynamic_cast<Route*> (&_io)) != 0) {
+       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
 
                switch (r->meter_point()) {
                case MeterPreFader:
@@ -387,7 +407,7 @@ GainMeter::setup_meters ()
 
        } else {
 
-               nmeters = _io.n_outputs();
+               nmeters = _io->n_outputs();
 
        }
 
@@ -395,11 +415,6 @@ GainMeter::setup_meters ()
                return;
        }
 
-       if (_width == Wide) {
-               meter_packer.pack_start (meter_metric_area, Gtk::PACK_SHRINK);
-               meter_metric_area.show_all ();
-       }
-
        if (nmeters <= 2) {
                width = regular_meter_width;
        } else {
@@ -410,23 +425,41 @@ GainMeter::setup_meters ()
                meters.push_back (MeterInfo());
        }
 
-       for (uint32_t n = 0; n < nmeters; ++n) {
+       /* pack them backwards */
+
+       if (_width == Wide) {
+               meter_packer.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 (_session.meter_hold()), width, FastMeter::Vertical);
+                       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_start (*meters[n].meter, Gtk::PACK_SHRINK);
+               meter_packer.pack_end (*meters[n].meter, false, false);
                meters[n].meter->show_all ();
                meters[n].packed = true;
        }
 }      
 
-gint
+bool
+GainMeter::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;
+}
+
+bool
 GainMeter::peak_button_release (GdkEventButton* ev)
 {
        /* reset peak label */
@@ -435,20 +468,26 @@ GainMeter::peak_button_release (GdkEventButton* ev)
                ResetAllPeakDisplays ();
        } else if (ev->button == 1 && Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
                Route* r;
-               if ((r = dynamic_cast<Route*> (&_io)) != 0) {
+               if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
                        ResetGroupPeakDisplays (r->mix_group());
                }
        } else {
                reset_peak_display ();
        }
-       return TRUE;
+
+       return true;
 }
 
 void
 GainMeter::reset_peak_display ()
 {
-       max_peak = minus_infinity();
-       peak_display_label.set_text (_("-inf"));
+       Route * r;
+       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
+               r->reset_max_peak_meters();
+       }
+
+       max_peak = -INFINITY;
+       peak_display.set_text (_("-Inf"));
        peak_display.set_name ("MixerStripPeakDisplay");
 }
 
@@ -456,7 +495,7 @@ void
 GainMeter::reset_group_peak_display (RouteGroup* group)
 {
        Route* r;
-       if ((r = dynamic_cast<Route*> (&_io)) != 0) {
+       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
                if (group == r->mix_group()) {
                        reset_peak_display ();
                }
@@ -470,7 +509,7 @@ GainMeter::meter_button_release (GdkEventButton* ev, uint32_t which)
        case 1:
                meters[which].meter->clear();
                max_peak = minus_infinity();
-               peak_display_label.set_text (_("-inf"));
+               peak_display.set_text (_("-inf"));
                peak_display.set_name ("MixerStripPeakDisplay");
                break;
 
@@ -503,39 +542,68 @@ GainMeter::popup_meter_menu (GdkEventButton *ev)
        meter_menu->popup (1, ev->time);
 }
 
+bool
+GainMeter::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)
+GainMeter::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);
+
+               _io->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)
+GainMeter::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 ()
 {
        if (!ignore_toggle) {
-               _io.set_gain (slider_position_to_gain (gain_adjustment.get_value()), this);
+               _io->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this);
        }
+       show_gain ();
 }
 
 void
 GainMeter::effective_gain_display ()
 {
-       gfloat value = gain_to_slider_position (_io.effective_gain());
+       gfloat value = gain_to_slider_position (_io->effective_gain());
        
        if (gain_adjustment.get_value() != value) {
-               ignore_toggle = true;
+               ignore_toggle = true; 
                gain_adjustment.set_value (value);
                ignore_toggle = false;
        }
@@ -562,7 +630,7 @@ GainMeter::set_fader_name (const char * name)
 void
 GainMeter::update_gain_sensitive ()
 {
-       static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (!(_io.gain_automation_state() & Play));
+       static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (!(_io->gain_automation_state() & Play));
 }
 
 
@@ -593,7 +661,7 @@ GainMeter::meter_press(GdkEventButton* ev)
 
        wait_for_release = false;
 
-       if ((_route = dynamic_cast<Route*>(&_io)) == 0) {
+       if ((_route = dynamic_cast<Route*>(_io.get())) == 0) {
                return FALSE;
        }
 
@@ -622,7 +690,13 @@ GainMeter::meter_press(GdkEventButton* ev)
 
                                        /* ctrl-shift-click applies change to all routes */
 
+                                       _session.begin_reversible_command (_("meter point change"));
+                                        Session::GlobalMeteringStateCommand *cmd = new Session::GlobalMeteringStateCommand (_session, this);
                                        _session.foreach_route (this, &GainMeter::set_meter_point, next_meter_point (_route->meter_point()));
+                                        cmd->mark();
+                                       _session.add_command (cmd);
+                                       _session.commit_reversible_command ();
+                                       
                                        
                                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
 
@@ -631,12 +705,19 @@ GainMeter::meter_press(GdkEventButton* ev)
                                        */
                                        
                                        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);
                                }
@@ -644,21 +725,21 @@ GainMeter::meter_press(GdkEventButton* ev)
                }
        }
 
-       return stop_signal (meter_point_button, "button-press-event");
+       return true;
 
 }
 
 gint
 GainMeter::meter_release(GdkEventButton* ev)
 {
+
        if(!ignore_toggle){
                if (wait_for_release){
                        wait_for_release = false;
-                       set_meter_point (*(dynamic_cast<Route*>(&_io)), old_meter_point);
-                       stop_signal (meter_point_button, "button-release-event");
+                       set_meter_point (*(dynamic_cast<Route*>(_io.get())), old_meter_point);
                }
        }
-       return TRUE;
+       return true;
 }
 
 void
@@ -680,52 +761,169 @@ GainMeter::set_mix_group_meter_point (Route& route, MeterPoint mp)
 }
 
 void
-GainMeter::meter_changed (void *src)
+GainMeter::meter_point_clicked ()
 {
        Route* r;
 
-       ENSURE_GUI_THREAD (bind (mem_fun(*this, &GainMeter::meter_changed), src));
+       if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
+
+       }
+}
 
-       if ((r = dynamic_cast<Route*> (&_io)) != 0) {
+gint
+GainMeter::start_gain_touch (GdkEventButton* ev)
+{
+       _io->start_gain_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
+GainMeter::end_gain_touch (GdkEventButton* ev)
+{
+       _io->end_gain_touch ();
+       return FALSE;
+}
+
+gint
+GainMeter::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;
+}
 
-               setup_meters ();
+gint
+GainMeter::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;
 }
 
-void
-GainMeter::meter_point_clicked ()
+string
+GainMeter::astate_string (AutoState state)
 {
-       Route* r;
+       return _astate_string (state, false);
+}
+
+string
+GainMeter::short_astate_string (AutoState state)
+{
+       return _astate_string (state, true);
+}
 
-       if ((r = dynamic_cast<Route*> (&_io)) != 0) {
+string
+GainMeter::_astate_string (AutoState state, bool shrt)
+{
+       string sstr;
 
+       switch (state) {
+       case Off:
+               sstr = (shrt ? "O" : _("O"));
+               break;
+       case Play:
+               sstr = (shrt ? "P" : _("P"));
+               break;
+       case Touch:
+               sstr = (shrt ? "T" : _("T"));
+               break;
+       case Write:
+               sstr = (shrt ? "W" : _("W"));
+               break;
        }
+
+       return sstr;
 }
 
-gint
-GainMeter::start_gain_touch (GdkEventButton* ev)
+string
+GainMeter::astyle_string (AutoStyle style)
 {
-       _io.start_gain_touch ();
-       return FALSE;
+       return _astyle_string (style, false);
 }
 
-gint
-GainMeter::end_gain_touch (GdkEventButton* ev)
+string
+GainMeter::short_astyle_string (AutoStyle style)
 {
-       _io.end_gain_touch ();
-       return FALSE;
+       return _astyle_string (style, true);
+}
+
+string
+GainMeter::_astyle_string (AutoStyle style, bool shrt)
+{
+       if (style & Trim) {
+               return _("Trim");
+       } else {
+               /* XXX it might different in different languages */
+
+               return (shrt ? _("Abs") : _("Abs"));
+       }
+}
+
+void
+GainMeter::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()));
+               break;
+       case Narrow:
+               gain_automation_style_button.set_label  (short_astyle_string(_io->gain_automation_curve().automation_style()));
+               break;
+       }
+}
+
+void
+GainMeter::gain_automation_state_changed ()
+{
+       ENSURE_GUI_THREAD(mem_fun(*this, &GainMeter::gain_automation_state_changed));
+       //Route* _route = dynamic_cast<Route*>(&_io);
+       
+       bool x;
+
+       switch (_width) {
+       case Wide:
+               gain_automation_state_button.set_label (astate_string(_io->gain_automation_curve().automation_state()));
+               break;
+       case Narrow:
+               gain_automation_state_button.set_label (short_astate_string(_io->gain_automation_curve().automation_state()));
+               break;
+       }
+
+       x = (_io->gain_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, &GainMeter::effective_gain_display));
+       }
 }