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 16c818deada582ed8594fe987fad364032382e9f..cec844184aaacb3b5d8295999d5bcd7c9ffe1cfa 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -32,11 +32,14 @@
 #include <gtkmm/drawingarea.h>
 #include <gdkmm/colormap.h>
 
-#include "pbd/scoped_connections.h"
+#include "pbd/signals.h"
 
+#include "ardour/chan_count.h"
 #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"
@@ -64,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,
@@ -80,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();
@@ -87,6 +91,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;
@@ -108,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;
@@ -122,6 +131,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);
@@ -154,10 +165,10 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        Gtk::Menu* meter_menu;
        void popup_meter_menu (GdkEventButton*);
 
-       gint start_gain_touch (GdkEventButton*);
-       gint end_gain_touch (GdkEventButton*);
+       bool gain_slider_button_press (GdkEventButton *);
+       bool gain_slider_button_release (GdkEventButton *);
 
-       void set_mix_group_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint);
+       void set_route_group_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint);
        void set_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint);
        gint meter_release (GdkEventButton*);
        gint meter_press (GdkEventButton*);
@@ -177,13 +188,19 @@ 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
 {
   public:
-       GainMeter (ARDOUR::Session*, int);
+         GainMeter (ARDOUR::Session*, int);
        ~GainMeter () {}
 
        virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
@@ -193,23 +210,26 @@ 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 ();
 
        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&);
+       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;
-
-       static Glib::RefPtr<Gdk::Pixbuf> slider;
+       Gtk::Alignment fader_alignment;
+       Gtk::Alignment meter_alignment;
+       std::vector<ARDOUR::DataType> _types;
 };
 
 #endif /* __ardour_gtk_gain_meter_h__ */