[Scummvm-cvs-logs] SF.net SVN: scummvm:[47195] scummvm/trunk/graphics/video/coktelvideo/ coktelvideo.cpp

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sat Jan 9 04:55:12 CET 2010


Revision: 47195
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47195&view=rev
Author:   drmccoy
Date:     2010-01-09 03:55:09 +0000 (Sat, 09 Jan 2010)

Log Message:
-----------
Yup, not checking for stereo sound was an accident here

Modified Paths:
--------------
    scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp

Modified: scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp	2010-01-09 03:08:51 UTC (rev 47194)
+++ scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp	2010-01-09 03:55:09 UTC (rev 47195)
@@ -1559,12 +1559,7 @@
 	// Restart sound
 	if (_hasSound && (frame == 0) && (_soundStage == 0) && !_audioStream) {
 		_soundStage = 1;
-		// FIXME: This code didn't check the stereo flag at all and always generated
-		// mono data. Is that on purpose? If so, just remove this comment.
-		// If it was by accident, remove the assert and replace "false" in the call
-		// to makeQueuingAudioStream() below by "_soundStereo > 0".
-		assert(_soundStereo == 0);
-		_audioStream = Audio::makeQueuingAudioStream(_soundFreq, false);
+		_audioStream = Audio::makeQueuingAudioStream(_soundFreq, _soundStereo != 0);
 	}
 
 	// Seek


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