X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fcoreaudiosource.h;h=bb007768398b83911a16ad3581f3bb40ca82df9c;hb=9eaced4c9d2db5e080e5fa5228616917ccac211c;hp=f12a67ded7fae8ad8c05a8e1e38cf16a38add86a;hpb=59631acc5f41153a294c97ab820a4b41a886e24c;p=ardour.git

diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h
index f12a67ded7..bb00776839 100644
--- a/libs/ardour/ardour/coreaudiosource.h
+++ b/libs/ardour/ardour/coreaudiosource.h
@@ -20,7 +20,11 @@
 #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>
 
@@ -39,6 +43,8 @@ class LIBARDOUR_API CoreAudioSource : public AudioFileSource {
 	float sample_rate() const;
 	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; }
@@ -48,11 +54,16 @@ class LIBARDOUR_API CoreAudioSource : public AudioFileSource {
 	static int get_soundfile_info (string path, SoundFileInfo& _info, string& error_msg);
 
   protected:
+	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;
 
 	void init_cafile ();