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

output/Multiple: pass std::string_view to FindByName()

Browse Source
This commit is contained in:
Max Kellermann
2022-07-13 11:32:29 +02:00
parent b52b0ac85a
commit fef79931c5
3 changed files with 5 additions and 5 deletions

2
src/command/PartitionCommands.cxx

@ -155,7 +155,7 @@ handle_delpartition(Client &client, Request request, Response &response)
CommandResult CommandResult
handle_moveoutput(Client &client, Request request, Response &response) handle_moveoutput(Client &client, Request request, Response &response)
{ {
const char *output_name = request[0]; const std::string_view output_name = request[0];
auto &dest_partition = client.GetPartition(); auto &dest_partition = client.GetPartition();
auto *existing_output = dest_partition.outputs.FindByName(output_name); auto *existing_output = dest_partition.outputs.FindByName(output_name);

4
src/output/MultipleOutputs.cxx

@ -118,10 +118,10 @@ MultipleOutputs::Configure(EventLoop &event_loop, EventLoop &rt_event_loop,
} }
AudioOutputControl * AudioOutputControl *
MultipleOutputs::FindByName(const char *name) noexcept MultipleOutputs::FindByName(const std::string_view name) noexcept
{ {
for (const auto &i : outputs) for (const auto &i : outputs)
if (StringIsEqual(i->GetName(), name)) if (name == i->GetName())
return i.get(); return i.get();
return nullptr; return nullptr;

4
src/output/MultipleOutputs.hxx

@ -115,13 +115,13 @@ public:
* Returns nullptr if the name does not exist. * Returns nullptr if the name does not exist.
*/ */
gcc_pure gcc_pure
AudioOutputControl *FindByName(const char *name) noexcept; AudioOutputControl *FindByName(std::string_view name) noexcept;
/** /**
* Does an audio output device with this name exist? * Does an audio output device with this name exist?
*/ */
gcc_pure gcc_pure
bool HasName(const char *name) noexcept { bool HasName(std::string_view name) noexcept {
return FindByName(name) != nullptr; return FindByName(name) != nullptr;
} }