X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcoreaudio_source.cc;h=1b0ee565e757a617c91d4e55a55e05345b86c869;hb=fe13d08874f08b723df53116e5655c3d229a657e;hp=f9f3971f51979c00749c4f593b9062b39581107d;hpb=1e668dfaf2392226db306ccfdaf7dbb6e45a0db4;p=ardour.git

diff --git a/libs/ardour/coreaudio_source.cc b/libs/ardour/coreaudio_source.cc
index f9f3971f51..1b0ee565e7 100644
--- a/libs/ardour/coreaudio_source.cc
+++ b/libs/ardour/coreaudio_source.cc
@@ -17,26 +17,31 @@
 
 */
 
+#include <pbd/error.h>
+
 #include <ardour/coreaudio_source.h>
 
 #include "i18n.h"
 
+#include <AudioToolbox/AudioFormat.h>
+
 using namespace ARDOUR;
+using namespace PBD;
 
 CoreAudioSource::CoreAudioSource (const XMLNode& node)
-	: ExternalSource (node)
+	: AudioFileSource (node)
 {
 	init (_name, true);
-	SourceCreated (this); /* EMIT SIGNAL */
+	AudioSourceCreated (this); /* EMIT SIGNAL */
 }
 
 CoreAudioSource::CoreAudioSource (const string& idstr, bool build_peak)
-	: ExternalSource(idstr, build_peak)
+	: AudioFileSource(idstr, build_peak)
 {
 	init (idstr, build_peak);
 
 	if (build_peak) {
-		 SourceCreated (this); /* EMIT SIGNAL */
+		 AudioSourceCreated (this); /* EMIT SIGNAL */
 	}
 }
 
@@ -62,29 +67,34 @@ CoreAudioSource::init (const string& idstr, bool build_peak)
 	}
 
 	/* note that we temporarily truncated _id at the colon */
-	FSRef ref;
-	err = FSPathMakeRef ((UInt8*)file.c_str(), &ref, 0);
+	FSRef fsr;
+	err = FSPathMakeRef ((UInt8*)file.c_str(), &fsr, 0);
 	if (err != noErr) {
+		cerr << "FSPathMakeRef " << err << endl;
 		throw failed_constructor();
 	}
 
-	err = ExtAudioFileOpen (&ref, &af);
+	err = ExtAudioFileOpen (&fsr, &af);
 	if (err != noErr) {
+		cerr << "ExtAudioFileOpen " << err << endl;
 		ExtAudioFileDispose (af);
 		throw failed_constructor();
 	}
 
-	AudioStreamBasicDescription absd;
-	memset(&absd, 0, sizeof(absd));
-	size_t absd_size = sizeof(absd);
+	AudioStreamBasicDescription file_asbd;
+	memset(&file_asbd, 0, sizeof(AudioStreamBasicDescription));
+	size_t asbd_size = sizeof(AudioStreamBasicDescription);
 	err = ExtAudioFileGetProperty(af,
-			kExtAudioFileProperty_FileDataFormat, &absd_size, &absd);
+			kExtAudioFileProperty_FileDataFormat, &asbd_size, &file_asbd);
 	if (err != noErr) {
+		cerr << "ExtAudioFileGetProperty1 " << err << endl;
 		ExtAudioFileDispose (af);
 		throw failed_constructor();
 	}
-	n_channels = absd.mChannelsPerFrame;
+	n_channels = file_asbd.mChannelsPerFrame;
 
+	cerr << "number of channels: " << n_channels << endl;
+	
 	if (channel >= n_channels) {
 		error << string_compose(_("CoreAudioSource: file only contains %1 channels; %2 is invalid as a channel number"), n_channels, channel) << endmsg;
 		ExtAudioFileDispose (af);
@@ -92,19 +102,39 @@ CoreAudioSource::init (const string& idstr, bool build_peak)
 	}
 
 	int64_t ca_frames;
