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

[fingolfin at users.sourceforge.net]

Revision: 25883
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25883&view=rev
Author:   fingolfin
Date:     2007-02-26 12:32:43 -0800 (Mon, 26 Feb 2007)

Log Message:
-----------
calling memset to zero a buffer you are about to fill with audio data is not necessary (removing this from Gob::Snd::readBuffer); removed dead code

Modified Paths:
--------------
    scummvm/trunk/engines/gob/init.cpp
    scummvm/trunk/engines/gob/sound.cpp
    scummvm/trunk/engines/gob/sound.h

Modified: scummvm/trunk/engines/gob/init.cpp
===================================================================
--- scummvm/trunk/engines/gob/init.cpp	2007-02-26 18:52:28 UTC (rev 25882)
+++ scummvm/trunk/engines/gob/init.cpp	2007-02-26 20:32:43 UTC (rev 25883)
@@ -61,10 +61,6 @@
 	_vm->_video->freeSurfDesc(_vm->_global->_pPrimarySurfDesc);
 	_vm->_global->_pPrimarySurfDesc = 0;
 
-	if (_vm->_snd->_cleanupFunc != 0 && _vm->_snd->_playingSound != 0) {
-		(*_vm->_snd->_cleanupFunc) (0);
-		_vm->_snd->_cleanupFunc = 0;
-	}
 	_vm->_snd->speakerOff();
 
 	_vm->_dataio->closeDataFile();

Modified: scummvm/trunk/engines/gob/sound.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound.cpp	2007-02-26 18:52:28 UTC (rev 25882)
+++ scummvm/trunk/engines/gob/sound.cpp	2007-02-26 20:32:43 UTC (rev 25883)
@@ -96,7 +96,6 @@
 }
 
 Snd::Snd(GobEngine *vm) : _vm(vm) {
-	_cleanupFunc = 0;
 	_playingSound = 0;
 	_curSoundDesc = 0;
 
@@ -307,8 +306,6 @@
 }
 
 int Snd::readBuffer(int16 *buffer, const int numSamples) {
-	memset(buffer, 0, numSamples);
-
 	for (int i = 0; i < numSamples; i++) {
 		Common::StackLock slock(_mutex);
 

Modified: scummvm/trunk/engines/gob/sound.h
===================================================================
--- scummvm/trunk/engines/gob/sound.h	2007-02-26 18:52:28 UTC (rev 25882)
+++ scummvm/trunk/engines/gob/sound.h	2007-02-26 20:32:43 UTC (rev 25883)
@@ -46,7 +46,6 @@
 	typedef void (*CleanupFuncPtr) (int16);
 
 	char _playingSound;
-	CleanupFuncPtr _cleanupFunc;
 
 	Snd(GobEngine *vm);
 


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