[Scummvm-cvs-logs] SF.net SVN: scummvm: [32936] scummvm/branches/gsoc2008-rtl/engines/agi
cpage88 at users.sourceforge.net
cpage88 at users.sourceforge.net
Mon Jul 7 07:51:39 CEST 2008
Revision: 32936
http://scummvm.svn.sourceforge.net/scummvm/?rev=32936&view=rev
Author: cpage88
Date: 2008-07-06 22:51:39 -0700 (Sun, 06 Jul 2008)
Log Message:
-----------
Sound settings for AGI are now configurable through the GMM
Modified Paths:
--------------
scummvm/branches/gsoc2008-rtl/engines/agi/agi.cpp
scummvm/branches/gsoc2008-rtl/engines/agi/agi.h
Modified: scummvm/branches/gsoc2008-rtl/engines/agi/agi.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agi/agi.cpp 2008-07-07 05:27:35 UTC (rev 32935)
+++ scummvm/branches/gsoc2008-rtl/engines/agi/agi.cpp 2008-07-07 05:51:39 UTC (rev 32936)
@@ -622,6 +622,7 @@
// Setup mixer
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+ _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, ConfMan.getInt("music_volume"));
const GameSettings *g;
@@ -812,4 +813,15 @@
return _rtl;
}
+void AgiEngine::syncSoundSettings() {
+ int soundVolumeMusic = ConfMan.getInt("music_volume");
+ int soundVolumeSFX = ConfMan.getInt("music_volume");
+ int soundVolumeSpeech = ConfMan.getInt("music_volume");
+
+ _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, soundVolumeMusic);
+ _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic);
+ _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolumeSFX);
+ _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech);
+}
+
} // End of namespace Agi
Modified: scummvm/branches/gsoc2008-rtl/engines/agi/agi.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/agi/agi.h 2008-07-07 05:27:35 UTC (rev 32935)
+++ scummvm/branches/gsoc2008-rtl/engines/agi/agi.h 2008-07-07 05:51:39 UTC (rev 32936)
@@ -753,6 +753,8 @@
return _gameId;
}
+ virtual void syncSoundSettings();
+
private:
int _keyQueue[KEY_QUEUE_SIZE];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list