[Scummvm-cvs-logs] SF.net SVN: scummvm:[51878] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Sun Aug 8 02:47:55 CEST 2010
Revision: 51878
http://scummvm.svn.sourceforge.net/scummvm/?rev=51878&view=rev
Author: drmccoy
Date: 2010-08-08 00:47:54 +0000 (Sun, 08 Aug 2010)
Log Message:
-----------
GOB: Fix video continuing
Modified Paths:
--------------
scummvm/trunk/engines/gob/inter_v2.cpp
scummvm/trunk/engines/gob/videoplayer.cpp
Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp 2010-08-08 00:47:25 UTC (rev 51877)
+++ scummvm/trunk/engines/gob/inter_v2.cpp 2010-08-08 00:47:54 UTC (rev 51878)
@@ -982,12 +982,13 @@
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);
Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp 2010-08-08 00:47:25 UTC (rev 51877)
+++ scummvm/trunk/engines/gob/videoplayer.cpp 2010-08-08 00:47:54 UTC (rev 51878)
@@ -257,8 +257,11 @@
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list