move disk_{writer,reader} into Route to allow for simple, sensible implementation of DiskIOPoint

1 files changed, 9 insertions, 2 deletions

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 2590be291b..dc693d3a7e 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -66,6 +66,8 @@ namespace ARDOUR {
 class Amp;
 class DelayLine;
 class Delivery;
+class DiskReader;
+class DiskWriter;
 class IOProcessor;
 class Panner;
 class PannerShell;
@@ -186,6 +188,9 @@ public:
 	void         set_meter_type (MeterType t) { _meter_type = t; }
 	MeterType    meter_type() const { return _meter_type; }
 
+	void set_disk_io_point (DiskIOPoint);
+	DiskIOPoint disk_io_point() const { return _disk_io_point; }
+
 	/* Processors */
 
 	boost::shared_ptr<Amp> amp() const  { return _amp; }
@@ -635,6 +640,10 @@ public:
 	boost::shared_ptr<InternalReturn> _intreturn;
 	boost::shared_ptr<MonitorProcessor> _monitor_control;
 	boost::shared_ptr<Pannable> _pannable;
+	boost::shared_ptr<DiskReader> _disk_reader;
+	boost::shared_ptr<DiskWriter> _disk_writer;
+
+	DiskIOPoint    _disk_io_point;
 
 	enum {
 		EmitNone = 0x00,
@@ -740,8 +749,6 @@ private:
 	framecnt_t update_port_latencies (PortSet& ports, PortSet& feeders, bool playback, framecnt_t) const;
 
 	void setup_invisible_processors ();
-	virtual void setup_invisible_processors_oh_children_of_mine (ProcessorList&) {}
-	virtual void add_processors_oh_children_of_mine () {}
 
 	void unpan ();