* bugfix from http://tracker.ardour.org/view.php?id=2155 thanks to kristian: fix...

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 8d80e3678144b0c93a24a5f4348c0ce8a20e8a56..d15d8dfd59453e753d618ea4265942473fdd7aa9 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__
@@ -31,10 +30,12 @@
 #include <gtkmm/button.h>
 #include <gtkmm/table.h>
 #include <gtkmm/drawingarea.h>
+#include <gdkmm/colormap.h>
 
 #include <ardour/types.h>
 
 #include <gtkmm2ext/click_box.h>
+#include <gtkmm2ext/focus_entry.h>
 #include <gtkmm2ext/slider_controller.h>
 
 #include "enums.h"
@@ -66,12 +67,16 @@ class GainMeter : public Gtk::VBox
 
        void effective_gain_display ();
 
-       void set_width (Width);
-       void setup_meters ();
+       void set_width (Width, int len=0);
+       void setup_meters (int len=0);
+
+       int get_gm_width ();
 
        void set_meter_strip_name (const char * name);
        void set_fader_name (const char * name);
 
+       void clear_meters ();
+
   private:
 
        friend class MixerStrip;
@@ -79,11 +84,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::Entry                   gain_display;
-       Gtk::Entry                   peak_display;
+       Gtkmm2ext::FocusEntry        gain_display;
+       Gtk::Button                  peak_display;
        Gtk::HBox                    gain_display_box;
        Gtk::HBox                    fader_box;
        Gtk::DrawingArea             meter_metric_area;
@@ -112,7 +118,7 @@ class GainMeter : public Gtk::VBox
        std::string short_astyle_string (ARDOUR::AutoStyle);
        std::string _astyle_string (ARDOUR::AutoStyle, bool);
 
-       Width                       _width;
+       Width _width;
 
        static std::map<std::string,Glib::RefPtr<Gdk::Pixmap> > metric_pixmaps;
        static Glib::RefPtr<Gdk::Pixmap> render_metrics (Gtk::Widget&);
@@ -120,21 +126,24 @@ class GainMeter : public Gtk::VBox
        gint meter_metrics_expose (GdkEventExpose *);
 
        void show_gain ();
-       void gain_entered ();
+       void gain_activated ();
+       bool gain_focused (GdkEventFocus*);
 
        struct MeterInfo {
            Gtkmm2ext::FastMeter *meter;
-           gint16          width;   
-           bool            packed;
+           gint16                width;
+               int                   length;
+           bool                  packed;
            
            MeterInfo() { 
                    meter = 0;
                    width = 0;
+                       length = 0;
                    packed = false;
            }
        };
 
-       static const guint16 regular_meter_width = 5;
+       guint16 regular_meter_width;
        static const guint16 thin_meter_width = 2;
        vector<MeterInfo>    meters;
        float       max_peak;
@@ -144,7 +153,7 @@ class GainMeter : public Gtk::VBox
        Gtk::HBox   meter_packer;
 
        void gain_adjusted ();
-       void gain_changed (void *);
+       void gain_changed ();
        
        void meter_point_clicked ();
        void gain_unit_changed ();
@@ -181,6 +190,12 @@ class GainMeter : public Gtk::VBox
        static Glib::RefPtr<Gdk::Pixbuf> slider;
        static Glib::RefPtr<Gdk::Pixbuf> rail;
        static int setup_slider_pix ();
+
+       void on_theme_changed ();
+       bool style_changed;
+       bool dpi_changed;
+       bool color_changed;
+       void color_handler(bool);
 };
 
 #endif /* __ardour_gtk_gain_meter_h__ */