[Scummvm-cvs-logs] SF.net SVN: scummvm: [32851] scummvm/branches/gsoc2008-rtl/engines/scumm

[cpage88 at users.sourceforge.net]

Revision: 32851
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32851&view=rev
Author:   cpage88
Date:     2008-06-30 10:44:21 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
Scumm sound settings can now be changed from the gmm

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/scumm/input.cpp
    scummvm/branches/gsoc2008-rtl/engines/scumm/saveload.cpp
    scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.cpp
    scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.h

Modified: scummvm/branches/gsoc2008-rtl/engines/scumm/input.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/scumm/input.cpp	2008-06-30 17:24:23 UTC (rev 32850)
+++ scummvm/branches/gsoc2008-rtl/engines/scumm/input.cpp	2008-06-30 17:44:21 UTC (rev 32851)
@@ -514,7 +514,7 @@
 			vol = Audio::Mixer::kMaxMixerVolume;
 
 		ConfMan.setInt("music_volume", vol);
-		updateSoundSettings();
+		syncSoundSettings();
 
 	} else if (lastKeyHit.ascii == '-' || lastKeyHit.ascii == '+') { // Change text speed
 		if (lastKeyHit.ascii == '+' && _defaultTalkDelay > 0)

Modified: scummvm/branches/gsoc2008-rtl/engines/scumm/saveload.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/scumm/saveload.cpp	2008-06-30 17:24:23 UTC (rev 32850)
+++ scummvm/branches/gsoc2008-rtl/engines/scumm/saveload.cpp	2008-06-30 17:44:21 UTC (rev 32851)
@@ -275,7 +275,7 @@
 	delete in;
 
 	// Update volume settings
-	updateSoundSettings();
+	syncSoundSettings();
 
 	// Init NES costume data
 	if (_game.platform == Common::kPlatformNES) {

Modified: scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.cpp	2008-06-30 17:24:23 UTC (rev 32850)
+++ scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.cpp	2008-06-30 17:44:21 UTC (rev 32851)
@@ -1108,7 +1108,7 @@
 	if (_game.version >= 5 && _game.version <= 7)
 		_sound->setupSound();
 
-	updateSoundSettings();
+	syncSoundSettings();
 
 	return 0;
 }
@@ -1667,7 +1667,7 @@
 	}
 }
 
-void ScummEngine::updateSoundSettings() {
+void ScummEngine::syncSoundSettings() {
 
 	// Sync the engine with the config manager
 	int soundVolumeMusic = ConfMan.getInt("music_volume");
@@ -2309,7 +2309,7 @@
 	if (!_mainMenuDialog)
 		_mainMenuDialog = new MainMenuDialog(this);
 	runDialog(*_mainMenuDialog);
-	updateSoundSettings();
+	syncSoundSettings();
 }
 
 void ScummEngine::confirmExitDialog() {

Modified: scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.h	2008-06-30 17:24:23 UTC (rev 32850)
+++ scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.h	2008-06-30 17:44:21 UTC (rev 32851)
@@ -462,7 +462,7 @@
 	virtual void loadLanguageBundle() {}
 	void loadCJKFont();
 	void setupMusic(int midi);
-	void updateSoundSettings();
+	virtual void syncSoundSettings();
 	void setTalkspeed(int talkspeed);
 	int getTalkspeed();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.