ardour/livetrax
13
0
Fork 0
Code

Use AudioFile.h instead of ExtAudioFile.h.

Browse Source 
git-svn-id: svn://localhost/trunk/ardour2@352 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin 2006-03-06 16:04:46 +00:00
parent aed3483e14
commit 4c9e99322e
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/coreaudio_source.h
View File

@ -23,7 +23,7 @@
#include <ardour/source.h>
#include <AudioToolbox/ExtendedAudioFile.h>
#include <AudioToolbox/AudioFile.h>
namespace ARDOUR {
@ -45,8 +45,8 @@ class CoreAudioSource : public Source {
private:
static string peak_dir;
ExtAudioFileRef* af_ref;
uint16_t n_channels;
AudioFileID af;
AudioStreamBasicDescription _info;
uint16_t channel;
mutable float *tmpbuf;

26
libs/ardour/coreaudio_source.cc
View File

@ -79,14 +79,18 @@ CoreAudioSource::init (const string& idstr, bool build_peak)
if (err) {
throw failed_constructor();
}
err = ExtAudioFileOpen (ref, af_ref);
err = AudioFileOpen (ref, 0, fsRdPerm, &af);
if (err) {
throw failed_constructor();
}
/* XXX get value for n_channels */
UInt32 size = sizeof(AudioStreamBasicDescription);
memset (_info, 0, size);
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_ref);
AudioFileClose(af);
throw failed_constructor();
}
@ -103,7 +107,7 @@ CoreAudioSource::init (const string& idstr, bool build_peak)
if (build_peak) {
if (initialize_peakfile (false, file)) {
ExtAudioFileDispose(*af_ref);
AudioFileClose(af);
throw failed_constructor ();
}
}
@ -143,20 +147,16 @@ CoreAudioSource::read (Sample *dst, jack_nframes_t start, jack_nframes_t cnt) co
}
AudioBufferList abl;
AudioBuffer ab;
abl.mNumberBuffers = 1;
abl.mBuffers[0] = ab;
ab.mNumberChannels = n_channels;
ab.mDataByteSize = cnt;
ab.mData = dst;
abl.mBuffers[0].mNumberChannels = n_channels;
if (n_channels == 1) {
uint32_t ioNumber = cnt;
err = ExtAudioFileRead(*af_ref, (UInt32*)&ioNumber, &abl);
abl.mBuffers[0].mDataByteSize = cnt * sizeof(float);
abl.mBuffers[0].mData = dst;
nread = cnt;
err = ExtAudioFileRead(*af_ref, (UInt32*)&nread, &abl);
_read_data_count = cnt * sizeof(float);
return ioNumber;
return nread;
}
real_cnt = cnt * n_channels;