Merge branch 'patches' of https://github.com/jdekozak/ardour

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index e706606c76ee7a554efc531abf2a61a2aec74071..cec844184aaacb3b5d8295999d5bcd7c9ffe1cfa 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -38,6 +38,8 @@
 #include "ardour/types.h"
 #include "ardour/session_handle.h"
 
+#include "ardour_button.h"
+
 #include "gtkmm2ext/click_box.h"
 #include "gtkmm2ext/focus_entry.h"
 #include "gtkmm2ext/slider_controller.h"
@@ -65,8 +67,7 @@ namespace Gtk {
 class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 {
   public:
-       GainMeterBase (ARDOUR::Session*, const Glib::RefPtr<Gdk::Pixbuf>& pix,
-                      bool horizontal, int);
+        GainMeterBase (ARDOUR::Session*, bool horizontal, int, int);
        virtual ~GainMeterBase ();
 
        virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
@@ -81,6 +82,8 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        void set_meter_strip_name (const char * name);
        void set_fader_name (const char * name);
 
+       void set_flat_buttons ();
+
        virtual void setup_meters (int len=0);
 
        boost::shared_ptr<PBD::Controllable> get_controllable();
@@ -114,8 +117,8 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 
        sigc::connection gain_watching;
 
-       Gtk::Button gain_automation_style_button;
-       Gtk::ToggleButton gain_automation_state_button;
+       ArdourButton gain_automation_style_button;
+       ArdourButton gain_automation_state_button;
 
        Gtk::Menu gain_astate_menu;
        Gtk::Menu gain_astyle_menu;
@@ -197,7 +200,7 @@ private:
 class GainMeter : public GainMeterBase, public Gtk::VBox
 {
   public:
-       GainMeter (ARDOUR::Session*, int);
+         GainMeter (ARDOUR::Session*, int);
        ~GainMeter () {}
 
        virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
@@ -207,8 +210,6 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
        int get_gm_width ();
        void setup_meters (int len=0);
 
-       static void setup_slider_pix ();
-
   protected:
        void hide_all_meters ();
 
@@ -229,8 +230,6 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
        Gtk::Alignment fader_alignment;
        Gtk::Alignment meter_alignment;
        std::vector<ARDOUR::DataType> _types;
-
-       static Glib::RefPtr<Gdk::Pixbuf> slider;
 };
 
 #endif /* __ardour_gtk_gain_meter_h__ */