Cleanup of region drag code to be a bit more efficient and shorter. Fixes crashes...

[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 1277b598d414e2b86b8a605652c2f89822052680..ecd88b94e5abf79aa3b667a6a7dbe358fce9aa4d 100644 (file)
--- 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 {
 
@@ -29,43 +28,46 @@ 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 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);
 
-       boost::shared_ptr<AudioDiskstream> audio_diskstream() const;
+       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 use_diskstream (string name);
-       int use_diskstream (const PBD::ID& id);
-       
-       int export_stuff (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t end_frame);
+       void use_new_diskstream ();
+        void set_diskstream (boost::shared_ptr<Diskstream>);
+
+       DataType data_type () const {
+               return DataType::AUDIO;
+       }
 
-       void freeze (InterThreadInfo&);
+       int export_stuff (BufferSet& bufs, sframes_t start_frame, nframes_t nframes, bool enable_processing = true);
+
+       void freeze_me (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&, int version);
 
-       int set_state(const XMLNode& node);
+       boost::shared_ptr<AudioFileSource> write_source (uint32_t n = 0);
 
   protected:
+       boost::shared_ptr<AudioDiskstream> audio_diskstream () const;
        XMLNode& state (bool full);
+       
+       int _set_state (const XMLNode&, int, bool call_base);
 
   private:
-       int  set_diskstream (boost::shared_ptr<AudioDiskstream>, void *);
        int  deprecated_use_diskstream_connections ();
        void set_state_part_two ();
        void set_state_part_three ();