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

2 files changed, 3 insertions, 3 deletions

diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index bcda26a452..24f4393172 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -132,7 +132,7 @@ void IMuseDigital::callback() {
 						_vm->_mixer->playInputStream(&_track[l].handle, _track[l].stream2, true, _track[l].vol / 1000, _track[l].pan, -1, false);
 					} else {
 						_vm->_mixer->setChannelVolume(_track[l].handle, _track[l].vol / 1000);
-						_vm->_mixer->setChannelPan(_track[l].handle, pan);
+						_vm->_mixer->setChannelBalance(_track[l].handle, pan);
 					}
 					continue;
 				}
@@ -186,7 +186,7 @@ void IMuseDigital::callback() {
 
 					if (_vm->_mixer->isReady()) {
 						_vm->_mixer->setChannelVolume(_track[l].handle, _track[l].vol / 1000);
-						_vm->_mixer->setChannelPan(_track[l].handle, pan);
+						_vm->_mixer->setChannelBalance(_track[l].handle, pan);
 						_track[l].stream->append(data, result);
 						_track[l].regionOffset += result;
 						_track[l].trackOffset += result;
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);