From 4abee143106cf5732e16e0b57f2474a5174bf27c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 23 Dec 2003 00:17:29 +0000
Subject: cleanup

svn-id: r11865
---
 scumm/sound.cpp | 9 +--------
 scumm/sound.h   | 1 -
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 231d89a045..789b3964a9 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -887,7 +887,7 @@ void Sound::startSfxSound(File *file, int file_size, PlayingSoundHandle *handle)
 		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() {
@@ -968,13 +968,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
 // necessary for games like Loom CD.
 
diff --git a/scumm/sound.h b/scumm/sound.h
index 263208c304..1ac2d2c219 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -93,7 +93,6 @@ protected:
 	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
-- 
cgit v1.2.3