diff options
Diffstat (limited to 'sky')
| -rw-r--r-- | sky/intro.h | 2 | ||||
| -rw-r--r-- | sky/sound.cpp | 2 | ||||
| -rw-r--r-- | sky/sound.h | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sky/intro.h b/sky/intro.h index e7840fa120..1fbf2a4bb0 100644 --- a/sky/intro.h +++ b/sky/intro.h @@ -56,7 +56,7 @@ private: uint8 *_textBuf, *_saveBuf; uint8 *_bgBuf; uint32 _bgSize; - SoundHandle _voice, _bgSfx; + Audio::SoundHandle _voice, _bgSfx; int32 _relDelay; diff --git a/sky/sound.cpp b/sky/sound.cpp index c65579d950..a9a1708846 100644 --- a/sky/sound.cpp +++ b/sky/sound.cpp @@ -1031,7 +1031,7 @@ Sound::~Sound(void) { if (_soundData) free(_soundData); } -void Sound::playSound(uint32 id, byte *sound, uint32 size, SoundHandle *handle) { +void Sound::playSound(uint32 id, byte *sound, uint32 size, Audio::SoundHandle *handle) { byte flags = 0; flags |= Audio::Mixer::FLAG_UNSIGNED|Audio::Mixer::FLAG_AUTOFREE; diff --git a/sky/sound.h b/sky/sound.h index 2f9d68c3a9..1305369190 100644 --- a/sky/sound.h +++ b/sky/sound.h @@ -50,16 +50,16 @@ protected: public: Audio::Mixer *_mixer; - SoundHandle _voiceHandle; - SoundHandle _effectHandle; - SoundHandle _bgSoundHandle; - SoundHandle _ingameSound0, _ingameSound1, _ingameSpeech; + Audio::SoundHandle _voiceHandle; + Audio::SoundHandle _effectHandle; + Audio::SoundHandle _bgSoundHandle; + Audio::SoundHandle _ingameSound0, _ingameSound1, _ingameSpeech; uint16 _saveSounds[2]; protected: - void playSound(uint32 id, byte *sound, uint32 size, SoundHandle *handle); + void playSound(uint32 id, byte *sound, uint32 size, Audio::SoundHandle *handle); public: Sound(Audio::Mixer *mixer, Disk *pDisk, uint8 pVolume); |