From c3362d7b12e425fa9549579be10e708c88d5feea Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 3 Jan 2014 14:06:01 +0000 Subject: Fix _audio_position after seek. --- src/lib/audio_decoder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/audio_decoder.cc') diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc index d85bfaee2..adabd5d99 100644 --- a/src/lib/audio_decoder.cc +++ b/src/lib/audio_decoder.cc @@ -54,7 +54,7 @@ AudioDecoder::audio (shared_ptr data) if (_resampler) { data = _resampler->run (data); } - + _pending.push_back (shared_ptr (new DecodedAudio (data, _audio_position))); _audio_position += data->frames (); } @@ -80,5 +80,5 @@ AudioDecoder::seek (ContentTime t, bool) assert (film); FrameRateChange frc = film->active_frame_rate_change (_audio_content->position ()); - _audio_position = (t + first_audio()) / frc.speed_up; + _audio_position = ((t + first_audio()) / frc.speed_up) * film->audio_frame_rate() / TIME_HZ; } -- cgit v1.2.3