aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-06-20 16:38:28 +0000
committerPaweł Kołodziejski2004-06-20 16:38:28 +0000
commit8a685092d22dd3bd13165b9225e0219b7fc9a6c6 (patch)
tree89273019666eef56ace08129ed809da368dd0e34 /scumm
parent24f5130de24ac7528a911153b7263819a3865888 (diff)
downloadscummvm-rg350-8a685092d22dd3bd13165b9225e0219b7fc9a6c6.tar.gz
scummvm-rg350-8a685092d22dd3bd13165b9225e0219b7fc9a6c6.tar.bz2
scummvm-rg350-8a685092d22dd3bd13165b9225e0219b7fc9a6c6.zip
moved sound calls to the same smush thread with others sounds
svn-id: r13977
Diffstat (limited to 'scumm')
-rw-r--r--scumm/smush/smush_player.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index b20aac5322..052e34ac55 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -985,6 +985,11 @@ void SmushPlayer::parseNextFrame() {
error("Unknown Chunk found at %x: %x, %d", _base->tell(), sub->getType(), sub->getSize());
}
delete sub;
+
+ if (_insanity)
+ _vm->_sound->processSoundQues();
+
+ _vm->_imuseDigital->flushTracks();
}
void SmushPlayer::setPalette(const byte *palette) {
@@ -1145,9 +1150,6 @@ void SmushPlayer::play(const char *filename, const char *directory, int32 offset
_vm->_system->updateScreen();
_updateNeeded = false;
- if (_insanity)
- _vm->_sound->processSoundQues();
-
end_time = _vm->_system->get_msecs();
debug(4, "Smush stats: BackendUpdateScreen( %03d )", end_time - start_time);
@@ -1156,7 +1158,6 @@ void SmushPlayer::play(const char *filename, const char *directory, int32 offset
if (_vm->_videoFinished || _vm->_quit || _vm->_saveLoadFlag)
break;
_vm->_system->delay_msecs(10);
- _vm->_imuseDigital->flushTracks();
};
release();