[Scummvm-cvs-logs] SF.net SVN: scummvm: [20727] scummvm/trunk/engines/scumm/he/sound_he.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Thu Feb 16 05:47:00 CET 2006


Revision: 20727
Author:   kirben
Date:     2006-02-16 05:45:52 -0800 (Thu, 16 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20727&view=rev

Log Message:
-----------
Stop music in HE games, before nuking the resource

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/sound_he.cpp
Modified: scummvm/trunk/engines/scumm/he/sound_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/sound_he.cpp	2006-02-16 12:18:06 UTC (rev 20726)
+++ scummvm/trunk/engines/scumm/he/sound_he.cpp	2006-02-16 13:45:52 UTC (rev 20727)
@@ -367,18 +367,13 @@
 
 		musicFile.seek(music_offs, SEEK_SET);
 
-		if (_vm->_heversion == 70) {
-			spoolPtr = (byte *)malloc(size);
-			musicFile.read(spoolPtr, size);
-		} else {
-			spoolPtr = _vm->res.createResource(rtSpoolBuffer, heChannel, size);
-			assert(spoolPtr);
-			musicFile.read(spoolPtr, size);
-		}
+		_vm->_mixer->stopHandle(_heSoundChannels[heChannel]);
+		spoolPtr = _vm->res.createResource(rtSpoolBuffer, heChannel, size);
+		assert(spoolPtr);
+		musicFile.read(spoolPtr, size);
 		musicFile.close();
 
 		if (_vm->_heversion == 70) {
-			_vm->_mixer->stopHandle(_heSoundChannels[heChannel]);
 			_vm->_mixer->playRaw(&_heSoundChannels[heChannel], spoolPtr, size, 11025, flags, soundID);
 			return;
 		}







More information about the Scummvm-git-logs mailing list