Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use utf8_to_wstr to convert UTF-8 to wstring

Browse Source
This commit is contained in:
Chris Robinson
2018-11-13 06:29:02 -08:00
parent 6f635d3b1a
commit 0dfb805fa2
1 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/backends/wasapi.cpp
+10 -20
View File
@@ -707,16 +707,11 @@ static ALCenum ALCwasapiPlayback_open(ALCwasapiPlayback *self, const ALCchar *de
);
if(iter == PlaybackDevices.cend())
{
int len;
if((len=MultiByteToWideChar(CP_UTF8, 0, deviceName, -1, nullptr, 0)) > 0)
{
std::vector<WCHAR> wname(len);
MultiByteToWideChar(CP_UTF8, 0, deviceName, -1, wname.data(), len);
iter = std::find_if(PlaybackDevices.cbegin(), PlaybackDevices.cend(),
[&wname](const DevMap &entry) -> bool
{ return entry.devid == wname.data(); }
);
}
std::wstring wname{utf8_to_wstr(deviceName)};
iter = std::find_if(PlaybackDevices.cbegin(), PlaybackDevices.cend(),
[&wname](const DevMap &entry) -> bool
{ return entry.devid == wname; }
);
}
if(iter == PlaybackDevices.cend())
WARN("Failed to find device name matching \"%s\"\n", deviceName);
@@ -1378,16 +1373,11 @@ static ALCenum ALCwasapiCapture_open(ALCwasapiCapture *self, const ALCchar *devi
);
if(iter == CaptureDevices.cend())
{
int len;
if((len=MultiByteToWideChar(CP_UTF8, 0, deviceName, -1, nullptr, 0)) > 0)
{
std::vector<WCHAR> wname(len);
MultiByteToWideChar(CP_UTF8, 0, deviceName, -1, wname.data(), len);
iter = std::find_if(CaptureDevices.cbegin(), CaptureDevices.cend(),
[&wname](const DevMap &entry) -> bool
{ return entry.devid == wname.data(); }
);
}
std::wstring wname{utf8_to_wstr(deviceName)};
iter = std::find_if(CaptureDevices.cbegin(), CaptureDevices.cend(),
[&wname](const DevMap &entry) -> bool
{ return entry.devid == wname; }
);
}
if(iter == CaptureDevices.cend())
WARN("Failed to find device name matching \"%s\"\n", deviceName);