aboutsummaryrefslogtreecommitdiff
path: root/sword2/sound.h
diff options
context:
space:
mode:
Diffstat (limited to 'sword2/sound.h')
-rw-r--r--sword2/sound.h6
1 files changed, 3 insertions, 3 deletions
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);