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 /queen/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 'queen/sound.h')
| -rw-r--r-- | queen/sound.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/queen/sound.h b/queen/sound.h index 1311848310..6aaee1d2bf 100644 --- a/queen/sound.h +++ b/queen/sound.h @@ -74,8 +74,8 @@ public: void musicToggle(bool val) { _musicToggle = val; } void toggleMusic() { _musicToggle ^= true; } - bool isSpeechActive() const { return _speechHandle.isActive(); } - bool isSfxActive() const { return _sfxHandle.isActive(); } + bool isSpeechActive() const { return _mixer->isSoundHandleActive(_speechHandle); } + bool isSfxActive() const { return _mixer->isSoundHandleActive(_sfxHandle); } bool speechSfxExists() const { return _speechSfxExists; } @@ -112,8 +112,8 @@ protected: bool _speechSfxExists; int16 _lastOverride; - PlayingSoundHandle _sfxHandle; - PlayingSoundHandle _speechHandle; + SoundHandle _sfxHandle; + SoundHandle _speechHandle; }; class SilentSound : public Sound { |