From 59dbad22645950518ab279bf52c11ad7bc758e56 Mon Sep 17 00:00:00 2001
From: Kevin Matz <kevin@company235.com>
Date: Sun, 11 Dec 2022 16:48:06 -0500
Subject: [PATCH] reorder header

---
 protocol/esta/sacn/universemerger.cpp | 22 ++++++++++------------
 protocol/esta/sacn/universemerger.h   |  7 +++++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/protocol/esta/sacn/universemerger.cpp b/protocol/esta/sacn/universemerger.cpp
index 558369b..abb7605 100644
--- a/protocol/esta/sacn/universemerger.cpp
+++ b/protocol/esta/sacn/universemerger.cpp
@@ -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
diff --git a/protocol/esta/sacn/universemerger.h b/protocol/esta/sacn/universemerger.h
index 5b8b0e1..c07b10a 100644
--- a/protocol/esta/sacn/universemerger.h
+++ b/protocol/esta/sacn/universemerger.h
@@ -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_;
 };