diff options
| author | Max Horn | 2008-01-06 14:59:46 +0000 |
|---|---|---|
| committer | Max Horn | 2008-01-06 14:59:46 +0000 |
| commit | 690d38cfc4afeb04d1c8bde1baebe0c962cb1ab4 (patch) | |
| tree | 459509dfd536cfa03999fc078e81f773a698d60c /engines/scumm/imuse_digi/dimuse.cpp | |
| parent | 1ab348deb7aaf5df3a7e7ab198ac011de8cd74c9 (diff) | |
| download | scummvm-rg350-690d38cfc4afeb04d1c8bde1baebe0c962cb1ab4.tar.gz scummvm-rg350-690d38cfc4afeb04d1c8bde1baebe0c962cb1ab4.tar.bz2 scummvm-rg350-690d38cfc4afeb04d1c8bde1baebe0c962cb1ab4.zip | |
Unify mixer pan/vol setting code
svn-id: r30308
Diffstat (limited to 'engines/scumm/imuse_digi/dimuse.cpp')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp index 7af4d84676..3375d7fdfe 100644 --- a/engines/scumm/imuse_digi/dimuse.cpp +++ b/engines/scumm/imuse_digi/dimuse.cpp @@ -321,8 +321,6 @@ void IMuseDigital::callback() { curFeedSize = feedSize; if (_mixer->isReady()) { - _mixer->setChannelVolume(track->mixChanHandle, track->getVol()); - _mixer->setChannelBalance(track->mixChanHandle, track->getPan()); track->stream->queueBuffer(tmpSndBufferPtr, curFeedSize); track->regionOffset += curFeedSize; } else @@ -336,11 +334,10 @@ void IMuseDigital::callback() { feedSize -= curFeedSize; assert(feedSize >= 0); } while (feedSize != 0); - } else { - if (_mixer->isReady()) { - _mixer->setChannelVolume(track->mixChanHandle, track->getVol()); - _mixer->setChannelBalance(track->mixChanHandle, track->getPan()); - } + } + if (_mixer->isReady()) { + _mixer->setChannelVolume(track->mixChanHandle, track->getVol()); + _mixer->setChannelBalance(track->mixChanHandle, track->getPan()); } } } |