X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudio_track.h;h=4ae5b59fc88d5fdf79017ea0e3900a08aba9aa00;hb=452672f78f5f0f9195bfd48398e29b18a8fb1df7;hp=04dd5f47988ee6c39d07c6726cc0d2203b95458a;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index 04dd5f4798..4ae5b59fc8 100644
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2006 Paul Davis 
+    Copyright (C) 2002-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -28,48 +28,49 @@ class Session;
 class AudioDiskstream;
 class AudioPlaylist;
 class RouteGroup;
+class AudioFileSource;
 
 class AudioTrack : public Track
 {
   public:
-	AudioTrack (Session&, string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal);
-	AudioTrack (Session&, const XMLNode&);
+	AudioTrack (Session&, std::string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal);
 	~AudioTrack ();
 
-	int set_mode (TrackMode m); 
+	int set_mode (TrackMode m);
 	bool can_use_mode (TrackMode m, bool& bounce_required);
 
-	int roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
-		nframes_t offset, int declick, bool can_record, bool rec_monitors_input);
-	
-	int no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
-		nframes_t offset, bool state_changing, bool can_record, bool rec_monitors_input);
-	
-	int silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
-		nframes_t offset, bool can_record, bool rec_monitors_input);
+	int roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
+	          int declick, bool& need_butler);
 
-	boost::shared_ptr<AudioDiskstream> audio_diskstream() const;
+	boost::shared_ptr<Diskstream> create_diskstream ();
+	void set_diskstream (boost::shared_ptr<Diskstream>);
 
-	int use_diskstream (string name);
-	int use_diskstream (const PBD::ID& id);
-	
-	int export_stuff (BufferSet& bufs, nframes_t nframes, nframes_t end_frame);
+	DataType data_type () const {
+		return DataType::AUDIO;
+	}
 
-	void freeze (InterThreadInfo&);
+	int export_stuff (BufferSet& bufs, framepos_t start_frame, framecnt_t nframes, bool enable_processing = true);
+
+	void freeze_me (InterThreadInfo&);
 	void unfreeze ();
 
 	boost::shared_ptr<Region> bounce (InterThreadInfo&);
-	boost::shared_ptr<Region> bounce_range (nframes_t start, nframes_t end, InterThreadInfo&);
+	boost::shared_ptr<Region> bounce_range (framepos_t start, framepos_t end, InterThreadInfo&, bool enable_processing);
+
+	int set_state (const XMLNode&, int version);
 
-	int set_state(const XMLNode& node);
+	boost::shared_ptr<AudioFileSource> write_source (uint32_t n = 0);
+
+	bool bounceable () const;
 
   protected:
+	boost::shared_ptr<AudioDiskstream> audio_diskstream () const;
 	XMLNode& state (bool full);
-	
-	int _set_state (const XMLNode&, bool call_base);
 
   private:
-	int  set_diskstream (boost::shared_ptr<AudioDiskstream>, void *);
+
+	boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &);
+	
 	int  deprecated_use_diskstream_connections ();
 	void set_state_part_two ();
 	void set_state_part_three ();