[Scummvm-cvs-logs] CVS: scummvm readme.txt,1.44,1.45 gameDetector.cpp,1.54,1.55 gameDetector.h,1.11,1.12 scummvm.cpp,1.134,1.135

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv23742

Modified Files:
	readme.txt gameDetector.cpp gameDetector.h scummvm.cpp 
Log Message:
automatic detecion of MT32 vs. GM midi; removed obsolete -r command line option

Index: readme.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/readme.txt,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- readme.txt	4 May 2002 00:08:22 -0000	1.44
+++ readme.txt	4 May 2002 00:20:38 -0000	1.45
@@ -228,7 +228,6 @@
         -g<mode>   - Select graphics scaler. See below.
         -f         - Full-screen mode.
         -n         - Disable subtitles. Use with games that have voice.
-        -r         - Enable Roland conversion. Try if music sounds incorrect.
         -a         - Enable amiga pal conversion, for playing Amiga versions
         -d[<num>]  - Set debug verbosity to <num>
         -w[<file>] - Write configuration file

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- gameDetector.cpp	4 May 2002 00:06:40 -0000	1.54
+++ gameDetector.cpp	4 May 2002 00:20:38 -0000	1.55
@@ -53,7 +53,6 @@
 	"\t-m<num>    - set music volume to <num> (0-100)\n"
 	"\t-s<num>    - set sfx volume to <num> (0-255)\n"
 	"\t-e<mode>   - set music engine (see readme.txt for details)\n"
-	"\t-r         - emulate roland mt32 instruments\n"
 	"\t-f         - fullscreen mode\n"
 	"\t-g<mode>   - graphics mode (normal,2x,3x,2xsai,super2xsai,supereagle,advmame2x)\n"
 	"\t-a         - specify game is amiga version\n"
@@ -93,12 +92,6 @@
 	if ((val = scummcfg->get("sfx_volume")))
 		_sfx_volume = atoi(val);
 
-	if ((val = scummcfg->get("mt32emulate")))
-		if (!scumm_stricmp(val, "true"))
-			_mt32emulate = true;
-		else
-			_mt32emulate = false;
-	
 	if ((val = scummcfg->get("nosubtitles")))
 		if (!scumm_stricmp(val, "true"))
 			_noSubtitles = true;
@@ -210,9 +203,8 @@
 				scummcfg->set("path", _gameDataPath);
 				break;
 			case 'r':
-				CHECK_OPTION();
-				_mt32emulate = true;
-				scummcfg->set("mt32emulate", "true");
+				HANDLE_OPTION();
+				// Ignore -r for now, to ensure backward compatibility.
 				break;
 			case 's':
 				HANDLE_OPTION();

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gameDetector.h	27 Apr 2002 16:58:29 -0000	1.11
+++ gameDetector.h	4 May 2002 00:20:39 -0000	1.12
@@ -36,7 +36,6 @@
 
 	byte _music_volume;
 	byte _sfx_volume;
-	bool _mt32emulate;
 	bool _amiga;
 
 	uint16 _debugMode;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- scummvm.cpp	3 May 2002 18:05:33 -0000	1.134
+++ scummvm.cpp	4 May 2002 00:20:39 -0000	1.135
@@ -1392,7 +1392,6 @@
 			imuse = IMuse::create_midi(syst, detector->createMidi());
 		}
 		
-		imuse->property(IMuse::PROP_MT32_EMULATE, detector->_mt32emulate);
 		if (detector->_gameTempo != 0)
 			imuse->property(IMuse::PROP_TEMPO_BASE, detector->_gameTempo);