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

diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index ec808a9820..c920fadc2c 100644
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -66,18 +66,15 @@ 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_buffers (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 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; }
 
@@ -100,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;