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 /scumm/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 'scumm/sound.h')
| -rw-r--r-- | scumm/sound.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/sound.h b/scumm/sound.h index 6b3830d323..d86b7c5c45 100644 --- a/scumm/sound.h +++ b/scumm/sound.h @@ -84,7 +84,7 @@ protected: int16 _currentCDSound; int16 _currentMusic; public: - PlayingSoundHandle _talkChannelHandle; // Handle of mixer channel actor is talking on + SoundHandle _talkChannelHandle; // Handle of mixer channel actor is talking on bool _soundsPaused; byte _sfxMode; @@ -97,7 +97,7 @@ public: void processSoundQues(); void setOverrideFreq(int freq); void playSound(int soundID, int heOffset, int heChannel, int heFlags); - void startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle *handle = NULL); + void startTalkSound(uint32 offset, uint32 b, int mode, SoundHandle *handle = NULL); void stopTalkSound(); bool isMouthSyncOff(uint pos); int isSoundRunning(int sound) const; |