[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.140,1.141

[Max Horn]

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

Modified Files:
	sound.cpp 
Log Message:
renamed SoundMixer::hasActiveChannel->hasActiveSFXChannel, and fixed the regression in it caused by removing _beginSlots (I hope); added isActiveChannel method used by scumm/sound.cpp (this allowed me to move the Channel class from mixer.h into mixer.cpp); replaced Channel::soundFinished method by isActive

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- sound.cpp	21 Jun 2003 23:29:34 -0000	1.140
+++ sound.cpp	22 Jun 2003 01:55:53 -0000	1.141
@@ -958,7 +958,7 @@
 }
 
 bool Sound::isSfxFinished() {
-	return !_scumm->_mixer->hasActiveChannel();
+	return !_scumm->_mixer->hasActiveSFXChannel();
 }
 
 uint32 Sound::decode12BitsSample(byte *src, byte **dst, uint32 size, bool stereo = false) {
@@ -1577,7 +1577,7 @@
 		return -1;
 	}
 
-	if (_scumm->_mixer->_channels[_dig_cd_index]->soundFinished()) {
+	if (!_scumm->_mixer->isActiveChannel(_dig_cd_index)) {
 		if (_dig_cd_num_loops == -1 || --_dig_cd_num_loops > 0)
 			playMP3CDTrack(_dig_cd_track, _dig_cd_num_loops, _dig_cd_start, _dig_cd_delay);
 		else