X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudio_track.h;h=fc5b4255b3cf50f2f4e6737f2a2cc8654211a963;hb=afd9fc30e51c41fb42b34d74d6043c2e0e3d1a13;hp=15b99297c883b42dd5e9de0de1d65f2c9ad4523c;hpb=79986643c0c904f6574bb5323e2233a43a9e622e;p=ardour.git

diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index 15b99297c8..fc5b4255b3 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
@@ -15,13 +15,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_audio_track_h__
 #define __ardour_audio_track_h__
 
-#include <ardour/track.h>
+#include "ardour/track.h"
 
 namespace ARDOUR {
 
@@ -33,46 +32,40 @@ class RouteGroup;
 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 (Session&, const XMLNode&, int);
 	~AudioTrack ();
 
-	int roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, 
-		jack_nframes_t offset, int declick, bool can_record, bool rec_monitors_input);
-	
-	int no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, 
-		jack_nframes_t offset, bool state_changing, bool can_record, bool rec_monitors_input);
-	
-	int silent_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, 
-		jack_nframes_t offset, bool can_record, bool rec_monitors_input);
+	int set_mode (TrackMode m);
+	bool can_use_mode (TrackMode m, bool& bounce_required);
 
-	AudioDiskstream& audio_diskstream() const;
+	int roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
+			int declick, bool can_record, bool rec_monitors_input);
 
-	int use_diskstream (string name);
+	boost::shared_ptr<AudioDiskstream> audio_diskstream() const;
+
+	int use_diskstream (std::string name);
 	int use_diskstream (const PBD::ID& id);
-	
-	int export_stuff (vector<Sample*>& buffers, char * workbuf, uint32_t nbufs, jack_nframes_t nframes, jack_nframes_t end_frame);
+
+	int export_stuff (BufferSet& bufs, sframes_t start_frame, nframes_t nframes, bool enable_processing = true);
 
 	void freeze (InterThreadInfo&);
 	void unfreeze ();
 
-	void bounce (InterThreadInfo&);
-	void bounce_range (jack_nframes_t start, jack_nframes_t end, InterThreadInfo&);
+	boost::shared_ptr<Region> bounce (InterThreadInfo&);
+	boost::shared_ptr<Region> bounce_range (nframes_t start, nframes_t end, InterThreadInfo&, bool enable_processing);
 
-	int set_state(const XMLNode& node);
+	int set_state(const XMLNode&, int version);
 
   protected:
 	XMLNode& state (bool full);
-
-	void passthru_silence (jack_nframes_t start_frame, jack_nframes_t end_frame, 
-			       jack_nframes_t nframes, jack_nframes_t offset, int declick,
-			       bool meter);
-
-	uint32_t n_process_buffers ();
 	
+	int _set_state (const XMLNode&, int, bool call_base);
+
   private:
-	int  set_diskstream (AudioDiskstream&, void *);
+	int  set_diskstream (boost::shared_ptr<AudioDiskstream>, void *);
 	int  deprecated_use_diskstream_connections ();
+	void use_new_diskstream ();
 	void set_state_part_two ();
 	void set_state_part_three ();
 };