X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Famp.h;h=a85963babebcb04b028879aeab91ac204acdaa25;hb=da5119583aca2caec4082e3d13cfb1f687a5989d;hp=5408c86bff0de30731bf1845d81ca393f406f5cc;hpb=24727e65befc310f24196d11a56ec7b269977c16;p=ardour.git

diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h
index 5408c86bff..a85963babe 100644
--- a/libs/ardour/ardour/amp.h
+++ b/libs/ardour/ardour/amp.h
@@ -19,6 +19,7 @@
 #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"
@@ -28,6 +29,7 @@
 namespace ARDOUR {
 
 class BufferSet;
+class GainControl;
 class IO;
 
 /** Applies a declick operation to all audio inputs, passing the same number of
@@ -35,9 +37,10 @@ class IO;
  */
 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;
 
@@ -59,43 +62,15 @@ public:
 	XMLNode& state (bool full);
 	int set_state (const XMLNode&, int version);
 
-	static void apply_gain (BufferSet& bufs, framecnt_t nframes, gain_t initial, gain_t target);
-	static void apply_simple_gain(BufferSet& bufs, framecnt_t nframes, gain_t target);
+	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);
 
-	static void apply_gain (AudioBuffer& buf, framecnt_t nframes, gain_t initial, gain_t target);
+	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);
-
-	gain_t         gain () const { return _gain_control->get_value(); }
-
-	void           set_gain (gain_t g, void *src);
-	void           inc_gain (gain_t delta, void *src);
-
 	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, ParameterDescriptor(param), al, name)
-			, _amp (a) {
-			set_flags (Controllable::Flag (flags() | Controllable::GainLike));
-			alist()->reset_default (1.0);
-		}
-
-		void set_value (double val);
-
-		double internal_to_interface (double) const;
-		double interface_to_internal (double) const;
-		double internal_to_user (double) const;
-		double user_to_internal (double) const;
-		std::string get_user_string () const;
-
-		Amp* _amp;
-	};
-
 	boost::shared_ptr<GainControl> gain_control() {
 		return _gain_control;
 	}
@@ -104,18 +79,22 @@ public:
 		return _gain_control;
 	}
 
-	std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
+	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;
 
 	/** Buffer that we should use for gain automation */
 	gain_t* _gain_automation_buffer;
+	bool _midi_amp;
 };