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

[ardour.git] / libs / ardour / ardour / auditioner.h

diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index 94d4eab4796025432e1f3e432352b48c2aa7a680..fc52c7e6f068ef90f514895615f344cd69118f1d 100644 (file)
--- 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
 {
@@ -81,9 +80,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; }
@@ -97,19 +93,9 @@ class LIBARDOUR_API Auditioner : public Track
        boost::shared_ptr<Region> bounce_range (framepos_t, framepos_t, InterThreadInfo&, boost::shared_ptr<Processor>, bool)
                { return boost::shared_ptr<Region> (); }
 
-       int export_stuff (BufferSet&, framepos_t, framecnt_t, boost::shared_ptr<Processor>, bool, bool)
+       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 +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 ();
@@ -136,6 +120,7 @@ class LIBARDOUR_API Auditioner : public Track
        static void *_drop_ports (void *);
        void actually_drop_ports ();
        void output_changed (IOChange, void*);
+       frameoffset_t _import_position;
 };
 
 }; /* namespace ARDOUR */