remove Diskstream from Track and derivatives; get ardour to actually startup

6 files changed, 8 insertions, 30 deletions

diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index 1dbe0cd81e..fc52c7e6f0 100644
--- a/libs/ardour/ardour/auditioner.h
+++ b/libs/ardour/ardour/auditioner.h
@@ -96,9 +96,6 @@ class LIBARDOUR_API Auditioner : public Track
 	int export_stuff (BufferSet&, framepos_t, framecnt_t, boost::shared_ptr<Processor>, bool, bool, bool)
 		{ return -1; }
 
-	boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &)
-		{ return boost::shared_ptr<Diskstream> (); }
-
   private:
 	boost::shared_ptr<AudioRegion> the_region;
 	boost::shared_ptr<MidiRegion> midi_region;
@@ -115,8 +112,6 @@ class LIBARDOUR_API Auditioner : public Track
 	bool _synth_changed;
 	bool _queue_panic;
 
-	boost::shared_ptr<Diskstream> _diskstream_audio;
-	boost::shared_ptr<Diskstream> _diskstream_midi;
 	boost::shared_ptr<Processor> asynth;
 
 	void drop_ports ();
diff --git a/libs/ardour/ardour/disk_io.h b/libs/ardour/ardour/disk_io.h
index c10dad54a1..54d4254a69 100644
--- a/libs/ardour/ardour/disk_io.h
+++ b/libs/ardour/ardour/disk_io.h
@@ -113,6 +113,8 @@ class LIBARDOUR_API DiskIOProcessor : public Processor
 
 	PBD::Signal1<void,DataType>   PlaylistChanged;
 
+	virtual void adjust_buffering() = 0;
+
   protected:
 	friend class Auditioner;
 	virtual int  seek (framepos_t which_sample, bool complete_refill = false) = 0;
diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h
index d0f3672cbd..4a5612fec9 100644
--- a/libs/ardour/ardour/disk_writer.h
+++ b/libs/ardour/ardour/disk_writer.h
@@ -131,6 +131,8 @@ class LIBARDOUR_API DiskWriter : public DiskIOProcessor
 	void transport_looped (framepos_t transport_frame);
 	void transport_stopped_wallclock (struct tm&, time_t, bool abort);
 
+	void adjust_buffering ();
+
   protected:
 	friend class Track;
 	int do_flush (RunContext context, bool force = false);
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index ea6e4e3636..0aff566b1c 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -48,9 +48,6 @@ public:
 	void realtime_locate ();
 	void non_realtime_locate (framepos_t);
 
-	boost::shared_ptr<Diskstream> create_diskstream ();
-	void set_diskstream (boost::shared_ptr<Diskstream>);
-
 	bool can_be_record_enabled ();
 	bool can_be_record_safe ();
 
@@ -150,20 +147,14 @@ private:
 	MidiChannelFilter          _playback_filter;
 	MidiChannelFilter          _capture_filter;
 
-	virtual boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &);
-
 	void write_out_of_band_data (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, framecnt_t nframes);
 
 	void set_state_part_two ();
 	void set_state_part_three ();
 
-
 	int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool state_changing);
 	void push_midi_input_to_step_edit_ringbuffer (framecnt_t nframes);
 
-	void diskstream_data_recorded (boost::weak_ptr<MidiSource>);
-	PBD::ScopedConnection _diskstream_data_recorded_connection;
-
 	void track_input_active (IOChange, void*);
 	void map_input_active (bool);
 
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 43f0c95d98..4c848ec366 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -115,7 +115,6 @@ class Butler;
 class Click;
 class ControllableDescriptor;
 class CoreSelection;
-class Diskstream;
 class ExportHandler;
 class ExportStatus;
 class Graph;
@@ -283,8 +282,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 
 	void refresh_disk_space ();
 
-	int load_diskstreams_2X (XMLNode const &, int);
-
 	int load_routes (const XMLNode&, int);
 	boost::shared_ptr<RouteList> get_routes() const {
 		return routes.reader ();
@@ -2036,9 +2033,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 	void rt_set_controls (boost::shared_ptr<ControlList>, double val, PBD::Controllable::GroupControlDisposition group_override);
 	void rt_clear_all_solo_state (boost::shared_ptr<RouteList>, bool yn, PBD::Controllable::GroupControlDisposition group_override);
 
-	/** temporary list of Diskstreams used only during load of 2.X sessions */
-	std::list<boost::shared_ptr<Diskstream> > _diskstreams_2X;
-
 	void set_session_range_location (framepos_t, framepos_t);
 
 	void setup_midi_machine_control ();
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 33c967f088..91e02b921e 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -26,7 +26,6 @@
 #include "ardour/interthread_info.h"
 #include "ardour/recordable.h"
 #include "ardour/route.h"
-#include "ardour/public_diskstream.h"
 
 namespace ARDOUR {
 
@@ -35,10 +34,10 @@ class Playlist;
 class RouteGroup;
 class Source;
 class Region;
-class Diskstream;
 class DiskReader;
 class DiskWriter;
 class IO;
+class Location;
 class MonitorControl;
 class RecordEnableControl;
 class RecordSafeControl;
@@ -50,7 +49,7 @@ class RecordSafeControl;
  * to be played from disk, and modifies that object during recording and
  * editing.
  */
-class LIBARDOUR_API Track : public Route, public Recordable, public PublicDiskstream
+class LIBARDOUR_API Track : public Route, public Recordable
 {
   public:
 	Track (Session&, std::string name, PresentationInfo::Flag f = PresentationInfo::Flag (0), TrackMode m = Normal, DataType default_type = DataType::AUDIO);
@@ -136,11 +135,8 @@ class LIBARDOUR_API Track : public Route, public Recordable, public PublicDiskst
 	bool can_be_record_enabled ();
 	bool can_be_record_safe ();
 
-	bool using_diskstream_id (PBD::ID) const;
-
 	void set_block_size (pframes_t);
 
-	/* PublicDiskstream interface */
 	boost::shared_ptr<Playlist> playlist ();
 	void request_input_monitoring (bool);
 	void ensure_input_monitoring (bool);
@@ -163,7 +159,7 @@ class LIBARDOUR_API Track : public Route, public Recordable, public PublicDiskst
 	void non_realtime_set_speed ();
 	int overwrite_existing_buffers ();
 	framecnt_t get_captured_frames (uint32_t n = 0) const;
-	int set_loop (Location *);
+	int set_loop (ARDOUR::Location *);
 	void transport_looped (framepos_t);
 	bool realtime_set_speed (double, bool);
 	void transport_stopped_wallclock (struct tm &, time_t, bool);
@@ -181,7 +177,7 @@ class LIBARDOUR_API Track : public Route, public Recordable, public PublicDiskst
 	void set_align_choice (AlignChoice, bool force=false);
 	void playlist_modified ();
 	int use_playlist (DataType, boost::shared_ptr<Playlist>);
-	int find_and_use_playlist (DataType, std::string const & name);
+	int find_and_use_playlist (DataType, PBD::ID const &);
 	int use_copy_playlist ();
 	int use_new_playlist ();
 	void adjust_playback_buffering ();
@@ -195,8 +191,6 @@ class LIBARDOUR_API Track : public Route, public Recordable, public PublicDiskst
   protected:
 	XMLNode& state (bool full);
 
-	boost::shared_ptr<Diskstream> _diskstream;
-
 	boost::shared_ptr<DiskReader> _disk_reader;
 	boost::shared_ptr<DiskWriter> _disk_writer;
 	boost::shared_ptr<Playlist>   _playlists[DataType::num_types];