From 8b12998c72409743139f694ae7a23722a8052082 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 5 Jan 2008 20:49:18 +0000
Subject: Use souStreamUsed to distinguish between 'stream' and 'streamSou'
 usage

svn-id: r30257
---
 engines/scumm/imuse_digi/dimuse.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'engines/scumm/imuse_digi/dimuse.cpp')

diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index 2f097e6c0e..ff5731f526 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -277,7 +277,8 @@ void IMuseDigital::callback() {
 			if (track->volGroupId == 3)
 				type = Audio::Mixer::kMusicSoundType;
 
-			if (track->stream) {
+			if (!track->souStreamUsed) {
+				assert(track->stream);
 				byte *tmpSndBufferPtr = NULL;
 				int32 curFeedSize = 0;
 
@@ -357,7 +358,8 @@ void IMuseDigital::callback() {
 					feedSize -= curFeedSize;
 					assert(feedSize >= 0);
 				} while (feedSize != 0);
-			} else if (track->streamSou) {
+			} else {
+				assert(track->streamSou);
 				if (_mixer->isReady()) {
 					// FIXME: Can't we replace track->mixerStreamRunning by
 					// _mixer->isSoundHandleActive(track->mixChanHandle) ?
-- 
cgit v1.2.3