[Scummvm-cvs-logs] SF.net SVN: scummvm:[35753] scummvm/trunk/engines/made

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Tue Jan 6 14:09:16 CET 2009


Revision: 35753
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35753&view=rev
Author:   thebluegr
Date:     2009-01-06 13:09:16 +0000 (Tue, 06 Jan 2009)

Log Message:
-----------
The sound energy buffer is now cleared inside decompressSound()

Modified Paths:
--------------
    scummvm/trunk/engines/made/scriptfuncs.cpp
    scummvm/trunk/engines/made/sound.cpp

Modified: scummvm/trunk/engines/made/scriptfuncs.cpp
===================================================================
--- scummvm/trunk/engines/made/scriptfuncs.cpp	2009-01-06 12:33:59 UTC (rev 35752)
+++ scummvm/trunk/engines/made/scriptfuncs.cpp	2009-01-06 13:09:16 UTC (rev 35753)
@@ -237,7 +237,6 @@
 		_vm->_autoStopSound = (argv[0] == 1);
 	}
 	if (soundNum > 0) {
-		soundEnergy.clear();
 		_vm->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_audioStreamHandle,
 			_vm->_res->getSound(soundNum)->getAudioStream(_vm->_soundRate, false));
 	}
@@ -547,7 +546,6 @@
 	int16 soundNum = argv[0];
 	_vm->_mixer->stopHandle(_audioStreamHandle);
 	if (soundNum > 0) {
-		soundEnergy.clear();
 		_vm->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_audioStreamHandle,
 			_vm->_res->getSound(soundNum)->getAudioStream(_vm->_soundRate, false));
 		_vm->_autoStopSound = true;

Modified: scummvm/trunk/engines/made/sound.cpp
===================================================================
--- scummvm/trunk/engines/made/sound.cpp	2009-01-06 12:33:59 UTC (rev 35752)
+++ scummvm/trunk/engines/made/sound.cpp	2009-01-06 13:09:16 UTC (rev 35753)
@@ -52,6 +52,8 @@
 		{16, 2, 0x0F, 4}
 	};
 
+	soundEnergy.clear();
+
 	while (chunkCount--) {
 		deltaType = (*source) >> 6;
 		workChunkSize = chunkSize;


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