From 9e330174c8b8a0d2574746f1bc055423be263311 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Sat, 12 May 2012 21:28:13 -0400 Subject: VIDEO: Change getElapsedTime() into getTime() This name change accompanies a slight meaning change; now it means the current time position from the beginning of the video and not from starting the video. --- engines/sword2/animation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/sword2/animation.cpp') diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index e77ae98163..90ee7375ab 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -410,11 +410,11 @@ DXADecoderWithSound::DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle : _mixer(mixer), _bgSoundHandle(bgSoundHandle) { } -uint32 DXADecoderWithSound::getElapsedTime() const { +uint32 DXADecoderWithSound::getTime() const { if (_mixer->isSoundHandleActive(*_bgSoundHandle)) return _mixer->getSoundElapsedTime(*_bgSoundHandle); - return DXADecoder::getElapsedTime(); + return DXADecoder::getTime(); } /////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3