From e9269257f3da947eca3fb167b279fbe91650157a Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 24 Dec 2003 00:25:18 +0000
Subject: turned PlayingSoundHandle into an 'opaque' (well not really :-) data
 type, mainly because people kept (accidentally and sometimes on purpose :-)
 misusing them

svn-id: r11881
---
 scumm/smush/smush_mixer.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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

diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp
index 10bc983960..3c9b831d78 100644
--- a/scumm/smush/smush_mixer.cpp
+++ b/scumm/smush/smush_mixer.cpp
@@ -39,7 +39,6 @@ SmushMixer::SmushMixer(SoundMixer *m) :
 	for (int32 i = 0; i < NUM_CHANNELS; i++) {
 		_channels[i].id = -1;
 		_channels[i].chan = NULL;
-		_channels[i].handle = 0;
 	}
 }
 
@@ -70,19 +69,17 @@ void SmushMixer::addChannel(SmushChannel *c) {
 	}
 
 	for (i = 0; i < NUM_CHANNELS; i++) {
-		if ((_channels[i].chan == NULL || _channels[i].id == -1) && _channels[i].handle == 0) {
+		if ((_channels[i].chan == NULL || _channels[i].id == -1) && !_channels[i].handle.isActive()) {
 			_channels[i].chan = c;
 			_channels[i].id = track;
-			_channels[i].handle = 0;
 			return;
 		}
 	}
 
 	for (i = 0; i < NUM_CHANNELS; i++) {
-		warning("channel %d : %p(%d, %d) %d %d", i, (void *)_channels[i].chan, 
+		warning("channel %d : %p(%d, %d) %d", i, (void *)_channels[i].chan, 
 			_channels[i].chan ? _channels[i].chan->getTrackIdentifier() : -1, 
-			_channels[i].chan ? _channels[i].chan->isTerminated() : 1, 
-			_channels[i].handle);
+			_channels[i].chan ? _channels[i].chan->isTerminated() : 1);
 	}
 
 	error("SmushMixer::addChannel(%d): no channel available", track);
@@ -122,7 +119,7 @@ bool SmushMixer::handleFrame() {
 				}
 
 				if (_silentMixer == false) {
-					if (_channels[i].handle == 0)
+					if (!_channels[i].handle.isActive())
 						_mixer->newStream(&_channels[i].handle, rate, flags, 500000);
 					_mixer->appendStream(_channels[i].handle, data, size);
 				}
-- 
cgit v1.2.3