official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

set default merge mode

This commit is contained in:
Kevin Matz 2022-12-12 13:43:40 -05:00
parent 7dfb0a81d7
commit 3ef5e0498b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
protocol/esta/sacn/universearbitrator.cpp
View File

@ -37,6 +37,7 @@ namespace sACN {
UniverseArbitrator::UniverseArbitrator(sACN::Universe * universe) UniverseArbitrator::UniverseArbitrator(sACN::Universe * universe)
: m_universe(universe) : m_universe(universe)
, hold_last_look_(true) , hold_last_look_(true)
, merge_mode_(MERGE_HTP)
, m_dominant(std::weak_ptr<Universe>()) , m_dominant(std::weak_ptr<Universe>())
{ {
} }

4
protocol/esta/sacn/universearbitrator.h
View File

@ -47,7 +47,8 @@ class Universe;
* > occurs, receivers must handle these sources in some way. * > occurs, receivers must handle these sources in some way.
* *
* If multiple universes with highest priority are recieved, the universe * 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 * > \cite sACN 6.2.3.2 Note on Merge and Arbitration Algorithms
* > * >
@ -64,7 +65,6 @@ public:
void refresh(); void refresh();
// DMX::Universe API: // DMX::Universe API:
long age() const; long age() const;
uint8_t status() const; uint8_t status() const;