[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.cpp,1.35,1.36 smush_player.cpp,1.139,1.140

[Max Horn]

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

Modified Files:
	smush_mixer.cpp smush_player.cpp 
Log Message:
Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type

Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- smush_mixer.cpp	27 Nov 2004 17:09:05 -0000	1.35
+++ smush_mixer.cpp	27 Dec 2004 00:26:58 -0000	1.36
@@ -122,7 +122,7 @@
 				if (_mixer->isReady()) {
 					if (!_channels[i].handle.isActive()) {
 						_channels[i].stream = makeAppendableAudioStream(rate, flags, 500000);
-						_mixer->playInputStream(&_channels[i].handle, _channels[i].stream, false);
+						_mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_channels[i].handle, _channels[i].stream);
 					}
 					_mixer->setChannelVolume(_channels[i].handle, vol);
 					_mixer->setChannelBalance(_channels[i].handle, pan);

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- smush_player.cpp	21 Dec 2004 00:00:34 -0000	1.139
+++ smush_player.cpp	27 Dec 2004 00:26:58 -0000	1.140
@@ -503,7 +503,7 @@
 
 					if (!_IACTchannel.isActive()) {
 						_IACTstream = makeAppendableAudioStream(22050, SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 400000);
-						_vm->_mixer->playInputStream(&_IACTchannel, _IACTstream, false);
+						_vm->_mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_IACTchannel, _IACTstream);
 					}
 					_IACTstream->append(output_data, 0x1000);
 
@@ -1177,7 +1177,7 @@
 	if (_compressedFile.isOpen()) {
 		int size = _compressedFile.size();
 		_compressedFileMode = true;
-		_vm->_mixer->playInputStream(&_compressedFileSoundHandle, makeVorbisStream(&_compressedFile, size), false);
+		_vm->_mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_compressedFileSoundHandle, makeVorbisStream(&_compressedFile, size));
 	}
 #endif
 }