[Scummvm-cvs-logs] scummvm master -> 87d7044a3ffdb9dc3de668f5871a588c4221d9fb

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e99dcac2f6 AUDIO: Set default values for the MT-32 and GM device settings
87d7044a3f AUDIO: Removed comment about MDT_PREFER_MT32 and the MT-32 emulator


Commit: e99dcac2f6888cc23828dd0b95c92069976c5111
    https://github.com/scummvm/scummvm/commit/e99dcac2f6888cc23828dd0b95c92069976c5111
Author: md5 (md5 at scummvm.org)
Date: 2011-03-01T02:22:19-08:00

Commit Message:
AUDIO: Set default values for the MT-32 and GM device settings

This fixes the case where an MT-32 music type is erroneously returned with
the default GUI audio settings if an engine specifies MDT_PREFER_MT32. Many
thanks to wjp and fuzzie for their help and work on this

Changed paths:
    base/commandLine.cpp



diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 3621837..f920dd0 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -178,6 +178,9 @@ void registerDefaults() {
 	ConfMan.registerDefault("midi_gain", 100);
 //	ConfMan.registerDefault("music_driver", ???);
 
+	ConfMan.registerDefault("mt32_device", "null");
+	ConfMan.registerDefault("gm_device", "null");
+
 	ConfMan.registerDefault("cdrom", 0);
 
 	// Game specific


Commit: 87d7044a3ffdb9dc3de668f5871a588c4221d9fb
    https://github.com/scummvm/scummvm/commit/87d7044a3ffdb9dc3de668f5871a588c4221d9fb
Author: md5 (md5 at scummvm.org)
Date: 2011-03-01T02:24:28-08:00

Commit Message:
AUDIO: Removed comment about MDT_PREFER_MT32 and the MT-32 emulator

Changed paths:
    audio/mididrv.h



diff --git a/audio/mididrv.h b/audio/mididrv.h
index 6a8d174..eed8c41 100644
--- a/audio/mididrv.h
+++ b/audio/mididrv.h
@@ -80,11 +80,6 @@ enum MusicType {
  * does not match the requirements of a game engine. With these flags, more
  * priority is given to an MT-32 device, or a GM device respectively.
  *
- * In desktop systems (where the MT-32 emulator is enabled), if no music driver
- * is selected in the options, MDT_PREFER_MT32 results in ending up with the
- * MT-32 emulator being chosen as the "optimal" music setting (unless, of course,
- * a real MT-32 is present in the user's system).
- *
  * @todo Rename MidiDriverFlags to MusicDriverFlags
  */
 enum MidiDriverFlags {