libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-23 19:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Get rid of blocking loops

Browse Source
This commit is contained in:
djsrv 2020-07-21 13:47:18 -04:00
parent 5285e7d29c
commit 1d0f8db46a
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/director/score.cpp
View File

@ -64,6 +64,7 @@ Score::Score(Movie *movie) {
_nextFrame = 0;
_currentLabel = 0;
_nextFrameTime = 0;
_waitForChannel = 0;
_playState = kPlayNotStarted;
_numChannelsDisplayed = 0;
@ -253,6 +254,13 @@ void Score::stopPlay() {
}
void Score::update() {
if (_waitForChannel) {
if (_soundManager->isChannelActive(_waitForChannel))
return;
_waitForChannel = 0;
}
if (g_system->getMillis() < _nextFrameTime && !debugChannelSet(-1, kDebugFast)) {
return;
}
@ -357,14 +365,10 @@ void Score::update() {
_vm->waitForClick();
} else if (tempo == 135) {
// Wait for sound channel 1
while (_soundManager->isChannelActive(1)) {
_vm->processEvents();
}
_waitForChannel = 1;
} else if (tempo == 134) {
// Wait for sound channel 2
while (_soundManager->isChannelActive(2)) {
_vm->processEvents();
}
_waitForChannel = 2;
}
}

1
engines/director/score.h
View File

@ -118,6 +118,7 @@ public:
byte _puppetTempo;
PlayState _playState;
uint32 _nextFrameTime;
int _waitForChannel;
Cursor *_currentCursor;
int _numChannelsDisplayed;