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

Use a constexpr char array for a reused prefix string

Browse Source
This commit is contained in:
Chris Robinson 2021-09-12 02:19:38 -07:00
parent 2df78e49b1
commit c40e7db82a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
alc/backends/pipewire.cpp
View File

@ -401,6 +401,8 @@ struct DeviceNode {
uint mSampleRate{}; uint mSampleRate{};
DevFmtChannels mChannels{InvalidChannelConfig}; DevFmtChannels mChannels{InvalidChannelConfig};
}; };
constexpr char MonitorPrefix[]{"Monitor of "};
constexpr auto MonitorPrefixLen = al::size(MonitorPrefix) - 1;
std::vector<DeviceNode> DeviceList; std::vector<DeviceNode> DeviceList;
std::string DefaultSinkDev; std::string DefaultSinkDev;
std::string DefaultSourceDev; std::string DefaultSourceDev;
@ -1497,7 +1499,7 @@ void PipeWireCapture::open(const char *name)
targetid = match->mId; targetid = match->mId;
if(match->mCapture) devname = match->mName; if(match->mCapture) devname = match->mName;
else devname = "Monitor of "+match->mName; else devname = MonitorPrefix+match->mName;
} }
else else
{ {
@ -1507,7 +1509,7 @@ void PipeWireCapture::open(const char *name)
auto match_name = [name](const DeviceNode &n) -> bool auto match_name = [name](const DeviceNode &n) -> bool
{ return n.mCapture && n.mName == name; }; { return n.mCapture && n.mName == name; };
auto match = std::find_if(DeviceList.cbegin(), DeviceList.cend(), match_name); auto match = std::find_if(DeviceList.cbegin(), DeviceList.cend(), match_name);
if(match == DeviceList.cend() && std::strncmp(name, "Monitor of ", 11) == 0) if(match == DeviceList.cend() && std::strncmp(name, MonitorPrefix, MonitorPrefixLen) == 0)
{ {
const char *sinkname{name + 11}; const char *sinkname{name + 11};
auto match_sinkname = [sinkname](const DeviceNode &n) -> bool auto match_sinkname = [sinkname](const DeviceNode &n) -> bool
@ -1691,7 +1693,7 @@ std::string PipeWireBackendFactory::probe(BackendType type)
if(defmatch != DeviceList.cend()) if(defmatch != DeviceList.cend())
{ {
if(!defmatch->mCapture) if(!defmatch->mCapture)
outnames.append("Monitor of "); outnames.append(MonitorPrefix);
outnames.append(defmatch->mName.c_str(), defmatch->mName.length()+1); outnames.append(defmatch->mName.c_str(), defmatch->mName.length()+1);
} }
for(auto iter = DeviceList.cbegin();iter != DeviceList.cend();++iter) for(auto iter = DeviceList.cbegin();iter != DeviceList.cend();++iter)
@ -1702,7 +1704,7 @@ std::string PipeWireBackendFactory::probe(BackendType type)
for(auto iter = DeviceList.cbegin();iter != DeviceList.cend();++iter) for(auto iter = DeviceList.cbegin();iter != DeviceList.cend();++iter)
{ {
if(iter != defmatch && !iter->mCapture) if(iter != defmatch && !iter->mCapture)
outnames.append("Monitor of ").append(iter->mName.c_str(), iter->mName.length()+1); outnames.append(MonitorPrefix).append(iter->mName.c_str(), iter->mName.length()+1);
} }
break; break;
} }