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 /graphics | |
| 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 'graphics')
| -rw-r--r-- | graphics/animation.cpp | 2 | ||||
| -rw-r--r-- | graphics/animation.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/graphics/animation.cpp b/graphics/animation.cpp index 18f294fa08..3ba6179ffd 100644 --- a/graphics/animation.cpp +++ b/graphics/animation.cpp @@ -185,7 +185,7 @@ bool BaseAnimationState::decodeFrame() { */ /* Avoid deadlock is sound was too far ahead */ - if (_bgSoundStream && !_bgSound.isActive()) + if (_bgSoundStream && !_snd->isSoundHandleActive(_bgSound)) return false; if (checkPaletteSwitch() || (_bgSoundStream == NULL) || diff --git a/graphics/animation.h b/graphics/animation.h index 71546746c6..5efb3797d8 100644 --- a/graphics/animation.h +++ b/graphics/animation.h @@ -84,7 +84,7 @@ protected: File *_mpegFile; - PlayingSoundHandle _bgSound; + SoundHandle _bgSound; AudioStream *_bgSoundStream; #ifdef BACKEND_8BIT |