From da19eaac0dd80afed3dd282d61ea3298196a5090 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 13 Dec 2013 10:23:20 +0000 Subject: Start of changing frame numbers to time. --- src/lib/audio_decoder.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/lib/audio_decoder.cc') 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 film, shared_ptr content) : Decoder (film) , _audio_content (content) - , _audio_position (0) { } void -AudioDecoder::audio (shared_ptr data, AudioContent::Frame frame) +AudioDecoder::audio (shared_ptr 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. -- cgit v1.2.3