From f616bfe35481192f45b03c968229c5aacc129e33 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 26 Sep 2019 14:40:19 +0200
Subject: [PATCH] output/MultipleOutputs: add method HasName()
---
src/output/MultipleOutputs.cxx | 2 +-
src/output/MultipleOutputs.hxx | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/output/MultipleOutputs.cxx b/src/output/MultipleOutputs.cxx
index 05cd5649e..10c3f30b5 100644
--- a/src/output/MultipleOutputs.cxx
+++ b/src/output/MultipleOutputs.cxx
@@ -98,7 +98,7 @@ MultipleOutputs::Configure(EventLoop &event_loop,
mixer_listener,
client, block, defaults,
&filter_factory);
- if (FindByName(output->GetName()) != nullptr)
+ if (HasName(output->GetName()))
throw FormatRuntimeError("output devices with identical "
"names: %s", output->GetName());
diff --git a/src/output/MultipleOutputs.hxx b/src/output/MultipleOutputs.hxx
index 93753d9bc..cc9b30d14 100644
--- a/src/output/MultipleOutputs.hxx
+++ b/src/output/MultipleOutputs.hxx
@@ -113,6 +113,14 @@ public:
gcc_pure
AudioOutputControl *FindByName(const char *name) noexcept;
+ /**
+ * Does an audio output device with this name exist?
+ */
+ gcc_pure
+ bool HasName(const char *name) noexcept {
+ return FindByName(name) != nullptr;
+ }
+
void SetReplayGainMode(ReplayGainMode mode) noexcept;
/**