X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fauditioner.h;h=ffc0ddb331a7edef3aee805f05d4e9818d61f712;hb=a7431e21db0cfd570eb77cec021e7ef1d1e7115d;hp=452f7eb2462ba6e856d152f85b3739863f3f5157;hpb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;p=ardour.git

diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index 452f7eb246..ffc0ddb331 100644
--- a/libs/ardour/ardour/auditioner.h
+++ b/libs/ardour/ardour/auditioner.h
@@ -25,17 +25,16 @@
 #include <glibmm/threads.h>
 
 #include "ardour/ardour.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_region.h"
-
-#include "ardour/audio_diskstream.h"
-#include "ardour/midi_diskstream.h"
+#include "ardour/track.h"
 
 namespace ARDOUR {
 
 class Session;
+class AudioDiskstream;
 class AudioRegion;
 class AudioPlaylist;
+class MidiDiskstream;
+class MidiRegion;
 
 class LIBARDOUR_API Auditioner : public Track
 {
@@ -51,8 +50,6 @@ class LIBARDOUR_API Auditioner : public Track
 	void seek_to_frame (frameoffset_t pos) { if (_seek_frame < 0 && !_seeking) { _seek_frame = pos; }}
 	void seek_to_percent (float const pos) { if (_seek_frame < 0 && !_seeking) { _seek_frame = floorf(length * pos / 100.0); }}
 
-	ARDOUR::AudioPlaylist& prepare_playlist ();
-
 	int play_audition (framecnt_t nframes);
 
 	MonitorState monitoring_state () const;
@@ -81,9 +78,6 @@ class LIBARDOUR_API Auditioner : public Track
 	int roll_audio (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& need_butler);
 	int roll_midi (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& need_butler);
 
-	boost::shared_ptr<Diskstream> create_diskstream ();
-	void set_diskstream (boost::shared_ptr<Diskstream> ds);
-
 	/* fake track */
 	void set_state_part_two () {}
 	int set_state (const XMLNode&, int) { return 0; }
@@ -100,16 +94,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> (); }
-
-	boost::shared_ptr<AudioDiskstream> audio_diskstream() const
-		{ return boost::dynamic_pointer_cast<AudioDiskstream> (_diskstream); }
-
-	boost::shared_ptr<MidiDiskstream> midi_diskstream() const
-		{ return boost::dynamic_pointer_cast<MidiDiskstream> (_diskstream); }
-
-
   private:
 	boost::shared_ptr<AudioRegion> the_region;
 	boost::shared_ptr<MidiRegion> midi_region;
@@ -126,8 +110,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 ();