-	size_t prop_size = sizeof(ca_frames);
+	size_t prop_size = sizeof(int64_t);
 
 	err = ExtAudioFileGetProperty(af, kExtAudioFileProperty_FileLengthFrames, &prop_size, &ca_frames);
 	if (err != noErr) {
+		cerr << "ExtAudioFileGetProperty2 " << err << endl;
 		ExtAudioFileDispose (af);
 		throw failed_constructor();
 	}
-	_length = ca_frames;
 
+	_length = ca_frames;
 	_path = file;
 
+	AudioStreamBasicDescription client_asbd;
+	memset(&client_asbd, 0, sizeof(AudioStreamBasicDescription));
+	client_asbd.mSampleRate = file_asbd.mSampleRate;
+	client_asbd.mFormatID = kAudioFormatLinearPCM;
+	client_asbd.mFormatFlags = kLinearPCMFormatFlagIsFloat;
+	client_asbd.mBytesPerPacket = file_asbd.mChannelsPerFrame * 4;
+	client_asbd.mFramesPerPacket = 1;
+	client_asbd.mBytesPerFrame = client_asbd.mBytesPerPacket;
+	client_asbd.mChannelsPerFrame = file_asbd.mChannelsPerFrame;
+	client_asbd.mBitsPerChannel = 32;
+
+	err = ExtAudioFileSetProperty (af, kExtAudioFileProperty_ClientDataFormat, asbd_size, &client_asbd);
+	if (err != noErr) {
+		cerr << "ExtAudioFileSetProperty3 " << err << endl;
+		ExtAudioFileDispose (af);
+		throw failed_constructor ();
+	}
+	
 	if (build_peak) {
 		if (initialize_peakfile (false, file)) {
+			error << "initialize peakfile failed" << endmsg;
 			ExtAudioFileDispose (af);
 			throw failed_constructor ();
 		}
@@ -135,14 +165,11 @@ CoreAudioSource::read (Sample *dst, jack_nframes_t start, jack_nframes_t cnt, ch
 		return 0;
 	}
 
-	AudioBuffer ab;
-	ab.mNumberChannels = n_channels;
-	ab.mDataByteSize = cnt;
-	ab.mData = dst;
-
 	AudioBufferList abl;
 	abl.mNumberBuffers = 1;
-	abl.mBuffers[1] = ab;
+	abl.mBuffers[0].mNumberChannels = n_channels;
+	abl.mBuffers[0].mDataByteSize = cnt * sizeof(Sample);
+	abl.mBuffers[0].mData = dst;
 
 	if (n_channels == 1) {
 		err = ExtAudioFileRead(af, (UInt32*) &cnt, &abl);
@@ -153,7 +180,7 @@ CoreAudioSource::read (Sample *dst, jack_nframes_t start, jack_nframes_t cnt, ch
 	uint32_t real_cnt = cnt * n_channels;
 
 	{
-		LockMonitor lm (_tmpbuf_lock, __LINE__, __FILE__);
+		Glib::Mutex::Lock lm (_tmpbuf_lock);
 		
 		if (tmpbufsize < real_cnt) {
 			
@@ -164,8 +191,8 @@ CoreAudioSource::read (Sample *dst, jack_nframes_t start, jack_nframes_t cnt, ch
 			tmpbuf = new float[tmpbufsize];
 		}
 
-		ab.mDataByteSize = real_cnt;
-		ab.mData = tmpbuf;
+		abl.mBuffers[0].mDataByteSize = real_cnt * sizeof(Sample);
+		abl.mBuffers[0].mData = tmpbuf;
 		
 		err = ExtAudioFileRead(af, (UInt32*) &real_cnt, &abl);
 		float *ptr = tmpbuf + channel;
@@ -184,3 +211,10 @@ CoreAudioSource::read (Sample *dst, jack_nframes_t start, jack_nframes_t cnt, ch
 	return real_cnt;
 }
 
+float
+CoreAudioSource::sample_rate() const
+{
+	/* XXX taybin fill me in please */
+
+	return 44100.0f;
+}