reorder header
This commit is contained in:
parent
b84d7bafe9
commit
59dbad2264
@ -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
|
||||
|
@ -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_;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user