From f41149628955fc8145bef6db0c110b71664c0a3a Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 21 Jul 2009 14:39:21 +0000
Subject: fix clicking when processors become active/inactive; reduce crazy
 2.5sec delay for quit dialog

git-svn-id: svn://localhost/ardour2/branches/3.0@5402 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/gain_meter.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'gtk2_ardour/gain_meter.h')

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 7feaf5c0e4..4ce13af0d6 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -47,6 +47,7 @@ namespace ARDOUR {
 	class Route;
 	class RouteGroup;
 	class PeakMeter;
+	class Amp;
 	class Automatable;
 }
 namespace Gtkmm2ext {
@@ -66,8 +67,7 @@ class GainMeterBase : virtual public sigc::trackable
 
 	virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
 				   boost::shared_ptr<ARDOUR::PeakMeter> meter,
-				   boost::shared_ptr<ARDOUR::AutomationControl> gain_control,
-				   boost::shared_ptr<ARDOUR::Automatable> gc_owner);
+				   boost::shared_ptr<ARDOUR::Amp> amp);
 
 	void update_gain_sensitive ();
 	void update_meters ();
@@ -89,7 +89,7 @@ class GainMeterBase : virtual public sigc::trackable
 	friend class MixerStrip;
 	boost::shared_ptr<ARDOUR::Route> _route;
 	boost::shared_ptr<ARDOUR::PeakMeter> _meter;
-	boost::shared_ptr<ARDOUR::AutomationControl> _gain_control;
+	boost::shared_ptr<ARDOUR::Amp> _amp;
 	ARDOUR::Session& _session;
 	std::vector<sigc::connection> connections;
 
@@ -184,8 +184,7 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
 
 	virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
 				   boost::shared_ptr<ARDOUR::PeakMeter> meter,
-				   boost::shared_ptr<ARDOUR::AutomationControl> gain_control,
-				   boost::shared_ptr<ARDOUR::Automatable> gc_owner);
+				   boost::shared_ptr<ARDOUR::Amp> amp);
 
 	int get_gm_width ();
 	void setup_meters (int len=0);
-- 
cgit v1.2.3