diff options
| author | Max Horn | 2005-03-12 18:56:09 +0000 |
|---|---|---|
| committer | Max Horn | 2005-03-12 18:56:09 +0000 |
| commit | 7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8 (patch) | |
| tree | 7849605aa45912d9cbe65dbb68b2b450bd32b023 /sword2/sound.h | |
| parent | 8de216f3aec1dcee16fc0ab9974da4087bac5252 (diff) | |
| download | scummvm-rg350-7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8.tar.gz scummvm-rg350-7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8.tar.bz2 scummvm-rg350-7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8.zip | |
PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
svn-id: r17106
Diffstat (limited to 'sword2/sound.h')
| -rw-r--r-- | sword2/sound.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sword2/sound.h b/sword2/sound.h index 07a8b40c35..f34ba70014 100644 --- a/sword2/sound.h +++ b/sword2/sound.h @@ -172,7 +172,7 @@ private: Common::Mutex _mutex; struct FxQueueEntry { - PlayingSoundHandle handle; // sound handle + 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; - PlayingSoundHandle _soundHandleSpeech; + SoundHandle _soundHandleSpeech; MusicInputStream *_music[MAXMUS]; //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(PlayingSoundHandle *handle, byte *data, uint32 len, uint8 vol, int8 pan, bool loop, SoundMixer::SoundType soundType); + int32 playFx(SoundHandle *handle, byte *data, uint32 len, uint8 vol, int8 pan, bool loop, SoundMixer::SoundType soundType); int32 stopFx(int32 i); int32 setFxIdVolumePan(int32 id, int vol, int pan = 255); |