[Scummvm-cvs-logs] CVS: scummvm/sword2 controls.cpp,1.87,1.88 sound.cpp,1.56,1.57 sword2.cpp,1.138,1.139

Max Horn fingolfin at users.sourceforge.net
Wed Mar 9 10:14:26 CET 2005


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

Modified Files:
	controls.cpp sound.cpp sword2.cpp 
Log Message:
changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names

Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/controls.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- controls.cpp	21 Feb 2005 08:16:45 -0000	1.87
+++ controls.cpp	9 Mar 2005 18:12:51 -0000	1.88
@@ -945,9 +945,9 @@
 	_speechSwitch->setValue(!_vm->_sound->isSpeechMute());
 	_fxSwitch->setValue(!_vm->_sound->isFxMute());
 
-	_musicSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kMusicAudioDataType));
-	_speechSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kSpeechAudioDataType));
-	_fxSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kSFXAudioDataType));
+	_musicSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kMusicSoundType));
+	_speechSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kSpeechSoundType));
+	_fxSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kSFXSoundType));
 
 	_gfxSlider->setValue(_vm->_screen->getRenderLevel());
 	_gfxPreview->setState(_vm->_screen->getRenderLevel());
@@ -997,7 +997,7 @@
 	if (widget == _musicSwitch) {
 		_vm->_sound->muteMusic(result != 0);
 	} else if (widget == _musicSlider) {
-		_vm->_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, result);
+		_vm->_mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, result);
 		_vm->_sound->muteMusic(result == 0);
 		_musicSwitch->setValue(result != 0);
 	} else if (widget == _speechSlider) {
@@ -1015,9 +1015,9 @@
 		_vm->_sound->muteSpeech(!_speechSwitch->getValue());
 		_vm->_sound->muteFx(!_fxSwitch->getValue());
 		_vm->_sound->setReverseStereo(_reverseStereoSwitch->getValue());
-		_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, _musicSlider->getValue());
-		_mixer->setVolumeForSoundType(SoundMixer::kSpeechAudioDataType, _speechSlider->getValue());
-		_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, _fxSlider->getValue());
+		_mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, _musicSlider->getValue());
+		_mixer->setVolumeForSoundType(SoundMixer::kSpeechSoundType, _speechSlider->getValue());
+		_mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, _fxSlider->getValue());
 		_vm->_screen->setRenderLevel(_gfxSlider->getValue());
 
 		_vm->writeSettings();

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- sound.cpp	3 Mar 2005 08:34:01 -0000	1.56
+++ sound.cpp	9 Mar 2005 18:12:52 -0000	1.57
@@ -81,7 +81,7 @@
 	_mixBuffer = NULL;
 	_mixBufferLen = 0;
 
-	_vm->_mixer->setupPremix(this, SoundMixer::kMusicAudioDataType);
+	_vm->_mixer->setupPremix(this, SoundMixer::kMusicSoundType);
 }
 
 Sound::~Sound() {
@@ -247,7 +247,7 @@
 }
 
 int32 Sound::playFx(FxQueueEntry *fx) {
-	return playFx(&fx->handle, fx->data, fx->len, fx->volume, fx->pan, (fx->type == FX_LOOP), SoundMixer::kSFXAudioDataType);
+	return playFx(&fx->handle, fx->data, fx->len, fx->volume, fx->pan, (fx->type == FX_LOOP), SoundMixer::kSFXSoundType);
 }
 
 int32 Sound::playFx(PlayingSoundHandle *handle, byte *data, uint32 len, uint8 vol, int8 pan, bool loop, SoundMixer::SoundType soundType) {

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- sword2.cpp	27 Feb 2005 16:11:17 -0000	1.138
+++ sword2.cpp	9 Mar 2005 18:12:52 -0000	1.139
@@ -188,9 +188,9 @@
 }
 
 void Sword2Engine::readSettings() {
-	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume"));
-	_mixer->setVolumeForSoundType(SoundMixer::kSpeechAudioDataType, ConfMan.getInt("speech_volume"));
-	_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
 	setSubtitles(ConfMan.getBool("subtitles"));
 	_sound->muteMusic(ConfMan.getBool("music_mute"));
 	_sound->muteSpeech(ConfMan.getBool("speech_mute"));
@@ -201,9 +201,9 @@
 }
 
 void Sword2Engine::writeSettings() {
-	ConfMan.set("music_volume", _mixer->getVolumeForSoundType(SoundMixer::kMusicAudioDataType));
-	ConfMan.set("speech_volume", _mixer->getVolumeForSoundType(SoundMixer::kSpeechAudioDataType));
-	ConfMan.set("sfx_volume", _mixer->getVolumeForSoundType(SoundMixer::kSFXAudioDataType));
+	ConfMan.set("music_volume", _mixer->getVolumeForSoundType(SoundMixer::kMusicSoundType));
+	ConfMan.set("speech_volume", _mixer->getVolumeForSoundType(SoundMixer::kSpeechSoundType));
+	ConfMan.set("sfx_volume", _mixer->getVolumeForSoundType(SoundMixer::kSFXSoundType));
 	ConfMan.set("music_mute", _sound->isMusicMute());
 	ConfMan.set("speech_mute", _sound->isSpeechMute());
 	ConfMan.set("sfx_mute", _sound->isFxMute());





More information about the Scummvm-git-logs mailing list