oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/winmm: convert device name to filesystem charset

Browse Source
This commit is contained in:
Max Kellermann 2015-03-05 09:03:25 +01:00
parent a261442279
commit 81059f80d8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/plugins/WinmmOutputPlugin.cxx
View File

@ -22,6 +22,7 @@
#include "../OutputAPI.hxx" #include "../OutputAPI.hxx"
#include "pcm/PcmBuffer.hxx" #include "pcm/PcmBuffer.hxx"
#include "mixer/MixerList.hxx" #include "mixer/MixerList.hxx"
#include "fs/AllocatedPath.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/Macros.hxx" #include "util/Macros.hxx"
@ -108,6 +109,11 @@ get_device_id(const char *device_name, UINT *device_id, Error &error)
} }
/* check for device name */ /* check for device name */
const AllocatedPath device_name_fs =
AllocatedPath::FromUTF8(device_name, error);
if (device_name_fs.IsNull())
return false;
for (UINT i = 0; i < numdevs; i++) { for (UINT i = 0; i < numdevs; i++) {
WAVEOUTCAPS caps; WAVEOUTCAPS caps;
MMRESULT result = waveOutGetDevCaps(i, &caps, sizeof(caps)); MMRESULT result = waveOutGetDevCaps(i, &caps, sizeof(caps));
@ -115,7 +121,7 @@ get_device_id(const char *device_name, UINT *device_id, Error &error)
continue; continue;
/* szPname is only 32 chars long, so it is often truncated. /* szPname is only 32 chars long, so it is often truncated.
Use partial match to work around this. */ Use partial match to work around this. */
if (StringStartsWith(device_name, caps.szPname)) { if (StringStartsWith(device_name_fs.c_str(), caps.szPname)) {
*device_id = i; *device_id = i;
return true; return true;
} }