libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-01 07:46:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AUDIO: replaced kDriverName in MidiDriver::detectDevice()

Browse Source 
(This is irrelevant for the MT-32 emulator, but makes sense for plugins which really have more than one device)
This commit is contained in:
athrxx 2011-06-06 00:17:24 +02:00
parent 6d80255cec
commit 8d23f692f2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/mididrv.cpp
View File

@ -111,6 +111,8 @@ Common::String MidiDriver::getDeviceString(DeviceHandle handle, DeviceStringType
return d->getMusicDriverName();
else if (type == kDriverId)
return d->getMusicDriverId();
else if (type == kDeviceName)
return d->getCompleteName();
else if (type == kDeviceId)
return d->getCompleteId();
else
@ -199,7 +201,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
return reslt;
} else {
// If the expressly selected device is unavailable we display a warning and continue.
failedDevStr = getDeviceString(hdl, MidiDriver::kDriverName);
failedDevStr = getDeviceString(hdl, MidiDriver::kDeviceName);
Common::String warningMsg = "Failed to detect the selected audio device '" + failedDevStr +"'. See log file for more information. Attempting to fall back to the next available device...";
GUI::MessageDialog dialog(warningMsg);
dialog.runModal();
@ -239,8 +241,8 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
// If the preferred (expressly requested) device is unavailable we display a warning and continue.
// Don't warn about the missing device if we did already (this becomes relevant if the failing
// device is selected as preferred device and also as GM or MT-32 device).
if (failedDevStr != getDeviceString(hdl, MidiDriver::kDriverName)) {
Common::String warningMsg = "Failed to detect the preferred device '" + getDeviceString(hdl, MidiDriver::kDriverName) + "'. See log file for more information. Attempting to fall back to the next available device...";
if (failedDevStr != getDeviceString(hdl, MidiDriver::kDeviceName)) {
Common::String warningMsg = "Failed to detect the preferred device '" + getDeviceString(hdl, MidiDriver::kDeviceName) + "'. See log file for more information. Attempting to fall back to the next available device...";
GUI::MessageDialog dialog(warningMsg);
dialog.runModal();
}

1
audio/mididrv.h
View File

@ -142,6 +142,7 @@ public:
enum DeviceStringType {
kDriverName,
kDriverId,
kDeviceName,
kDeviceId
};