From 3ef5e0498bd8c6c0ac13f3f1207af415463ae85c Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Mon, 12 Dec 2022 13:43:40 -0500 Subject: [PATCH] set default merge mode --- protocol/esta/sacn/universearbitrator.cpp | 1 + protocol/esta/sacn/universearbitrator.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/protocol/esta/sacn/universearbitrator.cpp b/protocol/esta/sacn/universearbitrator.cpp index cd62e4e..3d8e4f7 100644 --- a/protocol/esta/sacn/universearbitrator.cpp +++ b/protocol/esta/sacn/universearbitrator.cpp @@ -37,6 +37,7 @@ namespace sACN { UniverseArbitrator::UniverseArbitrator(sACN::Universe * universe) : m_universe(universe) , hold_last_look_(true) + , merge_mode_(MERGE_HTP) , m_dominant(std::weak_ptr()) { } diff --git a/protocol/esta/sacn/universearbitrator.h b/protocol/esta/sacn/universearbitrator.h index bbf66b3..a3eb547 100644 --- a/protocol/esta/sacn/universearbitrator.h +++ b/protocol/esta/sacn/universearbitrator.h @@ -47,7 +47,8 @@ class Universe; * > occurs, receivers must handle these sources in some way. * * If multiple universes with highest priority are recieved, the universe - * recieved most recently will be given dominance. + * data will be HTP merged (default), or optionally, with the most recently + * recieved given dominance (LTP). * * > \cite sACN 6.2.3.2 Note on Merge and Arbitration Algorithms * > @@ -64,7 +65,6 @@ public: void refresh(); - // DMX::Universe API: long age() const; uint8_t status() const;