diff options
| author | Max Horn | 2008-01-05 20:49:18 +0000 |
|---|---|---|
| committer | Max Horn | 2008-01-05 20:49:18 +0000 |
| commit | 8b12998c72409743139f694ae7a23722a8052082 (patch) | |
| tree | 63fc32909688270aa037006467b9ec1013fc7f34 /engines/scumm/imuse_digi/dimuse.cpp | |
| parent | c9a8d02f6ef8f2f67b6c24228ff043ba975241c5 (diff) | |
| download | scummvm-rg350-8b12998c72409743139f694ae7a23722a8052082.tar.gz scummvm-rg350-8b12998c72409743139f694ae7a23722a8052082.tar.bz2 scummvm-rg350-8b12998c72409743139f694ae7a23722a8052082.zip | |
Use souStreamUsed to distinguish between 'stream' and 'streamSou' usage
svn-id: r30257
Diffstat (limited to 'engines/scumm/imuse_digi/dimuse.cpp')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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) ? |