X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Famp.h;h=20a07c092a3f63f58408a4c528d2b6cb353ce6d5;hb=36ec551a8ad66a99723f54d3149cbcf30d31c077;hp=7cde8531550a3352bfe62efa59a657acf81d239c;hpb=8d3a8ca9136c3fb8a8bd24dd5d99c8e2e76699bd;p=ardour.git

diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h
index 7cde853155..20a07c092a 100644
--- a/libs/ardour/ardour/amp.h
+++ b/libs/ardour/ardour/amp.h
@@ -29,6 +29,7 @@
 namespace ARDOUR {
 
 class BufferSet;
+class GainControl;
 class IO;
 
 /** Applies a declick operation to all audio inputs, passing the same number of
@@ -36,10 +37,10 @@ class IO;
  */
 class LIBARDOUR_API Amp : public Processor {
 public:
-	Amp(Session& s, std::string type = "amp");
+	Amp(Session& s, const std::string& display_name, boost::shared_ptr<GainControl> control, bool control_midi_also);
 
-	std::string display_name() const;
-	std::string type() const { return _type;}
+	std::string display_name () const { return _display_name; }
+	void set_display_name (const std::string& name) { _display_name = name; }
 
 	bool visible () const;
 
@@ -68,42 +69,8 @@ public:
 	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);
-
-			lower_db = accurate_coefficient_to_dB (_desc.lower);
-			range_db = accurate_coefficient_to_dB (_desc.upper) - lower_db;
-		}
-
-		void set_value (double val);
-		void set_value_unchecked (double);
-
-		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;
-		double lower_db;
-		double range_db;
-	};
-
 	boost::shared_ptr<GainControl> gain_control() {
 		return _gain_control;
 	}
@@ -121,11 +88,12 @@ private:
 	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;
-	std::string _type;
 	bool _midi_amp;
 };