*/
#include <algorithm>
-#define __STDC_FORMAT_MACROS
#include <inttypes.h>
#include "pbd/error.h"
}
int
-CoreAudioSource::safe_read (Sample* dst, nframes_t start, nframes_t cnt, AudioBufferList& abl) const
+CoreAudioSource::safe_read (Sample* dst, framepos_t start, framecnt_t cnt, AudioBufferList& abl) const
{
- nframes_t nread = 0;
+ framecnt_t nread = 0;
while (nread < cnt) {
try {
af.Seek (start+nread);
} catch (CAXException& cax) {
- error << string_compose("CoreAudioSource: %1 to %2 (%3)", cax.mOperation, start+nread, _name.substr (1)) << endmsg;
+ error << string_compose("CoreAudioSource: %1 to %2 (%3)", cax.mOperation, start+nread, _name.val().substr (1)) << endmsg;
return -1;
}
}
-nframes_t
-CoreAudioSource::read_unlocked (Sample *dst, sframes_t start, nframes_t cnt) const
+framecnt_t
+CoreAudioSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const
{
- nframes_t file_cnt;
+ framecnt_t file_cnt;
AudioBufferList abl;
abl.mNumberBuffers = 1;
}
if (file_cnt != cnt) {
- nframes_t delta = cnt - file_cnt;
+ frameoffset_t delta = cnt - file_cnt;
memset (dst+file_cnt, 0, sizeof (Sample) * delta);
}
if (n_channels == 1) {
if (safe_read (dst, start, file_cnt, abl) == 0) {
- _read_data_count = cnt * sizeof (Sample);
return cnt;
}
return 0;
return 0;
}
- _read_data_count = cnt * sizeof(float);
-
Sample *ptr = interleave_buf + _channel;
/* stride through the interleaved data */
- for (uint32_t n = 0; n < file_cnt; ++n) {
+ for (framecnt_t n = 0; n < file_cnt; ++n) {
dst[n] = *ptr;
ptr += n_channels;
}
}
int
-CoreAudioSource::update_header (framepos_t when, struct tm&, time_t)
+CoreAudioSource::update_header (framepos_t, struct tm&, time_t)
{
return 0;
}
int
-CoreAudioSource::get_soundfile_info (string path, SoundFileInfo& _info, string& error_msg)
+CoreAudioSource::get_soundfile_info (string path, SoundFileInfo& _info, string&)
{
FSRef ref;
ExtAudioFileRef af = 0;