X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Famp.h;h=36b54646923eab4307aa71483a9413a396d98107;hb=e5a181c323243a03338f5a9934a5df254986370d;hp=52aceaf85fe0a5294098abfe9e8d171a38aef71e;hpb=ece5093234e4c185cf536d2b4e5edfeb90622409;p=ardour.git

diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h
index 52aceaf85f..36b5464692 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,65 +29,36 @@
 namespace ARDOUR {
 
 class BufferSet;
+class GainControl;
 class IO;
 
-/** 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 {
+/** Gain Stage (Fader, Trim).  */
+class LIBARDOUR_API Amp : public Processor {
 public:
-	Amp(Session& s);
+	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, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool);
 
-	bool apply_gain() const  { return _apply_gain; }
-	void apply_gain(bool yn) { _apply_gain = yn; }
+	void set_gain_automation_buffer (gain_t *);
 
-	void setup_gain_automation (sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+	void setup_gain_automation (samplepos_t start_sample, samplepos_t end_sample, samplecnt_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);
+	XMLNode& state ();
 	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);
-
-	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);
-
-	static void update_meters();
+	static gain_t apply_gain (BufferSet& bufs, samplecnt_t sample_rate, samplecnt_t nframes, gain_t initial, gain_t target, bool midi_amp = true);
+	static void apply_simple_gain(BufferSet& bufs, samplecnt_t nframes, gain_t target, bool midi_amp = true);
 
-	/* 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 (double val);
-		double get_value (void) const;
-
-		Amp* _amp;
-	};
+	static gain_t apply_gain (AudioBuffer& buf, samplecnt_t sample_rate, samplecnt_t nframes, gain_t initial, gain_t target, sampleoffset_t offset = 0);
+	static void apply_simple_gain (AudioBuffer& buf, samplecnt_t nframes, gain_t target, sampleoffset_t offset = 0);
 
 	boost::shared_ptr<GainControl> gain_control() {
 		return _gain_control;
@@ -97,11 +70,17 @@ public:
 
 private:
 	bool   _denormal_protection;
-	bool   _apply_gain;
 	bool   _apply_gain_automation;
 	float  _current_gain;
+	samplepos_t _current_automation_sample;
+
+	std::string _display_name;
 
 	boost::shared_ptr<GainControl> _gain_control;
+
+	/** Buffer that we should use for gain automation */
+	gain_t* _gain_automation_buffer;
+	bool _midi_amp;
 };