[Scummvm-cvs-logs] SF.net SVN: scummvm:[55432] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 55432
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55432&view=rev
Author:   drmccoy
Date:     2011-01-22 16:29:54 +0000 (Sat, 22 Jan 2011)

Log Message:
-----------
GOB: Extend the good-measure wait to all videos with sound

Fixes a glitch in Bambou, where the intro movie is cut off to
soon.

Modified Paths:
--------------
    scummvm/trunk/engines/gob/inter_v6.cpp
    scummvm/trunk/engines/gob/videoplayer.cpp
    scummvm/trunk/engines/gob/videoplayer.h

Modified: scummvm/trunk/engines/gob/inter_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v6.cpp	2011-01-22 16:16:30 UTC (rev 55431)
+++ scummvm/trunk/engines/gob/inter_v6.cpp	2011-01-22 16:29:54 UTC (rev 55432)
@@ -183,7 +183,7 @@
 		_vm->_vidPlayer->play(slot, props);
 
 	if (close && !props.noBlock) {
-		if ((props.flags & VideoPlayer::kFlagNoVideo) && (!props.canceled))
+		if (props.hasSound && !props.canceled)
 			_vm->_util->longDelay(500);
 
 		_vm->_vidPlayer->closeVideo(slot);

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2011-01-22 16:16:30 UTC (rev 55431)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2011-01-22 16:29:54 UTC (rev 55432)
@@ -40,7 +40,8 @@
 	x(-1), y(-1), width(-1), height(-1), flags(kFlagFrontSurface), switchColorMode(false),
 	startFrame(-1), lastFrame(-1), endFrame(-1), forceSeek(false),
 	breakKey(kShortKeyEscape), palCmd(8), palStart(0), palEnd(255), palFrame(-1),
-	noBlock(false), loop(false), fade(false), waitEndFrame(true), canceled(false) {
+	noBlock(false), loop(false), fade(false), waitEndFrame(true),
+	hasSound(false), canceled(false) {
 
 }
 
@@ -202,6 +203,8 @@
 	if (primary)
 		_needBlit = (properties.flags & kFlagUseBackSurfaceContent) && (properties.sprite == Draw::kFrontSurface);
 
+	properties.hasSound = video->decoder->hasSound();
+
 	if (!video->decoder->hasSound())
 		video->decoder->setFrameRate(_vm->_util->getFrameRate());
 

Modified: scummvm/trunk/engines/gob/videoplayer.h
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.h	2011-01-22 16:16:30 UTC (rev 55431)
+++ scummvm/trunk/engines/gob/videoplayer.h	2011-01-22 16:29:54 UTC (rev 55432)
@@ -96,6 +96,7 @@
 
 		bool waitEndFrame; ///< Wait for the frame's time to run out?
 
+		bool hasSound; ///< Does the video have sound?
 		bool canceled; ///< Was the video canceled?
 
 		Properties();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.