get diskreader working, and remove per-track varispeed API and mechanism

5 files changed, 6 insertions, 6 deletions

diff --git a/libs/ardour/ardour/disk_io.h b/libs/ardour/ardour/disk_io.h
index 54d4254a69..47b02582a1 100644
--- a/libs/ardour/ardour/disk_io.h
+++ b/libs/ardour/ardour/disk_io.h
@@ -78,7 +78,6 @@ class LIBARDOUR_API DiskIOProcessor : public Processor
 	bool           recordable()  const { return _flags & Recordable; }
 	bool           non_layered()  const { return _flags & NonLayered; }
 	bool           reversed()    const { return _actual_speed < 0.0f; }
-	double         speed()       const { return _visible_speed; }
 
 	virtual void non_realtime_locate (framepos_t);
 
@@ -122,9 +121,7 @@ class LIBARDOUR_API DiskIOProcessor : public Processor
   protected:
 	Flag         _flags;
 	uint32_t      i_am_the_modifier;
-	double       _visible_speed;
 	double       _actual_speed;
-	double       _speed;
 	double       _target_speed;
 	/* items needed for speed change logic */
 	bool         _buffer_reallocation_required;
diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h
index 4a5612fec9..62e18bff9d 100644
--- a/libs/ardour/ardour/disk_writer.h
+++ b/libs/ardour/ardour/disk_writer.h
@@ -48,6 +48,7 @@ class LIBARDOUR_API DiskWriter : public DiskIOProcessor
 
 	void run (BufferSet& /*bufs*/, framepos_t /*start_frame*/, framepos_t /*end_frame*/, double speed, pframes_t /*nframes*/, bool /*result_required*/);
 	void non_realtime_locate (framepos_t);
+	void realtime_handle_transport_stopped ();
 
 	virtual XMLNode& state (bool full);
 	int set_state (const XMLNode&, int version);
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index 0aff566b1c..f08af83aaa 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -44,7 +44,6 @@ public:
 
 	int roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& need_butler);
 
-	void realtime_handle_transport_stopped ();
 	void realtime_locate ();
 	void non_realtime_locate (framepos_t);
 
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 619e79fafc..d7f1ebe8a9 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -388,7 +388,8 @@ public:
 	virtual XMLNode& get_template();
 
 	XMLNode& get_processor_state ();
-	virtual void set_processor_state (const XMLNode&);
+	void set_processor_state (const XMLNode&);
+	virtual bool set_processor_state (XMLNode const & node, XMLProperty const* prop, ProcessorList& new_order, bool& must_configure);
 
 	boost::weak_ptr<Route> weakroute ();
 
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index d7b6324808..103def7041 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -67,6 +67,8 @@ class LIBARDOUR_API Track : public Route, public Recordable
 	MonitorState monitoring_state () const;
 	MeterState metering_state () const;
 
+	bool set_processor_state (XMLNode const & node, XMLProperty const* prop, ProcessorList& new_order, bool& must_configure);
+
 	virtual int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 	                     bool state_changing);
 
@@ -155,6 +157,7 @@ class LIBARDOUR_API Track : public Route, public Recordable
 	int can_internal_playback_seek (framecnt_t);
 	int internal_playback_seek (framecnt_t);
 	void non_realtime_locate (framepos_t);
+	void realtime_handle_transport_stopped ();
 	void non_realtime_set_speed ();
 	int overwrite_existing_buffers ();
 	framecnt_t get_captured_frames (uint32_t n = 0) const;
@@ -163,7 +166,6 @@ class LIBARDOUR_API Track : public Route, public Recordable
 	bool realtime_set_speed (double, bool);
 	void transport_stopped_wallclock (struct tm &, time_t, bool);
 	bool pending_overwrite () const;
-	double speed () const;
 	void prepare_to_stop (framepos_t, framepos_t);
 	void set_slaved (bool);
 	ChanCount n_channels ();