aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorathrxx2011-06-06 16:05:55 +0200
committerathrxx2011-06-06 17:26:36 +0200
commit40422441af8b392a3ba6c12c85110ee692c304da (patch)
treee8458a6ad7ca42a56c6bac27a16aa30e7c0657c7
parent18e8e5c91eba3ad7f3eb2b9786e170d53866e195 (diff)
downloadscummvm-rg350-40422441af8b392a3ba6c12c85110ee692c304da.tar.gz
scummvm-rg350-40422441af8b392a3ba6c12c85110ee692c304da.tar.bz2
scummvm-rg350-40422441af8b392a3ba6c12c85110ee692c304da.zip
AUDIO: some more text tweaks
-rw-r--r--audio/mididrv.cpp4
-rw-r--r--audio/softsynth/mt32.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/audio/mididrv.cpp b/audio/mididrv.cpp
index 2cccfccaf8..22d473a518 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 ad80af041e..304be06afe 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;
}