X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fcoreaudiosource.h;h=7e9f975d03536633a9274712fb7172c6f6669dbe;hb=9f4c7a9e9edd260a72f040b036982d4c5da89292;hp=bd69c78e180d29ec1285d6bdcd8d409bc9da2b59;hpb=ef6b25432d9c46d71b08c0f7d5f2686df428c4e8;p=ardour.git

diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h
index bd69c78e18..7e9f975d03 100644
--- a/libs/ardour/ardour/coreaudiosource.h
+++ b/libs/ardour/ardour/coreaudiosource.h
@@ -21,15 +21,14 @@
 #define __coreaudio_source_h__
 
 #include <appleutility/CAAudioFile.h>
-
-#include <ardour/audiofilesource.h>
+#include "ardour/audiofilesource.h"
 
 namespace ARDOUR {
 
 class CoreAudioSource : public AudioFileSource {
   public:
 	CoreAudioSource (ARDOUR::Session&, const XMLNode&);
-	CoreAudioSource (ARDOUR::Session&, const string& path_plus_channel, Flag);
+	CoreAudioSource (ARDOUR::Session&, const string& path, int chn, Flag);
 	~CoreAudioSource ();
 
 	float sample_rate() const;
@@ -48,11 +47,8 @@ class CoreAudioSource : public AudioFileSource {
 	mutable CAAudioFile af;
 	uint16_t n_channels;
 
-	mutable float *tmpbuf;
-	mutable nframes_t tmpbufsize;
-	mutable Glib::Mutex _tmpbuf_lock;
-
-	void init (string str);
+	void init ();
+	int safe_read (Sample*, nframes_t start, nframes_t cnt, AudioBufferList&) const;
 };
 
 }; /* namespace ARDOUR */