Merged with trunk R992.

Completely untested other than it compiles, runs, and records somewhat (need to merge again).


git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 5 deletions

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 0cab328fba..6184a45302 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -65,12 +65,12 @@ class AudioFileSource : public AudioSource {
 	   for files used in destructive recording.
 	*/
 
-	virtual jack_nframes_t last_capture_start_frame() const { return 0; }
-	virtual void           mark_capture_start (jack_nframes_t) {}
+	virtual nframes_t last_capture_start_frame() const { return 0; }
+	virtual void           mark_capture_start (nframes_t) {}
 	virtual void           mark_capture_end () {}
 	virtual void           clear_capture_marks() {}
 
-	virtual int update_header (jack_nframes_t when, struct tm&, time_t) = 0;
+	virtual int update_header (nframes_t when, struct tm&, time_t) = 0;
 	virtual int flush_header () = 0;
 
 	int move_to_trash (const string trash_dir_name);
@@ -86,7 +86,9 @@ class AudioFileSource : public AudioSource {
 	static void set_bwf_serial_number (int);
 	
 	static void set_search_path (string);
-	static void set_header_position_offset (jack_nframes_t offset );
+	static void set_header_position_offset (nframes_t offset );
+
+	int setup_peakfile ();
 
 	static sigc::signal<void> HeaderPositionOffsetChanged;
 
@@ -122,6 +124,7 @@ class AudioFileSource : public AudioSource {
 	Flag          _flags;
 	string        _take_id;
 	uint64_t       timeline_position;
+	bool           file_is_new;
 
 	static string peak_dir;
 	static string search_path;
@@ -132,7 +135,7 @@ class AudioFileSource : public AudioSource {
 
 	static uint64_t header_position_offset;
 
-	virtual void set_timeline_position (jack_nframes_t pos);
+	virtual void set_timeline_position (nframes_t pos);
 	virtual void set_header_timeline_position () = 0;
 
 	bool find (std::string path, bool must_exist, bool& is_new);