official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

reorder header

This commit is contained in:
Kevin Matz 2022-12-11 16:48:06 -05:00
parent b84d7bafe9
commit 59dbad2264
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,16 @@ UniverseMerger::UniverseMerger()
}
/**
* @brief MergingUniverse::addSource
* @param universe
*/
void UniverseMerger::addSource(std::shared_ptr<Universe> universe)
{
sources_.push_back(universe);
}
/**
* @brief MergingUniverse::age
* @return The minimum age of the souce universes.
@ -142,16 +152,4 @@ std::shared_ptr<DATA::data_header> UniverseMerger::metadata() const
return Universe::metadata();
}
/**
* @brief MergingUniverse::addSource
* @param universe
*/
void UniverseMerger::addSource(std::shared_ptr<Universe> universe)
{
sources_.push_back(universe);
}
} // namespace sACN

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

@ -40,15 +40,18 @@ class UniverseMerger
public:
explicit UniverseMerger();
void addSource(std::shared_ptr<Universe>);
// DMX::Universe overrides
virtual long age() const override;
virtual double rxRate() override;
virtual uint8_t status() const override;
virtual uint8_t slot(const uint16_t) const override;
// sACN::Universe overrides
virtual uint16_t activeSlots() const override;
virtual std::shared_ptr<DATA::data_header> metadata() const override;
void addSource(std::shared_ptr<Universe>);
private:
std::vector<std::shared_ptr<Universe>> sources_;
};