[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.123.2.3,1.123.2.4

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Sat Jan 14 12:14:02 CET 2006


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

Modified Files:
      Tag: branch-0-8-0
	gameDetector.cpp 
Log Message:
Backported MIDI gain stuff to make FluidSynth a bit nicer to use.


Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.123.2.3
retrieving revision 1.123.2.4
diff -u -d -r1.123.2.3 -r1.123.2.4
--- gameDetector.cpp	31 Oct 2005 01:53:02 -0000	1.123.2.3
+++ gameDetector.cpp	14 Jan 2006 20:13:11 -0000	1.123.2.4
@@ -73,6 +73,8 @@
 	"  -m, --music-volume=NUM   Set the music volume, 0-255 (default: 192)\n"
 	"  -s, --sfx-volume=NUM     Set the sfx volume, 0-255 (default: 192)\n"
 	"  -r, --speech-volume=NUM  Set the speech volume, 0-255 (default: 192)\n"
+	"  --midi-gain=NUM          Set the gain for MIDI playback, 0-1000 (default:\n"
+        "                           100) (only supported by some MIDI drivers)\n"
 	"  -n, --subtitles          Enable subtitles (use with games that have voice)\n"
 	"  -b, --boot-param=NUM     Pass number to the boot script (boot param)\n"
 	"  -d, --debuglevel=NUM     Set debug verbosity level\n"
@@ -132,11 +134,12 @@
 	ConfMan.registerDefault("multi_midi", false);
 	ConfMan.registerDefault("native_mt32", false);
 	ConfMan.registerDefault("enable_gs", false);
+	ConfMan.registerDefault("midi_gain", 100);
 //	ConfMan.registerDefault("music_driver", ???);
 
 	ConfMan.registerDefault("cdrom", 0);
 
-	// Game specifc
+	// Game specific
 	ConfMan.registerDefault("path", "");
 	ConfMan.registerDefault("savepath", "");
 
@@ -459,6 +462,10 @@
 				settings["speech_volume"] = option;
 			END_OPTION
 
+			DO_LONG_OPTION_INT("midi-gain")
+				settings["midi_gain"] = option;
+			END_OPTION
+
 			DO_OPTION_CMD('t', "list-targets")
 				listTargets();
 				exit(0);





More information about the Scummvm-git-logs mailing list