[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.289,1.290 sound.cpp,1.406,1.407

[Max Horn]

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

Modified Files:
	scumm.cpp sound.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: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -d -r1.289 -r1.290
--- scumm.cpp	25 Dec 2004 23:43:05 -0000	1.289
+++ scumm.cpp	27 Dec 2004 00:26:56 -0000	1.290
@@ -1388,11 +1388,11 @@
 		_musicEngine->setMusicVolume(soundVolumeMusic);
 	}
 
-	_mixer->setVolume(soundVolumeSfx);
-	_mixer->setMusicVolume(soundVolumeMusic);
+	_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, soundVolumeSfx);
+	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, soundVolumeMusic);
 
 	if (_imuseDigital) {
-		_mixer->setVolume(255);
+		_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, 255);
 		_imuseDigital->setGroupMusicVolume(soundVolumeMusic / 2);
 		_imuseDigital->setGroupSfxVolume(soundVolumeSfx / 2);
 		_imuseDigital->setGroupVoiceVolume(soundVolumeSpeech / 2);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -d -r1.406 -r1.407
--- sound.cpp	17 Dec 2004 22:27:15 -0000	1.406
+++ sound.cpp	27 Dec 2004 00:26:56 -0000	1.407
@@ -1029,7 +1029,7 @@
 		//_vm->_imuseDigital->stopSound(kTalkSoundID);
 		_vm->_imuseDigital->startVoice(kTalkSoundID, input);
 	} else {
-		_vm->_mixer->playInputStream(handle, input, false, id);
+		_vm->_mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, input, id);
 	}
 }
 
@@ -1122,7 +1122,7 @@
 }
 
 bool Sound::isSfxFinished() const {
-	return !_vm->_mixer->hasActiveSFXChannel();
+	return !_vm->_mixer->hasActiveChannelOfType(SoundMixer::kSFXAudioDataType);
 }
 
 // We use a real timer in an attempt to get better sync with CD tracks. This is