fixes for destructive track offsets of various kinds; move from jack_nframes_t -> nframes_t

git-svn-id: svn://localhost/ardour2/trunk@933 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 4 insertions, 7 deletions

diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h
index 49009caf53..668fe61102 100644
--- a/libs/ardour/ardour/coreaudiosource.h
+++ b/libs/ardour/ardour/coreaudiosource.h
@@ -33,24 +33,21 @@ class CoreAudioSource : public AudioFileSource {
 	~CoreAudioSource ();
 
 	float sample_rate() const;
-	int update_header (jack_nframes_t when, struct tm&, time_t);
+	int update_header (nframes_t when, struct tm&, time_t);
 
 	int flush_header () {return 0;};
 	void set_header_timeline_position () {};
 
   protected:
-	jack_nframes_t read_unlocked (Sample *dst, jack_nframes_t start, jack_nframes_t cnt) const;
-	
-	jack_nframes_t write_unlocked (Sample *dst, jack_nframes_t cnt) 
-	{ return 0; }
-	
+	nframes_t read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const;
+	nframes_t write_unlocked (Sample *dst, nframes_t cnt) { return 0; }
 
   private:
 	mutable CAAudioFile af;
 	uint16_t n_channels;
 
 	mutable float *tmpbuf;
-	mutable jack_nframes_t tmpbufsize;
+	mutable nframes_t tmpbufsize;
 	mutable Glib::Mutex _tmpbuf_lock;
 
 	void init (const string &str);