[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.28,1.29 gameDetector.h,1.10,1.11

[Max Horn]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv13122/base

Modified Files:
	gameDetector.cpp gameDetector.h 
Log Message:
removed the kDefault*Volume constants

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gameDetector.cpp	14 Oct 2003 07:52:32 -0000	1.28
+++ gameDetector.cpp	15 Oct 2003 23:16:52 -0000	1.29
@@ -115,6 +115,15 @@
 #endif
 
 
+/** Default sound/music volumes.
+ * @todo move this to a better place.
+ */
+enum {
+	kDefaultMasterVolume = 192,
+	kDefaultSFXVolume = 192,
+	kDefaultMusicVolume = 192
+};
+
 struct GraphicsMode {
 	const char *name;
 	const char *description;
@@ -186,9 +195,9 @@
 #endif
 
 	// Sound & Music
-	ConfMan.registerDefault("master_volume", kDefaultMasterVolume);
-	ConfMan.registerDefault("music_volume", kDefaultMusicVolume);
-	ConfMan.registerDefault("sfx_volume", kDefaultSFXVolume);
+	ConfMan.registerDefault("master_volume", 192);
+	ConfMan.registerDefault("music_volume", 192);
+	ConfMan.registerDefault("sfx_volume", 192);
 
 	ConfMan.registerDefault("multi_midi", false);
 	ConfMan.registerDefault("native_mt32", false);

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gameDetector.h	14 Oct 2003 07:52:32 -0000	1.10
+++ gameDetector.h	15 Oct 2003 23:16:52 -0000	1.11
@@ -32,15 +32,6 @@
 class SoundMixer;
 class Plugin;
 
-/** Default sound/music volumes.
- * @todo move this to a better place.
- */
-enum {
-	kDefaultMasterVolume = 192,
-	kDefaultSFXVolume = 192,
-	kDefaultMusicVolume = 192
-};
-
 /** Global (shared) game feature flags. */
 enum {
 	GF_DEFAULT_TO_1X_SCALER = 1 << 31