[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.88,1.89

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv12024

Modified Files:
	imuse_digi.cpp 
Log Message:
corrections for pan control

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- imuse_digi.cpp	26 Dec 2003 15:48:41 -0000	1.88
+++ imuse_digi.cpp	26 Dec 2003 16:44:25 -0000	1.89
@@ -743,12 +743,13 @@
 				_channel[l].toBeRemoved = true;
 			}
 
+			int pan = (_channel[l].pan != 64) ? 2 * _channel[l].pan - 127 : 0;
 			if (_scumm->_mixer->isReady()) {
 				if (!_channel[l].handle.isActive())
 					_scumm->_mixer->newStream(&_channel[l].handle, _channel[l].freq,
 											_channel[l].mixerFlags, 100000);
 				_scumm->_mixer->setChannelVolume(_channel[l].handle, _channel[l].vol / 1000);
-				_scumm->_mixer->setChannelPan(_channel[l].handle, _channel[l].pan);
+				_scumm->_mixer->setChannelPan(_channel[l].handle, pan);
 				_scumm->_mixer->appendStream(_channel[l].handle, _channel[l].data + _channel[l].offset, mixer_size);
 			}
 			_channel[l].offset += mixer_size;
@@ -788,7 +789,7 @@
 			} else {
 				error("IMuseDigital::startSound() unknown condition");
 			}
-			_channel[l].pan = 0;
+			_channel[l].pan = 64;
 			_channel[l].vol = 127 * 1000;
 			_channel[l].volFadeDest = 0;
 			_channel[l].volFadeStep = 0;
@@ -903,9 +904,7 @@
 					if (_scumm->_actorToPrintStrFor != 0xFF && _scumm->_actorToPrintStrFor != 0) {
 						Actor *a = _scumm->derefActor(_scumm->_actorToPrintStrFor, "playBundleSound");
 						_channel[l].freq = (_channel[l].freq * a->talkFrequency) / 256;
-
-						// Adjust to fit the mixer's notion of panning.
-						_channel[l].pan = (a->talkPan != 64) ? 2 * a->talkPan - 127 : 0;
+						_channel[l].pan = a->talkPan;
 					}
 				}