[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_track.cpp,1.42,1.43

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7113

Modified Files:
	dimuse_track.cpp 
Log Message:
fixed volume channel in fade track

Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- dimuse_track.cpp	1 Jan 2005 16:09:17 -0000	1.42
+++ dimuse_track.cpp	25 Jan 2005 21:36:01 -0000	1.43
@@ -296,10 +296,19 @@
 	fadeTrack->volFadeStep = (fadeTrack->volFadeDest - fadeTrack->vol) * 60 * (1000 / _callbackFps) / (1000 * fadeDelay);
 	fadeTrack->volFadeUsed = true;
 
+	SoundMixer::SoundType type = SoundMixer::kPlainAudioDataType;
+
+	if (fadeTrack->volGroupId == 1)
+		type = SoundMixer::kSpeechAudioDataType;
+	if (fadeTrack->volGroupId == 2)
+		type = SoundMixer::kSFXAudioDataType;
+	if (fadeTrack->volGroupId == 3)
+		type = SoundMixer::kMusicAudioDataType;
+
 	// setup 1 second stream wrapped buffer
 	int32 streamBufferSize = fadeTrack->iteration;
 	fadeTrack->stream = makeAppendableAudioStream(_sound->getFreq(fadeTrack->soundHandle), fadeTrack->mixerFlags, streamBufferSize);
-	_vm->_mixer->playInputStream(SoundMixer::kSFXAudioDataType, &fadeTrack->handle, fadeTrack->stream, -1, fadeTrack->vol / 1000, fadeTrack->pan, false);
+	_vm->_mixer->playInputStream(type, &fadeTrack->handle, fadeTrack->stream, -1, fadeTrack->vol / 1000, fadeTrack->pan, false);
 	fadeTrack->started = true;
 	fadeTrack->used = true;