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

Avoid repeating string literals

Browse Source
This commit is contained in:
Chris Robinson
2020-09-11 01:40:36 -07:00
parent a4bfba4cb5
commit 33d91ceeec
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
alc/backends/wasapi.cpp
+7 -5
View File
@@ -251,6 +251,8 @@ al::vector<DevMap> CaptureDevices;
using NameGUIDPair = std::pair<std::string,std::string>;
NameGUIDPair get_device_name_and_guid(IMMDevice *device)
{
static constexpr char UnknownName[]{"Unknown Device Name"};
static constexpr char UnknownGuid[]{"Unknown Device GUID"};
std::string name{DEVNAME_HEAD};
std::string guid;
@@ -259,7 +261,7 @@ NameGUIDPair get_device_name_and_guid(IMMDevice *device)
if(FAILED(hr))
{
WARN("OpenPropertyStore failed: 0x%08lx\n", hr);
return std::make_pair("Unknown Device Name", "Unknown Device GUID");
return std::make_pair(UnknownName, UnknownGuid);
}
PropVariant pvprop;
@@ -267,14 +269,14 @@ NameGUIDPair get_device_name_and_guid(IMMDevice *device)
if(FAILED(hr))
{
WARN("GetValue Device_FriendlyName failed: 0x%08lx\n", hr);
name += "Unknown Device Name";
name += UnknownName;
}
else if(pvprop->vt == VT_LPWSTR)
name += wstr_to_utf8(pvprop->pwszVal);
else
{
WARN("Unexpected PROPVARIANT type: 0x%04x\n", pvprop->vt);
name += "Unknown Device Name";
name += UnknownName;
}
pvprop.clear();
@@ -282,14 +284,14 @@ NameGUIDPair get_device_name_and_guid(IMMDevice *device)
if(FAILED(hr))
{
WARN("GetValue AudioEndpoint_GUID failed: 0x%08lx\n", hr);
guid = "Unknown Device GUID";
guid = UnknownGuid;
}
else if(pvprop->vt == VT_LPWSTR)
guid = wstr_to_utf8(pvprop->pwszVal);
else
{
WARN("Unexpected PROPVARIANT type: 0x%04x\n", pvprop->vt);
guid = "Unknown Device GUID";
guid = UnknownGuid;
}
return std::make_pair(std::move(name), std::move(guid));