X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudio_track.h;h=ee25837481b24dc8eb547d86d997b6e7d70f210f;hb=6bd583803ea1daf19a1c088766122b5cdf340171;hp=1ecec88f8986f3d8431f567978bbfb96ddff45a9;hpb=36c233fe6ce570ce85224626ce7aba4a2607537f;p=ardour.git

diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index 1ecec88f89..ee25837481 100644
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -26,7 +26,6 @@
 namespace ARDOUR {
 
 class Session;
-class AudioDiskstream;
 class AudioPlaylist;
 class RouteGroup;
 class AudioFileSource;
@@ -34,44 +33,29 @@ class AudioFileSource;
 class LIBARDOUR_API AudioTrack : public Track
 {
   public:
-	AudioTrack (Session&, std::string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal);
+	AudioTrack (Session&, std::string name, TrackMode m = Normal);
 	~AudioTrack ();
 
-	int set_mode (TrackMode m);
-	bool can_use_mode (TrackMode m, bool& bounce_required);
-
-	int roll (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>);
-
-	DataType data_type () const {
-		return DataType::AUDIO;
-	}
+	MonitorState get_auto_monitoring_state () const;
 
 	void freeze_me (InterThreadInfo&);
 	void unfreeze ();
 
 	bool bounceable (boost::shared_ptr<Processor>, bool include_endpoint) const;
 	boost::shared_ptr<Region> bounce (InterThreadInfo&);
-	boost::shared_ptr<Region> bounce_range (framepos_t start, framepos_t end, InterThreadInfo&, 
+	boost::shared_ptr<Region> bounce_range (samplepos_t start, samplepos_t end, InterThreadInfo&,
 						boost::shared_ptr<Processor> endpoint, bool include_endpoint);
-	int export_stuff (BufferSet& bufs, framepos_t start_frame, framecnt_t nframes,
-			  boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export);
+	int export_stuff (BufferSet& bufs, samplepos_t start_sample, samplecnt_t nframes,
+			  boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export, bool for_freeze);
 
 	int set_state (const XMLNode&, int version);
 
 	boost::shared_ptr<AudioFileSource> write_source (uint32_t n = 0);
 
   protected:
-	boost::shared_ptr<AudioDiskstream> audio_diskstream () const;
-	XMLNode& state (bool full);
+	XMLNode& state (bool save_template);
 
   private:
-
-	boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &);
-	
 	int  deprecated_use_diskstream_connections ();
 	void set_state_part_two ();
 	void set_state_part_three ();