diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-26 01:21:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-26 17:04:31 +0100 |
| commit | 09a9ac376db005a40a351736bcff4077f098825d (patch) | |
| tree | 64ea69741155d15d114ad96daf0f90e24b3abe28 /src/lib/sndfile_decoder.cc | |
| parent | 46cd0fe7b5b514f0d9456b25f670679cc584a218 (diff) | |
Another try at sorting out the thorny question of timing.
Diffstat (limited to 'src/lib/sndfile_decoder.cc')
| -rw-r--r-- | src/lib/sndfile_decoder.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc index ff56f1062..80a6afd2b 100644 --- a/src/lib/sndfile_decoder.cc +++ b/src/lib/sndfile_decoder.cc @@ -35,7 +35,7 @@ using boost::shared_ptr; SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const SndfileContent> c) : Decoder (f) - , AudioDecoder (f, c) + , AudioDecoder (f) , _sndfile_content (c) , _deinterleave_buffer (0) { @@ -100,7 +100,7 @@ SndfileDecoder::audio_channels () const return _info.channels; } -ContentAudioFrame +AudioContent::Frame SndfileDecoder::audio_length () const { return _info.frames; @@ -112,14 +112,8 @@ SndfileDecoder::audio_frame_rate () const return _info.samplerate; } -Time -SndfileDecoder::position () const -{ - return _next_audio; -} - bool SndfileDecoder::done () const { - return audio_done (); + return _audio_position >= _sndfile_content->audio_length (); } |