set default merge mode
This commit is contained in:
parent
7dfb0a81d7
commit
3ef5e0498b
|
@ -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<Universe>())
|
||||
{
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue