aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush
diff options
context:
space:
mode:
authorMax Horn2004-01-29 18:15:27 +0000
committerMax Horn2004-01-29 18:15:27 +0000
commit176aa74827decbeb3efee979b34599e109a863a2 (patch)
tree45126cfdf07959df5af6a7c76370376b4c225106 /scumm/smush
parentbcedf44957cf0a688ad1a6a455f5f095d3ebd7d3 (diff)
downloadscummvm-rg350-176aa74827decbeb3efee979b34599e109a863a2.tar.gz
scummvm-rg350-176aa74827decbeb3efee979b34599e109a863a2.tar.bz2
scummvm-rg350-176aa74827decbeb3efee979b34599e109a863a2.zip
Renamed the 'pan' effect of the mixer to 'balance', since that is what we actually do; applied patch #886786 which corrects a bug in the balance code
svn-id: r12665
Diffstat (limited to 'scumm/smush')
-rw-r--r--scumm/smush/smush_mixer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp
index 7f8ee10722..d329804f5f 100644
--- a/scumm/smush/smush_mixer.cpp
+++ b/scumm/smush/smush_mixer.cpp
@@ -122,7 +122,7 @@ bool SmushMixer::handleFrame() {
if (!_channels[i].handle.isActive())
_mixer->newStream(&_channels[i].handle, rate, flags, 400000);
_mixer->setChannelVolume(_channels[i].handle, vol);
- _mixer->setChannelPan(_channels[i].handle, pan);
+ _mixer->setChannelBalance(_channels[i].handle, pan);
_mixer->appendStream(_channels[i].handle, data, size);
}
free(data);