aboutsummaryrefslogtreecommitdiff
path: root/graphics/video/smk_player.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-05-19 19:56:53 +0000
committerFilippos Karapetis2009-05-19 19:56:53 +0000
commite358b13ef96e15fc1788841633eb09b1f739cc90 (patch)
tree080a9766958f53fb5d9291d5cd15d9a0d5edb88f /graphics/video/smk_player.cpp
parent4f6bc506153550a16efd02a10b0b377cce54c434 (diff)
downloadscummvm-rg350-e358b13ef96e15fc1788841633eb09b1f739cc90.tar.gz
scummvm-rg350-e358b13ef96e15fc1788841633eb09b1f739cc90.tar.bz2
scummvm-rg350-e358b13ef96e15fc1788841633eb09b1f739cc90.zip
Changed calculations based on frame delay to be based on the scale of 1ms, not 1/100. This fixes the FLIC player and also makes the overall code a bit clearer and easier to understand
svn-id: r40730
Diffstat (limited to 'graphics/video/smk_player.cpp')
-rw-r--r--graphics/video/smk_player.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/graphics/video/smk_player.cpp b/graphics/video/smk_player.cpp
index 4b5a502ec4..9ed8e9902f 100644
--- a/graphics/video/smk_player.cpp
+++ b/graphics/video/smk_player.cpp
@@ -344,9 +344,9 @@ int32 SmackerDecoder::getAudioLag() {
and how much time *should* have passed.
*/
- audioTime = (g_system->getMillis() - _videoInfo.startTime) * 100;
+ audioTime = g_system->getMillis() - _videoInfo.startTime;
} else
- audioTime = (((int32) _mixer->getSoundElapsedTime(_audioHandle)) * 100);
+ audioTime = (int32) _mixer->getSoundElapsedTime(_audioHandle);
return videoTime - audioTime;
}
@@ -380,13 +380,13 @@ bool SmackerDecoder::loadFile(const char *fileName) {
if (frameRate > 0) {
_videoInfo.frameRate = 1000 / frameRate;
- _videoInfo.frameDelay = frameRate * 100;
+ _videoInfo.frameDelay = frameRate;
} else if (frameRate < 0) {
_videoInfo.frameRate = 100000 / (-frameRate);
- _videoInfo.frameDelay = -frameRate;
+ _videoInfo.frameDelay = -frameRate / 100;
} else {
_videoInfo.frameRate = 10;
- _videoInfo.frameDelay = 10000;
+ _videoInfo.frameDelay = 100;
}
// Flags are determined by which bit is set, which can be one of the following: