X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Famp.h;h=35f084d04cdc28f280b1503eaa3eb1ebd66c52c3;hb=da9b82732eed632d8b940818382f7eb369100964;hp=011fef13c0a7a03e530af9388d3832185c6a3139;hpb=7b6b75f38ff6b34de3f70e36045498f227c1727d;p=ardour.git

diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h
index 011fef13c0..35f084d04c 100644
--- a/libs/ardour/ardour/amp.h
+++ b/libs/ardour/ardour/amp.h
@@ -43,12 +43,12 @@ public:
 	bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
 	bool configure_io (ChanCount in, ChanCount out);
 
-	void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, nframes_t nframes, bool);
+	void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, 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 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; }
@@ -56,17 +56,17 @@ 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);
-        
-        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 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 void declick (BufferSet& bufs, nframes_t nframes, int dir);
+	static void apply_gain (AudioBuffer& buf, framecnt_t nframes, gain_t initial, gain_t target);
+	static void apply_simple_gain(AudioBuffer& buf, framecnt_t nframes, gain_t target);
 
-	gain_t         gain () const { return _gain_control->user_double(); }
+	static void declick (BufferSet& bufs, framecnt_t nframes, int dir);
 
-	virtual void   set_gain (gain_t g, void *src);
+	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();