[Scummvm-cvs-logs] scummvm master -> 40422441af8b392a3ba6c12c85110ee692c304da

[athrxx]

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

Summary:
40422441af AUDIO: some more text tweaks


Commit: 40422441af8b392a3ba6c12c85110ee692c304da
    https://github.com/scummvm/scummvm/commit/40422441af8b392a3ba6c12c85110ee692c304da
Author: athrxx (athrxx at scummvm.org)
Date: 2011-06-06T08:26:36-07:00

Commit Message:
AUDIO: some more text tweaks

Changed paths:
    audio/mididrv.cpp
    audio/softsynth/mt32.cpp



diff --git a/audio/mididrv.cpp b/audio/mididrv.cpp
index 2cccfcc..22d473a 100644
--- a/audio/mididrv.cpp
+++ b/audio/mididrv.cpp
@@ -215,7 +215,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
 	// we try to determine a suitable and "optimal" music driver.
 	const MusicPlugin::List p = MusicMan.getPlugins();
 	// If only MDT_MIDI but not MDT_PREFER_MT32 or MDT_PREFER_GM is set we prefer the other devices (which will always be
-	// detected since they are hard coded and cannot be disabled.
+	// detected since they are hard coded and cannot be disabled).
 	bool skipMidi = !(flags & (MDT_PREFER_GM | MDT_PREFER_MT32));
 	while (flags != MDT_NONE) {
 		if ((flags & MDT_MIDI) && !skipMidi) {
@@ -293,7 +293,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
 		}
 
 		// The order in this list is important, since this is the order of preference
-		// (e.g. MT_ADLIB is checked before MT_PCJR and MT_PCSPK for a good reason.
+		// (e.g. MT_ADLIB is checked before MT_PCJR and MT_PCSPK for a good reason).
 		// Detection flags get removed after detection attempt to avoid further attempts.
 		if (flags & MDT_TOWNS) {
 			tp = MT_TOWNS;
diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp
index ad80af0..304be06 100644
--- a/audio/softsynth/mt32.cpp
+++ b/audio/softsynth/mt32.cpp
@@ -561,7 +561,7 @@ MusicDevices MT32EmuMusicPlugin::getDevices() const {
 bool MT32EmuMusicPlugin::checkDevice(MidiDriver::DeviceHandle) const {
 	if (!((Common::File::exists("MT32_CONTROL.ROM") && Common::File::exists("MT32_PCM.ROM")) ||
 		(Common::File::exists("CM32L_CONTROL.ROM") && Common::File::exists("CM32L_PCM.ROM")))) {
-			warning("The MT-32 emulator requires the following 2 files (not bundled with ScummVM:\n either 'MT32_CONTROL.ROM' and 'MT32_PCM.ROM', or 'CM32L_CONTROL.ROM' and 'CM32L_PCM.ROM'");
+			warning("The MT-32 emulator requires one of the two following file sets (not bundled with ScummVM):\n Either 'MT32_CONTROL.ROM' and 'MT32_PCM.ROM' or 'CM32L_CONTROL.ROM' and 'CM32L_PCM.ROM'");
 			return false;
 	}