official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

use the existing metadata

This commit is contained in:
Kevin Matz 2022-12-11 16:13:10 -05:00
parent 6da7001c67
commit ce51e17ddd
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,8 +352,8 @@ std::shared_ptr<Universe> UniverseArbitrator::dominant_() const
return by_priority.crbegin()->second.cbegin()->second;
auto merged = std::make_shared<UniverseMerger>();
merged->expectedUniverse = expectedUniverse;
merged->expectedPriority = by_priority.crbegin()->first;
merged->Universe::metadata()->universe = expectedUniverse;
merged->Universe::metadata()->priority = by_priority.crbegin()->first;
for (const auto & [_, universe] : by_priority.crbegin()->second)
merged->addSource(universe);
return merged;

7
protocol/esta/sacn/universemerger.cpp
View File

@ -30,6 +30,7 @@ namespace sACN {
UniverseMerger::UniverseMerger()
: Universe()
{
Universe::metadata()->source_name = "HTP Merged Universe";
}
@ -138,11 +139,7 @@ std::shared_ptr<DATA::data_header> UniverseMerger::metadata() const
if (sources_.size() == 1)
return sources_.front()->metadata();
auto metadata = std::make_shared<DATA::data_header>();
metadata->source_name = "HTP Merged Universe";
metadata->universe = expectedUniverse;
metadata->priority = expectedPriority;
return metadata;
return metadata();
}

3
protocol/esta/sacn/universemerger.h
View File

@ -40,9 +40,6 @@ class UniverseMerger
public:
explicit UniverseMerger();
uint16_t expectedUniverse; //!< Expected universe number
uint8_t expectedPriority; //!< Expected universe priority
virtual long age() const override;
virtual double rxRate() override;
virtual uint8_t status() const override;