Restore Fader and Pan options to audio track automation menus. Hide the Amp processo...

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 4ce13af0d606da405ae74959b710533a567709a8..2513e4d2678618716bb9a3af7ddf6d14200afe6f 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;
@@ -134,20 +138,20 @@ class GainMeterBase : virtual public sigc::trackable
        bool gain_focused (GdkEventFocus*);
 
        float max_peak;
-       
+
        void gain_adjusted ();
        void gain_changed ();
-       
+
        void meter_point_clicked ();
        void gain_unit_changed ();
-       
+
        virtual void hide_all_meters ();
 
        gint meter_button_press (GdkEventButton*, uint32_t);
 
        bool peak_button_release (GdkEventButton*);
        bool gain_key_press (GdkEventKey*);
-       
+
        Gtk::Menu* meter_menu;
        void popup_meter_menu (GdkEventButton*);
 
@@ -174,12 +178,13 @@ class GainMeterBase : virtual public sigc::trackable
        bool dpi_changed;
        bool color_changed;
        void color_handler(bool);
+       bool _is_midi;
 };
 
 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,