diff options
Diffstat (limited to 'libs/ardour/ardour/track.h')
| -rw-r--r-- | libs/ardour/ardour/track.h | 14 |
1 files changed, 4 insertions, 10 deletions
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]; |