aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2010-06-15 12:34:33 +0000
committerMax Horn2010-06-15 12:34:33 +0000
commitf93644325244cc111634e2e8e4f97adb5a3fbe15 (patch)
tree10e80fa66eb3fc2071dfb39101ef3b4e60fa1530
parente62169c383c987949a5e7aad971691c030eb8a97 (diff)
downloadscummvm-rg350-f93644325244cc111634e2e8e4f97adb5a3fbe15.tar.gz
scummvm-rg350-f93644325244cc111634e2e8e4f97adb5a3fbe15.tar.bz2
scummvm-rg350-f93644325244cc111634e2e8e4f97adb5a3fbe15.zip
SCI: Saner and simpler conversion from msecs to ticks
svn-id: r49846
-rw-r--r--engines/sci/sound/audio.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index 8dfbc18976..ac3ef54c9a 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -353,9 +353,7 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32
}
if (audioSeekStream) {
- *sampleLen = (audioSeekStream->getLength().msecs() * 10000) / 166666; // we translate msecs to ticks
- // Original code
- //*sampleLen = (flags & Audio::FLAG_16BITS ? size >> 1 : size) * 60 / _audioRate;
+ *sampleLen = (audioSeekStream->getLength().msecs() * 60) / 1000; // we translate msecs to ticks
audioStream = audioSeekStream;
}
// We have to make sure that we don't depend on resource manager pointers after this point, because the actual