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

[drmccoy at users.sourceforge.net]

Revision: 55444
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55444&view=rev
Author:   drmccoy
Date:     2011-01-22 19:37:25 +0000 (Sat, 22 Jan 2011)

Log Message:
-----------
GOB: Only let one video with sound play at a time

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

Modified: scummvm/trunk/engines/gob/inter_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v6.cpp	2011-01-22 19:28:23 UTC (rev 55443)
+++ scummvm/trunk/engines/gob/inter_v6.cpp	2011-01-22 19:37:25 UTC (rev 55444)
@@ -175,10 +175,8 @@
 	_vm->_vidPlayer->evaluateFlags(props);
 
 	bool primary = true;
-	if (props.noBlock && (props.flags & VideoPlayer::kFlagNoVideo)) {
-		_vm->_vidPlayer->closeLiveSound();
+	if (props.noBlock && (props.flags & VideoPlayer::kFlagNoVideo))
 		primary = false;
-	}
 
 	int slot = 0;
 	if ((fileName[0] != 0) && ((slot = _vm->_vidPlayer->openVideo(primary, fileName, props)) < 0)) {
@@ -186,6 +184,9 @@
 		return;
 	}
 
+	if (props.hasSound)
+		_vm->_vidPlayer->closeLiveSound();
+
 	if (props.startFrame >= 0)
 		_vm->_vidPlayer->play(slot, props);
 


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