, _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"));
}
}
data->set_frames (this_time);
- audio (data, double(_done) / audio_frame_rate());
+ audio (data, _done);
_done += this_time;
_remaining -= this_time;
}
return _info.channels;
}
-ContentAudioFrame
+AudioContent::Frame
SndfileDecoder::audio_length () const
{
return _info.frames;
return _info.samplerate;
}
-Time
-SndfileDecoder::next () const
-{
- return _next_audio;
-}
-
bool
SndfileDecoder::done () const
{
- return audio_done ();
+ return _audio_position >= _sndfile_content->audio_length ();
}