diff options
author | Johannes Schickel | 2010-06-22 16:42:49 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-06-22 16:42:49 +0000 |
commit | 0a757c185fc513a5f846545ab3055ec4fcfe4b78 (patch) | |
tree | fa4ffbc28884eeb7e16b39fb2dd28c7b1aafa8d6 /sound/mididrv.cpp | |
parent | 5b24d39cdd94889e223d41acfea395414b608040 (diff) | |
download | scummvm-rg350-0a757c185fc513a5f846545ab3055ec4fcfe4b78.tar.gz scummvm-rg350-0a757c185fc513a5f846545ab3055ec4fcfe4b78.tar.bz2 scummvm-rg350-0a757c185fc513a5f846545ab3055ec4fcfe4b78.zip |
Remove some trailing tabs.
svn-id: r50152
Diffstat (limited to 'sound/mididrv.cpp')
-rw-r--r-- | sound/mididrv.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 15da0f3106..4faff04d9c 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -63,7 +63,7 @@ static const uint32 GUIOMapping[] = { MT_ADLIB, Common::GUIO_MIDIADLIB, MT_TOWNS, Common::GUIO_MIDITOWNS, MT_GM, Common::GUIO_MIDIGM, - MT_MT32, Common::GUIO_MIDIMT32, + MT_MT32, Common::GUIO_MIDIMT32, 0, 0 }; @@ -135,7 +135,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) { return hdl; break; - case MT_PCJR: + case MT_PCJR: if (flags & MDT_PCJR) return hdl; break; @@ -179,7 +179,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) { 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) @@ -192,7 +192,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) { } } } - + // Now we default to the first available device with music type 'MT_GM' for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); m++) { MusicDevices i = (**m)->getDevices(); @@ -202,8 +202,8 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) { } } } - - MusicType tp = MT_NULL; + + MusicType tp = MT_NULL; if (flags & MDT_TOWNS) tp = MT_TOWNS; else if (flags & MDT_ADLIB) @@ -232,6 +232,7 @@ MidiDriver *MidiDriver::createMidi(MidiDriver::DeviceHandle handle) { if (getDeviceString(handle, MidiDriver::kDriverId).equals((**m)->getId())) (**m)->createInstance(&driver, handle); } + return driver; } @@ -243,7 +244,7 @@ MidiDriver::DeviceHandle MidiDriver::getDeviceHandle(const Common::String &ident if (identifier.equals(d->getCompleteId()) || identifier.equals(d->getCompleteName())) return d->getHandle(); } - } + } return getDeviceHandle("auto"); } |