From 02920513923b7679541277736f2d9c940c5fc530 Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Sat, 26 Nov 2022 12:50:54 -0500 Subject: [PATCH] holding last look is the behavior of a universe, not the receiver --- example/sACN Explorer/multiverseview.ui | 18 ------------------ protocol/sacn/receiver.cpp | 24 ------------------------ protocol/sacn/receiver.h | 6 +++--- 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/example/sACN Explorer/multiverseview.ui b/example/sACN Explorer/multiverseview.ui index 4fe4de8..fd89b31 100644 --- a/example/sACN Explorer/multiverseview.ui +++ b/example/sACN Explorer/multiverseview.ui @@ -71,7 +71,6 @@ - @@ -254,23 +253,6 @@ Ctrl+D - - - true - - - true - - - false - - - Hold Last Look - - - Retain at least 1 inacitve source on all universes. - - true diff --git a/protocol/sacn/receiver.cpp b/protocol/sacn/receiver.cpp index 08217f7..de81e66 100644 --- a/protocol/sacn/receiver.cpp +++ b/protocol/sacn/receiver.cpp @@ -37,7 +37,6 @@ namespace sACN { Receiver::Receiver(UUID::uuid cid, std::string fctn) : Component(cid, fctn) , discovery_enabled_(false) - , HoldLastLook(true) { RlpRegisterVector(VECTOR_ROOT_E131_DATA, std::bind(&Receiver::dataReceiver, this, std::placeholders::_1)); @@ -56,28 +55,6 @@ Receiver::~Receiver() } -/** - * @brief Receiver::setHoldLastLook - * @param state - */ -void Receiver::setHoldLastLook(const bool state) -{ - HoldLastLook = state; - for (const auto & [_, universe] : universes_) - universe->setHoldLastLook(state); -} - - -/** - * @brief Receiver::isEnabledHoldLastLook - * @return - */ -bool Receiver::isEnabledHoldLastLook() const -{ - return HoldLastLook; -} - - /** * @brief Receiver::subscribe * @param num @@ -88,7 +65,6 @@ void Receiver::subscribe(const uint16_t num) return; universes_.emplace(num, std::make_shared()); universes_.at(num)->expectedUniverse = num; - universes_.at(num)->setHoldLastLook(HoldLastLook); } diff --git a/protocol/sacn/receiver.h b/protocol/sacn/receiver.h index 89a6e9b..0fb1ba0 100644 --- a/protocol/sacn/receiver.h +++ b/protocol/sacn/receiver.h @@ -68,8 +68,8 @@ public: Receiver(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP sACN Receiver"); ~Receiver(); - void setHoldLastLook(const bool); - bool isEnabledHoldLastLook() const; +// void setHoldLastLook(const bool); +// bool isEnabledHoldLastLook() const; virtual void subscribe(const uint16_t); virtual void unsubscribe(const uint16_t); @@ -102,7 +102,7 @@ private: std::unordered_map> universes_; std::vector> discoveryCallbacks_; bool discovery_enabled_; - bool HoldLastLook; +// bool HoldLastLook; }; };