basic adoption of new mouse binding facility

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index c0c5d9faff5ef86eaa2db86b87292248c6f16eb6..83f51ab946ced2fa8593cfe18446f4750a5e10f2 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -32,11 +32,15 @@
 #include <gtkmm/drawingarea.h>
 #include <gdkmm/colormap.h>
 
+#include "pbd/signals.h"
+
+#include "ardour/chan_count.h"
 #include "ardour/types.h"
+#include "ardour/session_handle.h"
 
-#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/focus_entry.h>
-#include <gtkmm2ext/slider_controller.h>
+#include "gtkmm2ext/click_box.h"
+#include "gtkmm2ext/focus_entry.h"
+#include "gtkmm2ext/slider_controller.h"
 
 #include "enums.h"
 #include "level_meter.h"
@@ -58,11 +62,11 @@ namespace Gtk {
        class Menu;
 }
 
-class GainMeterBase : virtual public sigc::trackable
+class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 {
   public:
-       GainMeterBase (ARDOUR::Session&, const Glib::RefPtr<Gdk::Pixbuf>& pix,
-                      bool horizontal);
+       GainMeterBase (ARDOUR::Session*, const Glib::RefPtr<Gdk::Pixbuf>& pix,
+                      bool horizontal, int);
        virtual ~GainMeterBase ();
 
        virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
@@ -90,8 +94,8 @@ class GainMeterBase : virtual public sigc::trackable
        boost::shared_ptr<ARDOUR::Route> _route;
        boost::shared_ptr<ARDOUR::PeakMeter> _meter;
        boost::shared_ptr<ARDOUR::Amp> _amp;
-       ARDOUR::Session& _session;
        std::vector<sigc::connection> connections;
+       PBD::ScopedConnectionList model_connections;
 
        bool ignore_toggle;
        bool next_release_selects;
@@ -151,10 +155,10 @@ class GainMeterBase : virtual public sigc::trackable
        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*);
@@ -180,7 +184,7 @@ class GainMeterBase : virtual public sigc::trackable
 class GainMeter : public GainMeterBase, public Gtk::VBox
 {
   public:
-       GainMeter (ARDOUR::Session&);
+       GainMeter (ARDOUR::Session*, int);
        ~GainMeter () {}
 
        virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
@@ -198,13 +202,17 @@ 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&);
+       static Glib::RefPtr<Gdk::Pixmap> 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;
+       std::vector<ARDOUR::DataType> _types;
 
        static Glib::RefPtr<Gdk::Pixbuf> slider;
 };