diff options
author | Paweł Kołodziejski | 2004-06-19 17:22:18 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2004-06-19 17:22:18 +0000 |
commit | 4b9aa09f03ec16179c2f74dc8c6b8735e9f1fd74 (patch) | |
tree | 9cf3256b4c7d52c94cd100f1ad2d49669f989121 /scumm | |
parent | f5c8c6664233c1f013322d69dbf9fad4d7651d84 (diff) | |
download | scummvm-rg350-4b9aa09f03ec16179c2f74dc8c6b8735e9f1fd74.tar.gz scummvm-rg350-4b9aa09f03ec16179c2f74dc8c6b8735e9f1fd74.tar.bz2 scummvm-rg350-4b9aa09f03ec16179c2f74dc8c6b8735e9f1fd74.zip |
moved a bit
svn-id: r13968
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/imuse_digi/dimuse.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp index 6c6f620a1f..73beb1a9d2 100644 --- a/scumm/imuse_digi/dimuse.cpp +++ b/scumm/imuse_digi/dimuse.cpp @@ -203,19 +203,6 @@ void IMuseDigital::callback() { track->mixerVol = vol; track->mixerPan = pan; - if (track->stream2) { - if (_vm->_mixer->isReady()) { - if (!track->started) { - track->started = true; - _vm->_mixer->playInputStream(&track->handle, track->stream2, false, vol, pan, -1, false); - } else { - _vm->_mixer->setChannelVolume(track->handle, vol); - _vm->_mixer->setChannelBalance(track->handle, pan); - } - continue; - } - } - if (track->stream) { byte *data = NULL; int32 result = 0; @@ -296,6 +283,16 @@ void IMuseDigital::callback() { mixer_size -= result; assert(mixer_size >= 0); } while (mixer_size != 0); + } else if (track->stream2) { + if (_vm->_mixer->isReady()) { + if (!track->started) { + track->started = true; + _vm->_mixer->playInputStream(&track->handle, track->stream2, false, vol, pan, -1, false); + } else { + _vm->_mixer->setChannelVolume(track->handle, vol); + _vm->_mixer->setChannelBalance(track->handle, pan); + } + } } } } |