diff options
author | Matthew Hoops | 2012-05-12 21:28:13 -0400 |
---|---|---|
committer | Matthew Hoops | 2012-05-12 21:28:13 -0400 |
commit | 9e330174c8b8a0d2574746f1bc055423be263311 (patch) | |
tree | e8a0ebc760aa4006642e5deb631829796ca815ba /engines/sword1 | |
parent | 0f6059580e9e4eedbc66460da0e8ef4c56c830dc (diff) | |
download | scummvm-rg350-9e330174c8b8a0d2574746f1bc055423be263311.tar.gz scummvm-rg350-9e330174c8b8a0d2574746f1bc055423be263311.tar.bz2 scummvm-rg350-9e330174c8b8a0d2574746f1bc055423be263311.zip |
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.
Diffstat (limited to 'engines/sword1')
-rw-r--r-- | engines/sword1/animation.cpp | 4 | ||||
-rw-r--r-- | engines/sword1/animation.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index 1e2964054a..a70ca960ba 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -510,11 +510,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(); } /////////////////////////////////////////////////////////////////////////////// diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h index f64b03dd1b..c2ed86a1a3 100644 --- a/engines/sword1/animation.h +++ b/engines/sword1/animation.h @@ -60,7 +60,7 @@ public: DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle); ~DXADecoderWithSound() {} - uint32 getElapsedTime() const; + uint32 getTime() const; private: Audio::Mixer *_mixer; |