[Scummvm-cvs-logs] CVS: scummvm/sky sound.cpp,1.40,1.41 sound.h,1.20,1.21

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv14443

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

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- sound.cpp	25 Oct 2003 14:25:24 -0000	1.40
+++ sound.cpp	21 Dec 2003 00:00:19 -0000	1.41
@@ -1034,21 +1034,7 @@
 	if (_soundData) free(_soundData);
 }
 
-int SkySound::playVoice(byte *sound, uint32 size) {
-
-	_mixer->stopID(SOUND_VOICE);
-	return playSound(SOUND_VOICE, sound, size, &_voiceHandle);
-}
-
-
-int SkySound::playBgSound(byte *sound, uint32 size) {
-
-	size -= 512; //Hack to get rid of the annoying pop at the end of some bg sounds 
-	_mixer->stopID(SOUND_BG);
-	return playSound(SOUND_BG, sound, size, &_bgSoundHandle);
-}
-
-int SkySound::playSound(uint32 id, byte *sound, uint32 size, PlayingSoundHandle *handle) {
+void SkySound::playSound(uint32 id, byte *sound, uint32 size, PlayingSoundHandle *handle) {
 
 	byte flags = 0;
 	flags |= SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE;
@@ -1057,7 +1043,7 @@
 	memcpy(buffer, sound+sizeof(struct dataFileHeader), size);	
 	
 	_mixer->stopID(id);
-	return _mixer->playRaw(handle, buffer, size, 11025, flags, id);
+	_mixer->playRaw(handle, buffer, size, 11025, flags, id);
 }
 
 void SkySound::loadSection(uint8 pSection) {

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- sound.h	25 Oct 2003 14:25:24 -0000	1.20
+++ sound.h	21 Dec 2003 00:00:19 -0000	1.21
@@ -57,13 +57,11 @@
 
 protected:
 
-	int playSound(uint32 id, byte *sound, uint32 size, PlayingSoundHandle *handle);
+	void playSound(uint32 id, byte *sound, uint32 size, PlayingSoundHandle *handle);
 
 public:
 	SkySound(SoundMixer *mixer, SkyDisk *pDisk, uint8 pVolume);
 	~SkySound(void);
-	int playVoice(byte *sound, uint32 size);
-	int playBgSound(byte *sound, uint32 size);
 
 	void loadSection(uint8 pSection);
 	void playSound(uint16 sound, uint16 volume, uint8 channel);