From 7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 12 Mar 2005 18:56:09 +0000 Subject: PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method svn-id: r17106 --- graphics/animation.cpp | 2 +- graphics/animation.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'graphics') 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 -- cgit v1.2.3