, _sndfile_content (c)
, _deinterleave_buffer (0)
{
- _sndfile = sf_open (_sndfile_content->file().string().c_str(), SFM_READ, &_info);
+ _info.format = 0;
+ _sndfile = sf_open (_sndfile_content->path().string().c_str(), SFM_READ, &_info);
if (!_sndfile) {
throw DecodeError (_("could not open audio file for reading"));
}
delete[] _deinterleave_buffer;
}
-bool
+void
SndfileDecoder::pass ()
{
/* Do things in half second blocks as I think there may be limits
int const channels = _sndfile_content->audio_channels ();
- shared_ptr<AudioBuffers> audio (new AudioBuffers (channels, this_time));
+ shared_ptr<AudioBuffers> data (new AudioBuffers (channels, this_time));
if (_sndfile_content->audio_channels() == 1) {
/* No de-interleaving required */
- sf_read_float (_sndfile, audio->data(0), this_time);
+ sf_read_float (_sndfile, data->data(0), this_time);
} else {
/* Deinterleave */
if (!_deinterleave_buffer) {
sf_readf_float (_sndfile, _deinterleave_buffer, this_time);
vector<float*> out_ptr (channels);
for (int i = 0; i < channels; ++i) {
- out_ptr[i] = audio->data(i);
+ out_ptr[i] = data->data(i);
}
float* in_ptr = _deinterleave_buffer;
for (int i = 0; i < this_time; ++i) {
}
}
- audio->set_frames (this_time);
- Audio (audio, double(_done) / audio_frame_rate());
+ data->set_frames (this_time);
+ audio (data, _done);
_done += this_time;
_remaining -= this_time;
-
- return (_remaining == 0);
}
int
return _info.channels;
}
-ContentAudioFrame
+AudioContent::Frame
SndfileDecoder::audio_length () const
{
return _info.frames;
{
return _info.samplerate;
}
+
+bool
+SndfileDecoder::done () const
+{
+ return _audio_position >= _sndfile_content->audio_length ();
+}