[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.cpp,1.8,1.9 smush_player.cpp,1.37,1.38

[Max Horn]

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

Modified Files:
	smush_mixer.cpp smush_player.cpp 
Log Message:
modified & cleaned up the playStream/append code a bit; but this API really could stand some refinement

Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- smush_mixer.cpp	21 Jun 2003 20:57:01 -0000	1.8
+++ smush_mixer.cpp	21 Jun 2003 21:17:08 -0000	1.9
@@ -131,9 +131,9 @@
 
 				if (_silentMixer == false) {
 					if (_channels[i].mixer_index == -1) {
-						_channels[i].mixer_index = _mixer->playStream(NULL, -1, data, size, rate, flags);
+						_channels[i].mixer_index = _mixer->playStream(-1, data, size, rate, flags);
 					} else {
-						_mixer->append(_channels[i].mixer_index, data, size, rate, flags);
+						_mixer->append(_channels[i].mixer_index, data, size);
 					}
 				}
 				free(data);

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- smush_player.cpp	21 Jun 2003 19:58:38 -0000	1.37
+++ smush_player.cpp	21 Jun 2003 21:17:08 -0000	1.38
@@ -451,11 +451,10 @@
 					} while (--count);
 
 					if (_IACTchannel == -1) {
-						_IACTchannel = _scumm->_mixer->playStream(NULL, -1, output_data, 0x1000, 22050,
+						_IACTchannel = _scumm->_mixer->playStream(-1, output_data, 0x1000, 22050,
 															SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, -1, 200000);
 					} else {
-						_scumm->_mixer->append(_IACTchannel, output_data, 0x1000, 22050,
-															SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS);
+						_scumm->_mixer->append(_IACTchannel, output_data, 0x1000);
 					}
 
 					bsize -= len;