X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fdelivery.h;h=c920fadc2cf69a90418d18e2186f087e025742c4;hb=f25d9b122046d9ccf81108afc2fb466a32f9cbcc;hp=7a5931c5fb68551b4392a49ea1e3b6cf18074c6d;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index 7a5931c5fb..c920fadc2c 100644
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -53,12 +53,11 @@ public:
 	/* Delivery to an existing output */
 
 	Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<MuteMaster> mm, const std::string& name, Role);
-	Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<MuteMaster> mm, const XMLNode&);
 
 	/* Delivery to a new output owned by this object */
 
 	Delivery (Session& s, boost::shared_ptr<MuteMaster> mm, const std::string& name, Role);
-	Delivery (Session&, boost::shared_ptr<MuteMaster> mm, const XMLNode&);
+	~Delivery ();
 
 	bool set_name (const std::string& name);
 	std::string display_name() const;
@@ -67,27 +66,21 @@ public:
 	bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
 	bool configure_io (ChanCount in, ChanCount out);
 
-	void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool);
+	void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, nframes_t nframes, bool);
 
 	/* supplemental method used with MIDI */
 
-	void flush (nframes_t nframes, nframes64_t time);
-	void transport_stopped ();
-
+	void flush_buffers (nframes_t nframes, framepos_t time);
 	void no_outs_cuz_we_no_monitor(bool);
-
-	void set_solo_level (int32_t sl) { _solo_level = sl; }
-	void set_solo_isolated (bool yn) { _solo_isolated = yn; }
-
 	void cycle_start (nframes_t);
 	void increment_output_offset (nframes_t);
-	void transport_stopped (sframes_t frame);
+	void transport_stopped (framepos_t frame);
 
 	BufferSet& output_buffers() { return *_output_buffers; }
 
-	boost::signals2::signal<void()> MuteChange;
+	PBD::Signal0<void> MuteChange;
 
-	static boost::signals2::signal<void(nframes_t)> CycleStart;
+	static PBD::Signal1<void,nframes_t> CycleStart;
 
 	XMLNode& state (bool full);
 	int set_state (const XMLNode&, int version);
@@ -104,8 +97,8 @@ public:
 	void allow_pan_reset ();
 
 	uint32_t pans_required() const { return _configured_input.n_audio(); }
-	void start_pan_touch (uint32_t which);
-	void end_pan_touch (uint32_t which);
+	void start_pan_touch (uint32_t which, double when);
+	void end_pan_touch (uint32_t which, bool mark, double when);
 
   protected:
 	Role        _role;
@@ -113,17 +106,15 @@ public:
 	gain_t      _current_gain;
 	nframes_t   _output_offset;
 	bool        _no_outs_cuz_we_no_monitor;
-	uint32_t    _solo_level;
-	bool        _solo_isolated;
 	boost::shared_ptr<MuteMaster> _mute_master;
 	bool         no_panner_reset;
 	boost::shared_ptr<Panner> _panner;
 
 	static bool panners_legal;
-	static boost::signals2::signal<int()>            PannersLegal;
+	static PBD::Signal0<int>            PannersLegal;
 
 	int panners_became_legal ();
-	boost::signals2::scoped_connection panner_legal_c;
+	PBD::ScopedConnection panner_legal_c;
 	void output_changed (IOChange, void*);
 
 	gain_t target_gain ();