X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Famp.h;h=820e2a85e1e9e80f1ce4468900f8a278e0d8e463;hb=299709cbbc26b2c0e0328dce4e12b4d5fdce8b21;hp=54bd9defe240c9a43af4afa94ab72fd4a21f6f6b;hpb=74933f58659051f6d4ef52d1103b2b7ba4643883;p=ardour.git

diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h
index 54bd9defe2..820e2a85e1 100644
--- a/libs/ardour/ardour/amp.h
+++ b/libs/ardour/ardour/amp.h
@@ -19,6 +19,8 @@
 #ifndef __ardour_amp_h__
 #define __ardour_amp_h__
 
+#include "ardour/dB.h"
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 #include "ardour/chan_count.h"
 #include "ardour/processor.h"
@@ -27,29 +29,32 @@
 namespace ARDOUR {
 
 class BufferSet;
+class GainControl;
 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 {
+class LIBARDOUR_API Amp : public Processor {
 public:
-	Amp(Session& s, boost::shared_ptr<MuteMaster> m);
+	Amp(Session& s, const std::string& display_name, boost::shared_ptr<GainControl> control, bool control_midi_also);
 
-	std::string display_name() const;
+	std::string display_name () const { return _display_name; }
+	void set_display_name (const std::string& name) { _display_name = name; }
 
 	bool visible () const;
 
-	bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
+	bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
 	bool configure_io (ChanCount in, ChanCount out);
 
-	void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool);
+	void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool);
 
-	bool apply_gain() const  { return _apply_gain; }
-	void apply_gain(bool yn) { _apply_gain = yn; }
+	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 set_gain_automation_buffer (gain_t *);
+
+	void setup_gain_automation (framepos_t start_frame, framepos_t end_frame, framecnt_t nframes);
 
 	bool apply_gain_automation() const  { return _apply_gain_automation; }
 	void apply_gain_automation(bool yn) { _apply_gain_automation = yn; }
@@ -57,32 +62,15 @@ public:
 	XMLNode& state (bool full);
 	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);
-
-	gain_t         gain () const { return _gain_control->user_float(); }
+	static gain_t apply_gain (BufferSet& bufs, framecnt_t sample_rate, framecnt_t nframes, gain_t initial, gain_t target, bool midi_amp = true);
+	static void apply_simple_gain(BufferSet& bufs, framecnt_t nframes, gain_t target, bool midi_amp = true);
 
-	virtual void   set_gain (gain_t g, void *src);
-	void           inc_gain (gain_t delta, void *src);
+	static gain_t apply_gain (AudioBuffer& buf, framecnt_t sample_rate, framecnt_t nframes, gain_t initial, gain_t target);
+	static void apply_simple_gain(AudioBuffer& buf, framecnt_t nframes, gain_t target);
 
+	static void declick (BufferSet& bufs, framecnt_t nframes, int dir);
 	static void update_meters();
 
-	/* automation */
-
-	struct GainControl : public AutomationControl {
-		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) {
-			set_flags (Controllable::Flag (flags() | Controllable::GainLike));
-		}
-
-		void set_value (float val);
-		float get_value (void) const;
-
-		Amp* _amp;
-	};
-
 	boost::shared_ptr<GainControl> gain_control() {
 		return _gain_control;
 	}
@@ -91,14 +79,22 @@ public:
 		return _gain_control;
 	}
 
+	std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
+
 private:
 	bool   _denormal_protection;
 	bool   _apply_gain;
 	bool   _apply_gain_automation;
 	float  _current_gain;
+	framepos_t _current_automation_frame;
+
+	std::string _display_name;
 
 	boost::shared_ptr<GainControl> _gain_control;
-	boost::shared_ptr<MuteMaster>  _mute_master;
+
+	/** Buffer that we should use for gain automation */
+	gain_t* _gain_automation_buffer;
+	bool _midi_amp;
 };