X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fcoreaudiosource.h;h=bb007768398b83911a16ad3581f3bb40ca82df9c;hb=11a68f7dd38e72c3e497569a60cb0740a33b78cf;hp=63c50d7cfb7bd22cf34a0b69dfdc2bd29af76d1c;hpb=5ee3e58718f65ef9eb62a1b90d424dac68e770ff;p=ardour.git

diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h
index 63c50d7cfb..bb00776839 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,42 +17,57 @@
 
 */
 
-#ifndef __coreaudio_source_h__ 
+#ifndef __coreaudio_source_h__
 #define __coreaudio_source_h__
 
-#include <appleutility/CAAudioFile.h>
+#ifdef COREAUDIO105
+#include "CAAudioFile.h"
+#else
+#include "CAExtAudioFile.h"
+#endif
+#include "ardour/audiofilesource.h"
+#include <string>
 
-#include <ardour/audiofilesource.h>
+using namespace std;
 
 namespace ARDOUR {
 
-class CoreAudioSource : public AudioFileSource {
+class LIBARDOUR_API CoreAudioSource : public AudioFileSource {
   public:
 	CoreAudioSource (ARDOUR::Session&, const XMLNode&);
 	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);
+
+    uint32_t channel_count () const { return n_channels; }
 
 	int flush_header () {return 0;};
 	void set_header_timeline_position () {};
+	bool clamped_at_unity () const { return false; }
+
+	void flush () {}
 
 	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; }
+	void close ();
+	framecnt_t read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const;
+	framecnt_t write_unlocked (Sample *, framecnt_t) { return 0; }
 
   private:
+#ifdef COREAUDIO105
 	mutable CAAudioFile af;
+#else
+	mutable CAExtAudioFile af;
+#endif
 	uint16_t n_channels;
 
-	mutable float *tmpbuf;
-	mutable nframes_t tmpbufsize;
-	mutable Glib::Mutex _tmpbuf_lock;
-
-	void init (string str);
+	void init_cafile ();
+	int safe_read (Sample*, framepos_t start, framecnt_t cnt, AudioBufferList&) const;
 };
 
 }; /* namespace ARDOUR */