X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Fsend.h;h=bfe8dda18bd8ac8ac243cca63dc9f77a84602f47;hb=84272b4e27e537bf2c38c9cd25675c61addea40a;hp=c0111936e5eeacde69dc4f1bca8abbc1b9581600;hpb=ddd4e3cf1d9e253f638719ca0664a0598383e857;p=ardour.git

diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index c0111936e5..bfe8dda18b 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -36,13 +36,14 @@ 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 ();
 
 	uint32_t bit_slot() const { return _bitslot; }
 
 	bool display_to_user() const;
+	bool is_foldback () const { return _role == Foldback; }
 
 	boost::shared_ptr<Amp> amp() const { return _amp; }
 	boost::shared_ptr<PeakMeter> meter() const { return _meter; }
@@ -51,8 +52,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;
@@ -67,11 +66,13 @@ class LIBARDOUR_API Send : public Delivery
 	bool configure_io (ChanCount in, ChanCount out);
 
 	/* latency compensation */
-	void set_output_latency (samplecnt_t cnt);
-	void set_delay_in (samplecnt_t);
-	void set_delay_out (samplecnt_t);
+	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 ();
@@ -81,26 +82,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*);
 
-	int set_state_2X (XMLNode const &, int);
+	void update_delaylines ();
 
-	uint32_t  _bitslot;
+	int set_state_2X (XMLNode const &, int);
 
+	uint32_t    _bitslot;
 	samplecnt_t _delay_in;
 	samplecnt_t _delay_out;
-	bool       _remove_on_disconnect;
+	bool        _remove_on_disconnect;
 };
 
 } // namespace ARDOUR