X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsend.h;h=c37055cd9465a0a1bd6efb7697ac882afec888ec;hb=21102b45d0d22f2761697b1b9fdfa92aafc25834;hp=002397f0cd139ac3500ee9a2f636f0c854982272;hpb=48ea6beaad840778c6c5a527d69bb390640eb27d;p=ardour.git

diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index 002397f0cd..c37055cd94 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -26,17 +26,17 @@
 
 #include "ardour/ardour.h"
 #include "ardour/delivery.h"
-#include "ardour/delayline.h"
 
 namespace ARDOUR {
 
 class PeakMeter;
 class Amp;
 class GainControl;
+class DelayLine;
 
 class LIBARDOUR_API Send : public Delivery
 {
-  public:
+public:
 	Send (Session&, boost::shared_ptr<Pannable> pannable, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send, bool ignore_bitslot = false);
 	virtual ~Send ();
 
@@ -51,8 +51,6 @@ class LIBARDOUR_API Send : public Delivery
 	bool metering() const { return _metering; }
 	void set_metering (bool yn) { _metering = yn; }
 
-	XMLNode& state (bool full);
-	XMLNode& get_state ();
 	int set_state(const XMLNode&, int version);
 
 	PBD::Signal0<void> SelfDestruct;
@@ -61,16 +59,19 @@ class LIBARDOUR_API Send : public Delivery
 
 	uint32_t pans_required() const { return _configured_input.n_audio(); }
 
-	void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool);
+	void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool);
 
 	bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
 	bool configure_io (ChanCount in, ChanCount out);
 
 	/* latency compensation */
-	void set_delay_in (framecnt_t);
-	void set_delay_out (framecnt_t);
-	framecnt_t get_delay_in () const { return _delay_in; }
-	framecnt_t get_delay_out () const { return _delay_out; }
+	void set_delay_in (samplecnt_t); // should only be called by Route::update_signal_latency
+	void set_delay_out (samplecnt_t);  // should only be called by InternalReturn::set_playback_offset (via Route::update_signal_latency)
+	samplecnt_t get_delay_in () const { return _delay_in; }
+	samplecnt_t get_delay_out () const { return _delay_out; }
+	samplecnt_t signal_latency () const;
+
+	static PBD::Signal0<void> ChangedLatency;
 
 	void activate ();
 	void deactivate ();
@@ -80,25 +81,31 @@ class LIBARDOUR_API Send : public Delivery
 	static uint32_t how_many_sends();
 	static std::string name_and_id_new_send (Session&, Delivery::Role r, uint32_t&, bool);
 
-  protected:
+protected:
+	XMLNode& state ();
+
 	bool _metering;
 	boost::shared_ptr<GainControl> _gain_control;
 	boost::shared_ptr<Amp> _amp;
 	boost::shared_ptr<PeakMeter> _meter;
-	boost::shared_ptr<DelayLine> _delayline;
+	boost::shared_ptr<DelayLine> _send_delay;
+	boost::shared_ptr<DelayLine> _thru_delay;
 
-  private:
+private:
 	/* disallow copy construction */
 	Send (const Send&);
+
 	void panshell_changed ();
 	void snd_output_changed (IOChange, void*);
 
+	void update_delaylines ();
+
 	int set_state_2X (XMLNode const &, int);
 
 	uint32_t  _bitslot;
 
-	framecnt_t _delay_in;
-	framecnt_t _delay_out;
+	samplecnt_t _delay_in;
+	samplecnt_t _delay_out;
 	bool       _remove_on_disconnect;
 };