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/sword25/fmv/theora_decoder.cpp | |
| 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/sword25/fmv/theora_decoder.cpp')
| -rw-r--r-- | engines/sword25/fmv/theora_decoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp index a7ebb5df8c..082c569fda 100644 --- a/engines/sword25/fmv/theora_decoder.cpp +++ b/engines/sword25/fmv/theora_decoder.cpp @@ -507,7 +507,7 @@ uint32 TheoraDecoder::getTimeToNextFrame() const { if (endOfVideo() || _curFrame < 0) return 0; - uint32 elapsedTime = getElapsedTime(); + uint32 elapsedTime = getTime(); uint32 nextFrameStartTime = (uint32)(_nextFrameStartTime * 1000); if (nextFrameStartTime <= elapsedTime) @@ -516,11 +516,11 @@ uint32 TheoraDecoder::getTimeToNextFrame() const { return nextFrameStartTime - elapsedTime; } -uint32 TheoraDecoder::getElapsedTime() const { +uint32 TheoraDecoder::getTime() const { if (_audStream) return g_system->getMixer()->getSoundElapsedTime(*_audHandle); - return VideoDecoder::getElapsedTime(); + return VideoDecoder::getTime(); } void TheoraDecoder::pauseVideoIntern(bool pause) { |