[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.162,1.163

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2663/scummvm/sound

Modified Files:
	mixer.cpp 
Log Message:
smush tracks are not music channel, removed outdated dimuse comment

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- mixer.cpp	4 Sep 2004 13:13:23 -0000	1.162
+++ mixer.cpp	18 Sep 2004 14:31:36 -0000	1.163
@@ -465,9 +465,6 @@
 
 bool SoundMixer::hasActiveSFXChannel() {
 	// FIXME/TODO: We need to distinguish between SFX and music channels
-	// (and maybe also voice) here to work properly in iMuseDigital
-	// games. In the past that was achieve using the _beginSlots hack.
-	// Since we don't have that anymore, it's not that simple anymore.
 	Common::StackLock lock(_mutex);
 	for (int i = 0; i != NUM_CHANNELS; i++)
 		if (_channels[i] && !_channels[i]->isMusicChannel())
@@ -597,7 +594,7 @@
 
 ChannelStream::ChannelStream(SoundMixer *mixer, PlayingSoundHandle *handle,
 							uint rate, byte flags, uint32 buffer_size)
-	: Channel(mixer, handle, true) {
+	: Channel(mixer, handle, false) {
 	// Create the input stream
 	_input = makeAppendableAudioStream(rate, flags, buffer_size);