diff options
Diffstat (limited to 'sky')
-rw-r--r-- | sky/sound.cpp | 18 | ||||
-rw-r--r-- | sky/sound.h | 4 |
2 files changed, 3 insertions, 19 deletions
diff --git a/sky/sound.cpp b/sky/sound.cpp index 95a08587e7..4aa2d26899 100644 --- a/sky/sound.cpp +++ b/sky/sound.cpp @@ -1034,21 +1034,7 @@ SkySound::~SkySound(void) { 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 @@ int SkySound::playSound(uint32 id, byte *sound, uint32 size, PlayingSoundHandle 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) { diff --git a/sky/sound.h b/sky/sound.h index cafc3e8e5b..57636afc01 100644 --- a/sky/sound.h +++ b/sky/sound.h @@ -57,13 +57,11 @@ public: 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); |