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
---
 scumm/smush/smush_mixer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scumm/smush/smush_mixer.cpp')

diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp
index 791b689491..c787f3aafc 100644
--- a/scumm/smush/smush_mixer.cpp
+++ b/scumm/smush/smush_mixer.cpp
@@ -69,7 +69,7 @@ void SmushMixer::addChannel(SmushChannel *c) {
 	}
 
 	for (i = 0; i < NUM_CHANNELS; i++) {
-		if ((_channels[i].chan == NULL || _channels[i].id == -1) && !_channels[i].handle.isActive()) {
+		if ((_channels[i].chan == NULL || _channels[i].id == -1) && !_mixer->isSoundHandleActive(_channels[i].handle)) {
 			_channels[i].chan = c;
 			_channels[i].id = track;
 			return;
@@ -120,7 +120,7 @@ bool SmushMixer::handleFrame() {
 				}
 
 				if (_mixer->isReady()) {
-					if (!_channels[i].handle.isActive()) {
+					if (!_mixer->isSoundHandleActive(_channels[i].handle)) {
 						_channels[i].stream = makeAppendableAudioStream(rate, flags, 500000);
 						_mixer->playInputStream(SoundMixer::kSFXSoundType, &_channels[i].handle, _channels[i].stream);
 					}
-- 
cgit v1.2.3