From cbdaeb3ea9991472f6d18dbb76453bb8d9a8d884 Mon Sep 17 00:00:00 2001 From: Jerome <7315817+jdecourval@users.noreply.github.com> Date: Thu, 22 Aug 2024 16:39:33 -0400 Subject: [PATCH] Add wildcard (*) support to metastreams --- server/streamreader/meta_stream.cpp | 4 +++- server/streamreader/meta_stream.hpp | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/server/streamreader/meta_stream.cpp b/server/streamreader/meta_stream.cpp index f4ad894d..3cbe31fa 100644 --- a/server/streamreader/meta_stream.cpp +++ b/server/streamreader/meta_stream.cpp @@ -56,7 +56,7 @@ bool MetaStream::isAllowed(const PcmStream& stream) const if (component.empty()) continue; - if (stream.getName() == component) + if (component == WILDCARD || stream.getName() == component) { return true; } @@ -99,6 +99,8 @@ void MetaStream::updateActiveStream() return true; if (component == second->getName()) return false; + if (component == WILDCARD) + return false; } return false; }; diff --git a/server/streamreader/meta_stream.hpp b/server/streamreader/meta_stream.hpp index afbf587d..9feb60f3 100644 --- a/server/streamreader/meta_stream.hpp +++ b/server/streamreader/meta_stream.hpp @@ -40,6 +40,9 @@ namespace streamreader */ class MetaStream : public PcmStream, public PcmStream::Listener { +public: + static inline const std::string WILDCARD = "*"; + public: /// ctor. Encoded PCM data is passed to the PcmStream::Listener MetaStream(PcmStream::Listener* pcmListener, const std::vector>& streams, boost::asio::io_context& ioc,