[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.22,1.23 sound.cpp,1.141,1.142

[Max Horn]

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

Modified Files:
	imuse_digi.cpp sound.cpp 
Log Message:
Change names of the stream API in the mixer; added endStream method (stop() halts stream immediately; endStream() lets it first finish playing)

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- imuse_digi.cpp	21 Jun 2003 23:29:34 -0000	1.22
+++ imuse_digi.cpp	22 Jun 2003 11:47:03 -0000	1.23
@@ -715,7 +715,7 @@
 		if (_channel[l]._used) {
 			if (_channel[l]._toBeRemoved == true) {
 				if (_channel[l]._mixerChannel != -1) {
-					_scumm->_mixer->stop(_channel[l]._mixerChannel);
+					_scumm->_mixer->endStream(_channel[l]._mixerChannel);
 					_channel[l]._mixerChannel = -1;
 				}
 				if (_scumm->_mixer->_channels[l] == NULL) {
@@ -824,10 +824,10 @@
 
 			if (_scumm->_silentDigitalImuse == false) {
 				if (_channel[l]._mixerChannel == -1) {
-					_channel[l]._mixerChannel = _scumm->_mixer->playStream(buf, mixer_size,
+					_channel[l]._mixerChannel = _scumm->_mixer->newStream(buf, mixer_size,
 					                           _channel[l]._freq, _channel[l]._mixerFlags, 100000);
 				} else {
-					_scumm->_mixer->append(_channel[l]._mixerChannel, buf, mixer_size);
+					_scumm->_mixer->appendStream(_channel[l]._mixerChannel, buf, mixer_size);
 				}
 			}
 			free(buf);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- sound.cpp	22 Jun 2003 01:55:53 -0000	1.141
+++ sound.cpp	22 Jun 2003 11:47:03 -0000	1.142
@@ -1170,16 +1170,16 @@
 		final_size = _outputMixerSize;
 		memcpy(buffer, ptr, _outputMixerSize);
 	} else {
-		warning("Sound::bundleMusicHandler TODO: more playStream options...");
+		warning("Sound::bundleMusicHandler TODO: more newStream options...");
 		return;
 	}
 
 	_bundleMusicPosition += final_size;
 	if (_bundleMusicTrack == -1) {
-		_bundleMusicTrack = _scumm->_mixer->playStream(buffer, final_size, rate,
+		_bundleMusicTrack = _scumm->_mixer->newStream(buffer, final_size, rate,
 															SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO, 300000);
 	} else {
-		_scumm->_mixer->append(_bundleMusicTrack, buffer, final_size);
+		_scumm->_mixer->appendStream(_bundleMusicTrack, buffer, final_size);
 	}
 	free(buffer);
 }