X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcoreaudiosource.cc;h=48040952db05520198a126250f18826ea4daf26d;hb=5ada17eba0195d90f0685776251b384efdf5168e;hp=52b4f21ce74566a492d39a42fa68e528d05c041e;hpb=38efd580b2256597f7c1001288b9581788557321;p=ardour.git

diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc
index 52b4f21ce7..48040952db 100644
--- a/libs/ardour/coreaudiosource.cc
+++ b/libs/ardour/coreaudiosource.cc
@@ -34,7 +34,7 @@
 
 #include <glibmm/fileutils.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <AudioToolbox/AudioFormat.h>
 
@@ -115,9 +115,9 @@ CoreAudioSource::close ()
 }
 
 int
-CoreAudioSource::safe_read (Sample* dst, framepos_t start, framecnt_t cnt, AudioBufferList& abl) const
+CoreAudioSource::safe_read (Sample* dst, samplepos_t start, samplecnt_t cnt, AudioBufferList& abl) const
 {
-	framecnt_t nread = 0;
+	samplecnt_t nread = 0;
 
 	while (nread < cnt) {
 
@@ -160,10 +160,10 @@ CoreAudioSource::safe_read (Sample* dst, framepos_t start, framecnt_t cnt, Audio
 }
 
 
-framecnt_t
-CoreAudioSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const
+samplecnt_t
+CoreAudioSource::read_unlocked (Sample *dst, samplepos_t start, samplecnt_t cnt) const
 {
-	framecnt_t file_cnt;
+	samplecnt_t file_cnt;
 	AudioBufferList abl;
 
 	abl.mNumberBuffers = 1;
@@ -189,7 +189,7 @@ CoreAudioSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) c
 	}
 
 	if (file_cnt != cnt) {
-		frameoffset_t delta = cnt - file_cnt;
+		sampleoffset_t delta = cnt - file_cnt;
 		memset (dst+file_cnt, 0, sizeof (Sample) * delta);
 	}
 
@@ -213,7 +213,7 @@ CoreAudioSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) c
 
 	/* stride through the interleaved data */
 
-	for (framecnt_t n = 0; n < file_cnt; ++n) {
+	for (samplecnt_t n = 0; n < file_cnt; ++n) {
 		dst[n] = *ptr;
 		ptr += n_channels;
 	}
@@ -237,7 +237,7 @@ CoreAudioSource::sample_rate() const
 }
 
 int
-CoreAudioSource::update_header (framepos_t, struct tm&, time_t)
+CoreAudioSource::update_header (samplepos_t, struct tm&, time_t)
 {
 	return 0;
 }
@@ -264,7 +264,7 @@ CoreAudioSource::get_soundfile_info (string path, SoundFileInfo& _info, string&)
 #else
 	CFURLRef url = CFURLCreateFromFileSystemRepresentation (kCFAllocatorDefault, (const UInt8*)path.c_str (), strlen (path.c_str ()), false);
 	OSStatus res = ExtAudioFileOpenURL(url, &af);
-	CFRelease (url);
+	if (url) CFRelease (url);
 
 	if (res != noErr) {
 		goto out;