diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-13 10:23:20 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-13 10:23:20 +0000 |
| commit | da19eaac0dd80afed3dd282d61ea3298196a5090 (patch) | |
| tree | 8b6caca26fc79aa943082965e7aac72ae6dcc521 /src/lib/audio_decoder.cc | |
| parent | 097a1fb413bbbb89182161d4c1a31daa5419ec96 (diff) | |
Start of changing frame numbers to time.
Diffstat (limited to 'src/lib/audio_decoder.cc')
| -rw-r--r-- | src/lib/audio_decoder.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc index c0ef02f65..a73ad4d7c 100644 --- a/src/lib/audio_decoder.cc +++ b/src/lib/audio_decoder.cc @@ -35,16 +35,14 @@ using boost::shared_ptr; AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioContent> content) : Decoder (film) , _audio_content (content) - , _audio_position (0) { } void -AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame) +AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time) { - Audio (data, frame); - _audio_position = frame + data->frames (); + Audio (data, time); } /** This is a bit odd, but necessary when we have (e.g.) FFmpegDecoders with no audio. |