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 ++--
 scumm/smush/smush_mixer.h    | 2 +-
 scumm/smush/smush_player.cpp | 2 +-
 scumm/smush/smush_player.h   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'scumm/smush')

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);
 					}
diff --git a/scumm/smush/smush_mixer.h b/scumm/smush/smush_mixer.h
index 051303997e..b46366d182 100644
--- a/scumm/smush/smush_mixer.h
+++ b/scumm/smush/smush_mixer.h
@@ -39,7 +39,7 @@ private:
 	struct channels {
 		int id;
 		SmushChannel *chan;
-		PlayingSoundHandle handle;
+		SoundHandle handle;
 		AppendableAudioStream *stream;
 	} _channels[NUM_CHANNELS];
 
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 093108082e..bf67ee2ed0 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -507,7 +507,7 @@ void SmushPlayer::handleIACT(Chunk &b) {
 						}
 					} while (--count);
 
-					if (!_IACTchannel.isActive()) {
+					if (!_vm->_mixer->isSoundHandleActive(_IACTchannel)) {
 						_IACTstream = makeAppendableAudioStream(22050, SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 400000);
 						_vm->_mixer->playInputStream(SoundMixer::kSFXSoundType, &_IACTchannel, _IACTstream);
 					}
diff --git a/scumm/smush/smush_player.h b/scumm/smush/smush_player.h
index eeb99a2d4f..1b3a656ef1 100644
--- a/scumm/smush/smush_player.h
+++ b/scumm/smush/smush_player.h
@@ -56,10 +56,10 @@ private:
 	bool _skips[37];
 	int32 _frame;
 
-	PlayingSoundHandle _IACTchannel;
+	SoundHandle _IACTchannel;
 	AppendableAudioStream *_IACTstream;
 
-	PlayingSoundHandle _compressedFileSoundHandle;
+	SoundHandle _compressedFileSoundHandle;
 	bool _compressedFileMode;
 	File _compressedFile;
 	byte _IACToutput[4096];
-- 
cgit v1.2.3