X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fdelivery.h;h=451d7bdd0ceb8635007020c2b3e62d0240b6706f;hb=67ba0bd992920032cc645cb2954084f54fa59b2f;hp=e19eef719fca280f7e2b0d5d75306ce244eee7b8;hpb=c0e6f8e4c324c3f44613949b59acd9e864ab263d;p=ardour.git

diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index e19eef719f..451d7bdd0c 100644
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -71,20 +71,19 @@ public:
 	bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
 	bool configure_io (ChanCount in, ChanCount out);
 
-	void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool);
+	void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool);
 
 	/* supplemental method used with MIDI */
 
-	void flush_buffers (framecnt_t nframes);
+	void flush_buffers (samplecnt_t nframes);
 	void no_outs_cuz_we_no_monitor(bool);
-	void transport_stopped (framepos_t frame);
+	void non_realtime_transport_stop (samplepos_t now, bool flush);
 	void realtime_locate ();
 
 	BufferSet& output_buffers() { return *_output_buffers; }
 
 	PBD::Signal0<void> MuteChange;
 
-	XMLNode& state (bool full);
 	int set_state (const XMLNode&, int version);
 
 	/* Panning */
@@ -103,7 +102,9 @@ public:
 	uint32_t pans_required() const { return _configured_input.n_audio(); }
 	virtual uint32_t pan_outs() const;
 
-  protected:
+protected:
+	XMLNode& state ();
+
 	Role        _role;
 	BufferSet*  _output_buffers;
 	gain_t      _current_gain;
@@ -111,10 +112,10 @@ public:
 
 	gain_t target_gain ();
 
-  private:
+private:
 	bool        _no_outs_cuz_we_no_monitor;
 	boost::shared_ptr<MuteMaster> _mute_master;
-	
+
 	static bool panners_legal;
 	static PBD::Signal0<void> PannersLegal;