diff options
Diffstat (limited to 'sword2')
| -rw-r--r-- | sword2/driver/animation.cpp | 6 | ||||
| -rw-r--r-- | sword2/driver/animation.h | 2 | ||||
| -rw-r--r-- | sword2/driver/d_sound.cpp | 2 | ||||
| -rw-r--r-- | sword2/sound.cpp | 2 | ||||
| -rw-r--r-- | sword2/sound.h | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp index d70397eb4e..8e3e8958b6 100644 --- a/sword2/driver/animation.cpp +++ b/sword2/driver/animation.cpp @@ -168,7 +168,7 @@ void MoviePlayer::drawTextObject(AnimationState *anim, MovieTextObject *obj) { */ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], int32 leadInRes, int32 leadOutRes) { - SoundHandle leadInHandle; + Audio::SoundHandle leadInHandle; // This happens if the user quits during the "eye" smacker if (_vm->_quit) @@ -246,7 +246,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], int32 lea void MoviePlayer::playMPEG(const char *filename, MovieTextObject *text[], byte *leadOut, uint32 leadOutLen) { uint frameCounter = 0, textCounter = 0; - SoundHandle handle; + Audio::SoundHandle handle; bool skipCutscene = false, textVisible = false; uint32 flags = Audio::Mixer::FLAG_16BITS; bool startNextText = false; @@ -452,7 +452,7 @@ void MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte tmpPal[255 * 4 + 2] = 255; _vm->_screen->setPalette(0, 256, tmpPal, RDPAL_INSTANT); - SoundHandle handle; + Audio::SoundHandle handle; bool skipCutscene = false; diff --git a/sword2/driver/animation.h b/sword2/driver/animation.h index b2d0332281..5958d03692 100644 --- a/sword2/driver/animation.h +++ b/sword2/driver/animation.h @@ -78,7 +78,7 @@ private: byte *_textSurface; - SoundHandle _leadOutHandle; + Audio::SoundHandle _leadOutHandle; uint _leadOutFrame; bool _seamless; diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index fd8e7e8671..33699972ef 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -441,7 +441,7 @@ int Sound::readBuffer(int16 *buffer, const int numSamples) { if (!_musicMuted) { for (int j = 0; j < len; j++) { - clampedAdd(buffer[j], _mixBuffer[j]); + Audio::clampedAdd(buffer[j], _mixBuffer[j]); } } } diff --git a/sword2/sound.cpp b/sword2/sound.cpp index 67ac46388d..3723784142 100644 --- a/sword2/sound.cpp +++ b/sword2/sound.cpp @@ -250,7 +250,7 @@ int32 Sound::playFx(FxQueueEntry *fx) { return playFx(&fx->handle, fx->data, fx->len, fx->volume, fx->pan, (fx->type == FX_LOOP), Audio::Mixer::kSFXSoundType); } -int32 Sound::playFx(SoundHandle *handle, byte *data, uint32 len, uint8 vol, int8 pan, bool loop, Audio::Mixer::SoundType soundType) { +int32 Sound::playFx(Audio::SoundHandle *handle, byte *data, uint32 len, uint8 vol, int8 pan, bool loop, Audio::Mixer::SoundType soundType) { if (_fxMuted) return RD_OK; diff --git a/sword2/sound.h b/sword2/sound.h index f717aab33d..9ef3844044 100644 --- a/sword2/sound.h +++ b/sword2/sound.h @@ -172,7 +172,7 @@ private: Common::Mutex _mutex; struct FxQueueEntry { - SoundHandle handle; // sound handle + Audio::SoundHandle handle; // sound handle uint32 resource; // resource id of sample byte *data; // pointer to WAV data uint32 len; // WAV data length @@ -198,7 +198,7 @@ private: int32 _loopingMusicId; - SoundHandle _soundHandleSpeech; + Audio::SoundHandle _soundHandleSpeech; MusicInputStream *_music[MAXMUS]; //Common::File _musicFile[MAXMUS]; @@ -253,7 +253,7 @@ public: void queueFx(int32 res, int32 type, int32 delay, int32 volume, int32 pan); int32 playFx(FxQueueEntry *fx); - int32 playFx(SoundHandle *handle, byte *data, uint32 len, uint8 vol, int8 pan, bool loop, Audio::Mixer::SoundType soundType); + int32 playFx(Audio::SoundHandle *handle, byte *data, uint32 len, uint8 vol, int8 pan, bool loop, Audio::Mixer::SoundType soundType); int32 stopFx(int32 i); int32 setFxIdVolumePan(int32 id, int vol, int pan = 255); |