aboutsummaryrefslogtreecommitdiff
path: root/sound/mididrv.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2010-06-29 00:29:35 +0000
committerJohannes Schickel2010-06-29 00:29:35 +0000
commit5c424cfb41d439db5a0b3c00b7081473aa384ca6 (patch)
tree5c59d9d4a3f76aec2c7945b135643cfc3e4f91ae /sound/mididrv.cpp
parent876b6a50060bee23b4b05205a729014a8e5455b1 (diff)
downloadscummvm-rg350-5c424cfb41d439db5a0b3c00b7081473aa384ca6.tar.gz
scummvm-rg350-5c424cfb41d439db5a0b3c00b7081473aa384ca6.tar.bz2
scummvm-rg350-5c424cfb41d439db5a0b3c00b7081473aa384ca6.zip
Fix detection of invalid music drivers specified via command line.
Along with it documented that "0" is a special device handle for the invalid device. Now getDeviceHandle returns 0, when the identified device could not be found. Also getMusicType now returns MT_INVALID (newly introduced), when a non existing device was specified. svn-id: r50470
Diffstat (limited to 'sound/mididrv.cpp')
-rw-r--r--sound/mididrv.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp
index 80c8ae9c22..26d43ebfe1 100644
--- a/sound/mididrv.cpp
+++ b/sound/mididrv.cpp
@@ -95,7 +95,7 @@ MusicType MidiDriver::getMusicType(MidiDriver::DeviceHandle handle) {
}
}
- return MT_AUTO;
+ return MT_INVALID;
}
Common::String MidiDriver::getDeviceString(DeviceHandle handle, DeviceStringType type) {
@@ -256,10 +256,11 @@ MidiDriver::DeviceHandle MidiDriver::getDeviceHandle(const Common::String &ident
for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); m++) {
MusicDevices i = (**m)->getDevices();
for (MusicDevices::iterator d = i.begin(); d != i.end(); d++) {
- if (identifier.equals(d->getCompleteId()) || identifier.equals(d->getCompleteName()))
+ if (identifier.equals(d->getCompleteId()) || identifier.equals(d->getCompleteName())) {
return d->getHandle();
+ }
}
}
- return getDeviceHandle("auto");
+ return 0;
}