X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fcoreaudiosource.h;h=820fa0b9d84c61e63ffd6ff9d69395552112f6cf;hb=5bc4e54b7da3eb139d699c6e371d43540c69b519;hp=ad21188531de6c350c6cd64466ca74ed745f8c3e;hpb=45d3ec1437cf661533bc7750c623865def4424df;p=ardour.git

diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h
index ad21188531..820fa0b9d8 100644
--- a/libs/ardour/ardour/coreaudiosource.h
+++ b/libs/ardour/ardour/coreaudiosource.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 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
@@ -17,12 +17,14 @@
 
 */
 
-#ifndef __coreaudio_source_h__ 
+#ifndef __coreaudio_source_h__
 #define __coreaudio_source_h__
 
 #include <appleutility/CAAudioFile.h>
+#include "ardour/audiofilesource.h"
+#include <string>
 
-#include <ardour/audiofilesource.h>
+using namespace std;
 
 namespace ARDOUR {
 
@@ -32,27 +34,27 @@ class CoreAudioSource : public AudioFileSource {
 	CoreAudioSource (ARDOUR::Session&, const string& path, int chn, Flag);
 	~CoreAudioSource ();
 
+	void set_path (const std::string& p);
+
 	float sample_rate() const;
-	int update_header (nframes_t when, struct tm&, time_t);
+	int update_header (framepos_t when, struct tm&, time_t);
 
 	int flush_header () {return 0;};
 	void set_header_timeline_position () {};
+	bool clamped_at_unity () const { return false; }
 
 	static int get_soundfile_info (string path, SoundFileInfo& _info, string& error_msg);
 
   protected:
-	nframes_t read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const;
-	nframes_t write_unlocked (Sample *dst, nframes_t cnt) { return 0; }
+	framecnt_t read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const;
+	framecnt_t write_unlocked (Sample *, framecnt_t) { return 0; }
 
   private:
 	mutable CAAudioFile af;
 	uint16_t n_channels;
 
-	mutable float *tmpbuf;
-	mutable nframes_t tmpbufsize;
-	mutable Glib::Mutex _tmpbuf_lock;
-
-	void init ();
+	void init_cafile ();
+	int safe_read (Sample*, framepos_t start, framecnt_t cnt, AudioBufferList&) const;
 };
 
 }; /* namespace ARDOUR */