aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorathrxx2011-05-30 18:34:27 +0200
committerathrxx2011-06-02 12:10:51 +0200
commitd61dc2574b2a54283d95184b4f53cf339841ff80 (patch)
treef8f9fbfca09d234646d8d92823a4230055faac23
parent080b590261a41ae487446675bfbf545fd4801728 (diff)
downloadscummvm-rg350-d61dc2574b2a54283d95184b4f53cf339841ff80.tar.gz
scummvm-rg350-d61dc2574b2a54283d95184b4f53cf339841ff80.tar.bz2
scummvm-rg350-d61dc2574b2a54283d95184b4f53cf339841ff80.zip
AUDIO: fix some typos in comments
-rw-r--r--audio/mididrv.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/audio/mididrv.cpp b/audio/mididrv.cpp
index 7beb76352c..5839f5b9d7 100644
--- a/audio/mididrv.cpp
+++ b/audio/mididrv.cpp
@@ -197,7 +197,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
// detected since they are hard coded and cannot be disabled.
for (int l = (flags & (MDT_PREFER_GM | MDT_PREFER_MT32)) ? 1 : 0; l < 2; ++l) {
if ((flags & MDT_MIDI) && (l == 1)) {
- // If a preferred MT32 or GM device has been selected that device gets returned
+ // If a preferred MT32 or GM device has been selected that device gets returned.
if (flags & MDT_PREFER_MT32)
hdl = getDeviceHandle(ConfMan.get("mt32_device"));
else if (flags & MDT_PREFER_GM)
@@ -207,20 +207,20 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
const MusicType type = getMusicType(hdl);
- // If have a "Don't use GM/MT-32" setting we skip this part and jump
+ // If we have a "Don't use GM/MT-32" setting we skip this part and jump
// to AdLib, PC Speaker etc. detection right away.
if (type != MT_NULL) {
if (type != MT_AUTO && type != MT_INVALID) {
if (flags & MDT_PREFER_MT32)
- // If we have a preferred MT32 device we disable the gm/mt32 mapping (more about this in mididrv.h)
+ // If we have a preferred MT32 device we disable the gm/mt32 mapping (more about this in mididrv.h).
_forceTypeMT32 = true;
return hdl;
}
- // If we have no specific device selected (neither in the scummvm nor in the game domain)
- // and no preferred MT32 or GM device selected we arrive here.
- // If MT32 is preferred we try for the first available device with music type 'MT_MT32' (usually the mt32 emulator)
+ // If no specific device is selected (neither in the scummvm nor in the game domain)
+ // and there is no preferred MT32 or GM device selected either we arrive here.
+ // If MT32 is preferred we try for the first available device with music type 'MT_MT32' (usually the mt32 emulator).
if (flags & MDT_PREFER_MT32) {
for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); ++m) {
MusicDevices i = (**m)->getDevices();
@@ -260,7 +260,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
else if (flags & MDT_APPLEIIGS)
tp = MT_APPLEIIGS;
else if (l == 0)
- // if we haven't tried to find a MIDI device yet we do this now.
+ // If we haven't tried to find a MIDI device yet we do this now.
continue;
else
tp = MT_AUTO;
@@ -292,7 +292,7 @@ MidiDriver::DeviceHandle MidiDriver::getDeviceHandle(const Common::String &ident
const MusicPlugin::List p = MusicMan.getPlugins();
if (p.begin() == p.end())
- error("Music plugins must be loaded prior to calling this method");
+ error("MidiDriver::getDeviceHandle: Music plugins must be loaded prior to calling this method");
for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); m++) {
MusicDevices i = (**m)->getDevices();