Merged with trunk R1612.

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index bbc12ccb6ce37567c906f2cb3747c8da14e003ef..a24b93c034a21631df2c315236b60f8c3f9e033c 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_gtk_gain_meter_h__
@@ -35,6 +34,7 @@
 #include <ardour/types.h>
 
 #include <gtkmm2ext/click_box.h>
+#include <gtkmm2ext/focus_entry.h>
 #include <gtkmm2ext/slider_controller.h>
 
 #include "enums.h"
@@ -69,6 +69,8 @@ class GainMeter : public Gtk::VBox
        void set_width (Width);
        void setup_meters ();
 
+       int get_gm_width ();
+
        void set_meter_strip_name (const char * name);
        void set_fader_name (const char * name);
 
@@ -79,14 +81,12 @@ class GainMeter : public Gtk::VBox
        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;
+       Gtkmm2ext::FocusEntry        gain_display;
+       Gtk::Button                  peak_display;
        Gtk::HBox                    gain_display_box;
        Gtk::HBox                    fader_box;
        Gtk::DrawingArea             meter_metric_area;
@@ -122,9 +122,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;   
@@ -157,7 +158,8 @@ class GainMeter : public Gtk::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*);