Make crossfade convert-to-full and activate/deactivate work across edit groups (...

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

diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index d74f5e53b99f5a0d9805bdd0a6419818374628f8..4ae5b59fc88d5fdf79017ea0e3900a08aba9aa00 100644 (file)
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -28,7 +28,7 @@ class Session;
 class AudioDiskstream;
 class AudioPlaylist;
 class RouteGroup;
-class AudioFileSource; 
+class AudioFileSource;
 
 class AudioTrack : public Track
 {
@@ -39,32 +39,38 @@ class AudioTrack : public Track
        int set_mode (TrackMode m);
        bool can_use_mode (TrackMode m, bool& bounce_required);
 
-       int roll (nframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-                  int declick, bool can_record, bool rec_monitors_input, bool& need_butler);
+       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>);
 
-       void use_new_diskstream ();
-        void set_diskstream (boost::shared_ptr<Diskstream>);
+       DataType data_type () const {
+               return DataType::AUDIO;
+       }
 
-       int export_stuff (BufferSet& bufs, sframes_t start_frame, nframes_t nframes, bool enable_processing = true);
+       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&, bool enable_processing);
+       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&, int version);
 
        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&, int, bool call_base);
 
   private:
+
+       boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &);
+       
        int  deprecated_use_diskstream_connections ();
        void set_state_part_two ();
        void set_state_part_three ();