[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.cpp,1.15,1.16 smush_player.cpp,1.45,1.46

[Pawel Kolodziejski]

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

Modified Files:
	smush_mixer.cpp smush_player.cpp 
Log Message:
added mixer features: volume and pan control per channel

Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- smush_mixer.cpp	6 Jul 2003 01:41:34 -0000	1.15
+++ smush_mixer.cpp	31 Aug 2003 20:26:20 -0000	1.16
@@ -137,7 +137,7 @@
 
 				if (_silentMixer == false) {
 					if (_channels[i].mixer_index == -1) {
-						_channels[i].mixer_index = _mixer->newStream(data, size, rate, flags, 500000);
+						_channels[i].mixer_index = _mixer->newStream(data, size, rate, flags, 500000, 127, 0);
 					} else {
 						_mixer->appendStream(_channels[i].mixer_index, data, size);
 					}

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- smush_player.cpp	18 Aug 2003 15:13:15 -0000	1.45
+++ smush_player.cpp	31 Aug 2003 20:26:20 -0000	1.46
@@ -463,7 +463,7 @@
 
 					if (_IACTchannel == -1) {
 						_IACTchannel = _scumm->_mixer->newStream(output_data, 0x1000, 22050,
-															SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 200000);
+															SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 200000, 127, 0);
 					} else {
 						_scumm->_mixer->appendStream(_IACTchannel, output_data, 0x1000);
 					}