[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.287,1.288 sound.h,1.56,1.57

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13799/scumm

Modified Files:
	sound.cpp sound.h 
Log Message:
cleanup

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- sound.cpp	22 Dec 2003 20:28:27 -0000	1.287
+++ sound.cpp	23 Dec 2003 00:17:29 -0000	1.288
@@ -887,7 +887,7 @@
 		error("startSfxSound: cannot read %d bytes", size);
 	}
 
-	playSfxSound(data, size, rate, true, handle);
+	_scumm->_mixer->playRaw(handle, data, size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED);
 }
 
 File *Sound::openSfxFile() {
@@ -966,13 +966,6 @@
 
 bool Sound::isSfxFinished() const {
 	return !_scumm->_mixer->hasActiveSFXChannel();
-}
-
-void Sound::playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned, PlayingSoundHandle *handle) {
-	byte flags = SoundMixer::FLAG_AUTOFREE;
-	if (isUnsigned)
-		flags |= SoundMixer::FLAG_UNSIGNED;
-	_scumm->_mixer->playRaw(handle, sound, size, rate, flags);
 }
 
 // We use a real timer in an attempt to get better sync with CD tracks. This is

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- sound.h	22 Dec 2003 08:22:03 -0000	1.56
+++ sound.h	23 Dec 2003 00:17:29 -0000	1.57
@@ -93,7 +93,6 @@
 	File *openSfxFile();
 	void startSfxSound(File *file, int file_size, PlayingSoundHandle *handle);
 	bool isSfxFinished() const;
-	void playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned, PlayingSoundHandle *handle);
 };
 
 } // End of namespace Scumm