add back definition of 2ndary clock delta text color

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 8e96c51d9cc88076af0dd8f85061de314e4158bd..4536bb691b5b8123acfd4c8dfe5a73e5b31db8c1 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -65,7 +65,7 @@ namespace Gtk {
 class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 {
   public:
-       GainMeterBase (ARDOUR::Session*, const Glib::RefPtr<Gdk::Pixbuf>& pix,
+       GainMeterBase (ARDOUR::Session*, const Glib::RefPtr<Gdk::Pixbuf>&, const Glib::RefPtr<Gdk::Pixbuf> &,
                       bool horizontal, int);
        virtual ~GainMeterBase ();
 
@@ -88,6 +88,11 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        LevelMeter& get_level_meter() const { return *level_meter; }
        Gtkmm2ext::SliderController& get_gain_slider() const { return *gain_slider; }
 
+       /** Emitted in the GUI thread when a button is pressed over the level meter;
+        *  return true if the event is handled.
+        */
+       PBD::Signal1<bool, GdkEventButton *> LevelMeterButtonPress;
+
   protected:
 
        friend class MixerStrip;
@@ -123,6 +128,8 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        void gain_automation_state_changed();
        void gain_automation_style_changed();
 
+       void setup_gain_adjustment ();
+
        std::string astate_string (ARDOUR::AutoState);
        std::string short_astate_string (ARDOUR::AutoState);
        std::string _astate_string (ARDOUR::AutoState, bool);
@@ -170,9 +177,6 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        void reset_peak_display ();
        void reset_group_peak_display (ARDOUR::RouteGroup*);
 
-       /** Emitted when our slider is double-clicked */
-       PBD::Signal0<void> SliderDoubleClicked;
-
        static sigc::signal<void> ResetAllPeakDisplays;
        static sigc::signal<void,ARDOUR::RouteGroup*> ResetGroupPeakDisplays;
 
@@ -181,7 +185,13 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        bool dpi_changed;
        bool color_changed;
        void color_handler(bool);
-       bool _is_midi;
+       ARDOUR::DataType _data_type;
+       ARDOUR::ChanCount _previous_amp_output_streams;
+
+private:
+
+       bool level_meter_button_press (GdkEventButton *);
+       PBD::ScopedConnection _level_meter_connection;
 };
 
 class GainMeter : public GainMeterBase, public Gtk::VBox
@@ -204,20 +214,24 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
 
        gint meter_metrics_expose (GdkEventExpose *);
 
-       static std::map<std::string,Glib::RefPtr<Gdk::Pixmap> > metric_pixmaps;
-       static Glib::RefPtr<Gdk::Pixmap> render_metrics (Gtk::Widget &, std::vector<ARDOUR::DataType>);
+       typedef std::map<std::string,cairo_pattern_t*> MetricPatterns;
+       static  MetricPatterns metric_patterns;
+       static  cairo_pattern_t* render_metrics (Gtk::Widget &, std::vector<ARDOUR::DataType>);
 
   private:
 
        void meter_configuration_changed (ARDOUR::ChanCount);
-       
+
        Gtk::HBox  gain_display_box;
        Gtk::HBox  fader_box;
        Gtk::VBox* fader_vbox;
        Gtk::HBox  hbox;
+       Gtk::Alignment fader_alignment;
+       Gtk::Alignment meter_alignment;
        std::vector<ARDOUR::DataType> _types;
 
        static Glib::RefPtr<Gdk::Pixbuf> slider;
+       static Glib::RefPtr<Gdk::Pixbuf> slider_desensitised;
 };
 
 #endif /* __ardour_gtk_gain_meter_h__ */