use ustring more; handle embedding of "paired" files as per mantis #1362

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index c18d351ff6a8ca5b0bf77c021e24bb8e85934094..88105ce846afdd99ede76101053e4523c93d52b3 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -34,8 +34,9 @@
 
 #include <ardour/types.h>
 
-#include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/click_box.h>
+#include <gtkmm2ext/focus_entry.h>
+#include <gtkmm2ext/slider_controller.h>
 
 #include "enums.h"
 
@@ -56,7 +57,7 @@ namespace Gtk {
 class GainMeter : public Gtk::VBox
 {
   public:
-       GainMeter (ARDOUR::IO&, ARDOUR::Session&);
+       GainMeter (boost::shared_ptr<ARDOUR::IO>, ARDOUR::Session&);
        ~GainMeter ();
 
        void update_gain_sensitive ();
@@ -75,26 +76,19 @@ class GainMeter : public Gtk::VBox
   private:
 
        friend class MixerStrip;
-       ARDOUR::IO& _io;
+       boost::shared_ptr<ARDOUR::IO> _io;
        ARDOUR::Session& _session;
 
        bool ignore_toggle;
+       bool next_release_selects;
 
        Gtkmm2ext::VSliderController *gain_slider;
        Gtk::Adjustment              gain_adjustment;
-       Gtk::Frame                   gain_display_frame;
-       Gtkmm2ext::ClickBox           gain_display;
-       Gtk::Frame                   peak_display_frame;
-       Gtk::EventBox                peak_display;
-       Gtk::Label                   peak_display_label;
-       Gtk::Button                  gain_unit_button;
-       Gtk::Label                   gain_unit_label;
+       Gtkmm2ext::FocusEntry        gain_display;
+       Gtk::Entry                   peak_display;
        Gtk::HBox                    gain_display_box;
        Gtk::HBox                    fader_box;
        Gtk::DrawingArea             meter_metric_area;
-       Gtk::Button                  meter_point_button;
-        Gtk::Label                   meter_point_label;
-       Gtk::Table                   top_table;
 
        sigc::connection gain_watching;
 
@@ -127,9 +121,10 @@ class GainMeter : public Gtk::VBox
 
        gint meter_metrics_expose (GdkEventExpose *);
 
-       static void _gain_printer (char buf[32], Gtk::Adjustment&, void *);
-       void gain_printer (char buf[32], Gtk::Adjustment&);
-       
+       void show_gain ();
+       void gain_activated ();
+       bool gain_focused (GdkEventFocus*);
+
        struct MeterInfo {
            Gtkmm2ext::FastMeter *meter;
            gint16          width;   
@@ -147,7 +142,7 @@ class GainMeter : public Gtk::VBox
        vector<MeterInfo>    meters;
        float       max_peak;
        
-Gtk::VBox*   fader_vbox;
+       Gtk::VBox*   fader_vbox;
        Gtk::HBox   hbox;
        Gtk::HBox   meter_packer;
 
@@ -155,7 +150,6 @@ Gtk::VBox*   fader_vbox;
        void gain_changed (void *);
        
        void meter_point_clicked ();
-       void meter_changed (void *);
        void gain_unit_changed ();
        
        void hide_all_meters ();
@@ -163,7 +157,8 @@ Gtk::VBox*   fader_vbox;
        gint meter_button_press (GdkEventButton*, uint32_t);
        gint meter_button_release (GdkEventButton*, uint32_t);
 
-       gint peak_button_release (GdkEventButton*);
+       bool peak_button_release (GdkEventButton*);
+       bool gain_key_press (GdkEventKey*);
        
        Gtk::Menu* meter_menu;
        void popup_meter_menu (GdkEventButton*);
@@ -178,7 +173,7 @@ Gtk::VBox*   fader_vbox;
        bool wait_for_release;
        ARDOUR::MeterPoint old_meter_point;
 
-       void meter_hold_changed();
+       void parameter_changed (const char*);
 
        void reset_peak_display ();
        void reset_group_peak_display (ARDOUR::RouteGroup*);