X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Famp.h;h=0ec493e8ced7be49245640fd7b7cc986af73aa06;hb=f25d9b122046d9ccf81108afc2fb466a32f9cbcc;hp=3cd1bf13ddc57aae1f81437edf0fe9eb75631e16;hpb=79f91c7a205d981d2b8cc15e32a6da02d8423065;p=ardour.git

diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h
index 3cd1bf13dd..0ec493e8ce 100644
--- a/libs/ardour/ardour/amp.h
+++ b/libs/ardour/ardour/amp.h
@@ -28,14 +28,13 @@ namespace ARDOUR {
 
 class BufferSet;
 class IO;
-class MuteMaster;
 
 /** Applies a declick operation to all audio inputs, passing the same number of
  * audio outputs, and passing through any other types unchanged.
  */
 class Amp : public Processor {
 public:
-	Amp(Session& s, boost::shared_ptr<MuteMaster> m);
+	Amp(Session& s);
 
 	std::string display_name() const;
 
@@ -44,23 +43,28 @@ public:
 	bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
 	bool configure_io (ChanCount in, ChanCount out);
 
-	void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+	void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, nframes_t nframes, bool);
 
 	bool apply_gain() const  { return _apply_gain; }
 	void apply_gain(bool yn) { _apply_gain = yn; }
 
-	void setup_gain_automation (sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+	void setup_gain_automation (framepos_t start_frame, framepos_t end_frame, nframes_t nframes);
 
 	bool apply_gain_automation() const  { return _apply_gain_automation; }
 	void apply_gain_automation(bool yn) { _apply_gain_automation = yn; }
 
 	XMLNode& state (bool full);
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	static void apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t target);
 	static void apply_simple_gain(BufferSet& bufs, nframes_t nframes, gain_t target);
+        
+        static void apply_gain (AudioBuffer& buf, nframes_t nframes, gain_t initial, gain_t target);
+	static void apply_simple_gain(AudioBuffer& buf, nframes_t nframes, gain_t target);
 
-	gain_t         gain () const { return _gain_control->user_float(); }
+	static void declick (BufferSet& bufs, nframes_t nframes, int dir);
+
+	gain_t         gain () const { return _gain_control->user_double(); }
 
 	virtual void   set_gain (gain_t g, void *src);
 	void           inc_gain (gain_t delta, void *src);
@@ -73,11 +77,12 @@ public:
 		GainControl (std::string name, Session& session, Amp* a, const Evoral::Parameter &param,
 				boost::shared_ptr<AutomationList> al = boost::shared_ptr<AutomationList>() )
 			: AutomationControl (session, param, al, name)
-			, _amp (a)
-		{}
+			, _amp (a) {
+			set_flags (Controllable::Flag (flags() | Controllable::GainLike));
+		}
 
-		void set_value (float val);
-		float get_value (void) const;
+		void set_value (double val);
+		double get_value (void) const;
 
 		Amp* _amp;
 	};
@@ -97,7 +102,6 @@ private:
 	float  _current_gain;
 
 	boost::shared_ptr<GainControl> _gain_control;
-	boost::shared_ptr<MuteMaster>  _mute_master;
 };