libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GOB: Fix video continuing

Browse Source 
svn-id: r51878
This commit is contained in:
Sven Hesse 2010-08-08 00:47:54 +00:00
parent 53b67deaf0
commit 7fe406a5dd
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/gob/inter_v2.cpp
View File

@ -982,12 +982,13 @@ void Inter_v2::o2_playImd() {
props.x, props.y, props.startFrame, props.lastFrame,
props.palCmd, props.palStart, props.palEnd, props.flags);
_vm->_vidPlayer->evaluateFlags(props);
int slot;
if ((imd[0] != 0) && ((slot = _vm->_vidPlayer->openVideo(true, imd, props)) < 0)) {
WRITE_VAR(11, (uint32) -1);
return;
int slot = 0;
if (imd[0] != 0) {
_vm->_vidPlayer->evaluateFlags(props);
if ((slot = _vm->_vidPlayer->openVideo(true, imd, props)) < 0) {
WRITE_VAR(11, (uint32) -1);
return;
}
}
close = (props.lastFrame == -1);

7
engines/gob/videoplayer.cpp
View File

@ -257,8 +257,11 @@ bool VideoPlayer::playFrame(int slot, Properties &properties) {
bool primary = slot == 0;
if (video->decoder->getCurFrame() != properties.startFrame);
video->decoder->seek(properties.startFrame + 1);
if (video->decoder->getCurFrame() != properties.startFrame) {
video->decoder->disableSound();
video->decoder->seek(properties.startFrame + 1, SEEK_SET, true);
video->decoder->enableSound();
}
bool modifiedPal = false;