ChangeLog.

[dcpomatic.git] / src / lib / sndfile_decoder.cc

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index c4c6e5f4ee065f6dca6145defbb293bedcb5b7d1..e10f4f568430d08dd86d1d5db38d2116606fbbbb 100644 (file)
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -39,7 +39,8 @@ SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const Sndfi
        , _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(0).string().c_str(), SFM_READ, &_info);
        if (!_sndfile) {
                throw DecodeError (_("could not open audio file for reading"));
        }
@@ -89,7 +90,7 @@ SndfileDecoder::pass ()
        }
                
        data->set_frames (this_time);
-       audio (data, double(_done) / audio_frame_rate());
+       audio (data, _done);
        _done += this_time;
        _remaining -= this_time;
 }
@@ -100,7 +101,7 @@ SndfileDecoder::audio_channels () const
        return _info.channels;
 }
 
-ContentAudioFrame
+AudioContent::Frame
 SndfileDecoder::audio_length () const
 {
        return _info.frames;
@@ -112,8 +113,8 @@ SndfileDecoder::audio_frame_rate () const
        return _info.samplerate;
 }
 
-Time
-SndfileDecoder::next () const
+bool
+SndfileDecoder::done () const
 {
-       return _next_audio;
+       return _audio_position >= _sndfile_content->audio_length ();
 }