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

Avoid deadlock in MPEG-2 cutscenes + slow devices

Browse Source 
svn-id: r12996
This commit is contained in:
Nicolas Bacca 2004-02-22 18:13:54 +00:00
parent e40e3dd530
commit e469cd43a7
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sword1/animation.cpp
View File

@ -307,6 +307,10 @@ bool AnimationState::decodeFrame() {
* frames if we run behind and delaying if we are too fast
*/
/* Avoid deadlock is sound was too far ahead */
if (bgSoundStream && !bgSound.isActive())
return false;
#ifdef BACKEND_8BIT
if (checkPaletteSwitch() || (bgSoundStream == NULL) ||
((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1)) {

4
sword2/driver/animation.cpp
View File

@ -352,6 +352,10 @@ bool AnimationState::decodeFrame() {
* frames if we run behind and delaying if we are too fast
*/
/* Avoid deadlock is sound was too far ahead */
if (bgSoundStream && !bgSound.isActive())
return false;
#ifdef BACKEND_8BIT
if (checkPaletteSwitch() || (bgSoundStream == NULL) ||
((_vm->_mixer->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1)) {