X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Freturn.h;h=0dbf5eb1d38151f27a6efdf0abb86479902c3ff4;hb=8a4518d76fe78e5fb99900ff5ff71a22e5912395;hp=cf709ed2f2733d385c7f9537d61ef583e54da9db;hpb=ede4ecbb00ecc866c502454c81e711baea780ccd;p=ardour.git

diff --git a/libs/ardour/ardour/return.h b/libs/ardour/ardour/return.h
index cf709ed2f2..0dbf5eb1d3 100644
--- a/libs/ardour/ardour/return.h
+++ b/libs/ardour/ardour/return.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2009 Paul Davis
-    Author: Dave Robillard
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,15 +26,15 @@
 
 #include "pbd/stateful.h"
 #include "ardour/ardour.h"
-#include "ardour/audioengine.h"
 #include "ardour/io_processor.h"
 
 namespace ARDOUR {
 
 class Amp;
 class PeakMeter;
+class GainControl;
 
-class Return : public IOProcessor
+class LIBARDOUR_API Return : public IOProcessor
 {
 public:
 	Return (Session&, bool internal = false);
@@ -42,28 +42,30 @@ public:
 
 	uint32_t bit_slot() const { return _bitslot; }
 
-	void run (BufferSet& bufs, framepos_t start_frame, framepos_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);
 
 	boost::shared_ptr<Amp> amp() const { return _amp; }
 	boost::shared_ptr<PeakMeter> meter() const { return _meter; }
+	boost::shared_ptr<GainControl> gain_control() const { return _gain_control; }
 
 	bool metering() const { return _metering; }
 	void set_metering (bool yn) { _metering = yn; }
 
-	XMLNode& state(bool full);
-	XMLNode& get_state(void);
 	int      set_state(const XMLNode&, int version);
 
 	uint32_t pans_required() const { return _configured_input.n_audio(); }
 
-	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);
 
 	static uint32_t how_many_returns();
-	static void make_unique (XMLNode &, Session &);
+	static std::string name_and_id_new_return (Session&, uint32_t&);
+
+protected:
+	XMLNode& state();
 
-  protected:
 	bool _metering;
+	boost::shared_ptr<GainControl> _gain_control;
 	boost::shared_ptr<Amp> _amp;
 	boost::shared_ptr<PeakMeter> _meter;
 
@@ -71,10 +73,9 @@ private:
 	/* disallow copy construction */
 	Return (const Return&);
 
-	uint32_t  _bitslot;
+	uint32_t _bitslot;
 
-	void collect_input  (BufferSet& bufs, nframes_t nframes, ChanCount offset=ChanCount::ZERO);
-	void just_meter_input (framepos_t start_frame, framepos_t end_frame, nframes_t nframes);
+	void collect_input (BufferSet& bufs, pframes_t nframes, ChanCount offset = ChanCount::ZERO);
 };
 
 } // namespace ARDOUR