aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2007-02-26 20:32:43 +0000
committerMax Horn2007-02-26 20:32:43 +0000
commit1c80f2ffa0d22c39fce5da342b72f890415aec8c (patch)
treed7fe1f7ad8a9a0e63df77146d80382485efbfa37
parentb1a12658b05f77edf2c4b03c82b3f04e1255b35f (diff)
downloadscummvm-rg350-1c80f2ffa0d22c39fce5da342b72f890415aec8c.tar.gz
scummvm-rg350-1c80f2ffa0d22c39fce5da342b72f890415aec8c.tar.bz2
scummvm-rg350-1c80f2ffa0d22c39fce5da342b72f890415aec8c.zip
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
svn-id: r25883
-rw-r--r--engines/gob/init.cpp4
-rw-r--r--engines/gob/sound.cpp3
-rw-r--r--engines/gob/sound.h1
3 files changed, 0 insertions, 8 deletions
diff --git a/engines/gob/init.cpp b/engines/gob/init.cpp
index 82cca27545..81ad101ce9 100644
--- a/engines/gob/init.cpp
+++ b/engines/gob/init.cpp
@@ -61,10 +61,6 @@ void Init::cleanup(void) {
_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();
diff --git a/engines/gob/sound.cpp b/engines/gob/sound.cpp
index fb591d5e36..af5bc59661 100644
--- a/engines/gob/sound.cpp
+++ b/engines/gob/sound.cpp
@@ -96,7 +96,6 @@ int Snd::SquareWaveStream::readBuffer(int16 *buffer, const int numSamples) {
}
Snd::Snd(GobEngine *vm) : _vm(vm) {
- _cleanupFunc = 0;
_playingSound = 0;
_curSoundDesc = 0;
@@ -307,8 +306,6 @@ void Snd::checkEndSample(void) {
}
int Snd::readBuffer(int16 *buffer, const int numSamples) {
- memset(buffer, 0, numSamples);
-
for (int i = 0; i < numSamples; i++) {
Common::StackLock slock(_mutex);
diff --git a/engines/gob/sound.h b/engines/gob/sound.h
index 4628820ad8..e11d42f1a3 100644
--- a/engines/gob/sound.h
+++ b/engines/gob/sound.h
@@ -46,7 +46,6 @@ public:
typedef void (*CleanupFuncPtr) (int16);
char _playingSound;
- CleanupFuncPtr _cleanupFunc;
Snd(GobEngine *vm);