Merge master.

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

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 432f73f0d66f5b30e6c8068a13266719cf9c197b..d6537843e8970ebde3ae6872bb99f04fd66e5de3 100644 (file)
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -98,7 +98,7 @@ SndfileDecoder::pass ()
        _done += this_time;
        _remaining -= this_time;
 
-       return true;
+       return _remaining == 0;
 }
 
 int
@@ -107,7 +107,7 @@ SndfileDecoder::audio_channels () const
        return _info.channels;
 }
 
-AudioContent::Frame
+AudioFrame
 SndfileDecoder::audio_length () const
 {
        return _info.frames;
@@ -123,6 +123,7 @@ void
 SndfileDecoder::seek (ContentTime t, bool accurate)
 {
        Decoder::seek (t, accurate);
+       AudioDecoder::seek (t, accurate);
 
        _done = t * audio_frame_rate() / TIME_HZ;
        _remaining = _info.frames - _done;