X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.h;h=2513e4d2678618716bb9a3af7ddf6d14200afe6f;hb=c862d320ffccf739785e4b9aa59d7842e6f50ace;hp=448e0239fe42065817c374667377600c2a2e0289;hpb=12c97285305fba9c0edf2297128e978b0f2ccd67;p=ardour.git

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 448e0239fe..2513e4d267 100644
--- 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,10 +62,10 @@ 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,
+	GainMeterBase (ARDOUR::Session*, const Glib::RefPtr<Gdk::Pixbuf>& pix,
 		       bool horizontal, int);
 	virtual ~GainMeterBase ();
 
@@ -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;
@@ -180,7 +184,7 @@ class GainMeterBase : virtual public sigc::trackable
 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,