[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.93,1.94

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv29359

Modified Files:
	mixer.cpp 
Log Message:
fix Vorbis music volume

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- mixer.cpp	2 Aug 2003 00:29:53 -0000	1.93
+++ mixer.cpp	2 Aug 2003 02:11:15 -0000	1.94
@@ -1183,7 +1183,6 @@
 #endif
 
 void ChannelVorbis::mix(int16 *data, uint len) {
-
 #ifdef SOX_HACK
 	assert(_input);
 	assert(_converter);
@@ -1194,7 +1193,7 @@
 		return;
 	}
 
-	const int volume = _mixer->getVolume();
+	const int volume = isMusicChannel() ? _mixer->getMusicVolume() : _mixer->getVolume();
 	st_size_t tmpLen = len;
 	_converter->flow(*_input, data, &tmpLen, volume);
 #else