1 files changed, 13 insertions, 13 deletions

diff --git a/src/MuxElements.h b/src/MuxElements.h
index d118df9..dfc4380 100644
--- a/src/MuxElements.h
+++ b/src/MuxElements.h
@@ -33,16 +33,13 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <functional>
 #include <exception>
-#include <algorithm>
 #include <chrono>
 #include <optional>
 #include <stdint.h>
 #include "dabOutput/dabOutput.h"
 #include "input/inputs.h"
 #include "RemoteControl.h"
-#include "Eti.h"
 
 // Protection levels and bitrates for UEP.
 const unsigned char ProtectionLevelTable[64] = {
@@ -87,7 +84,7 @@ class MuxInitException : public std::exception
         MuxInitException(const std::string m = "ODR-DabMux initialisation error")
             throw()
             : msg(m) {}
-        ~MuxInitException(void) throw() {}
+        ~MuxInitException() throw() {}
         const char* what() const throw() { return msg.c_str(); }
     private:
         std::string msg;
@@ -140,12 +137,12 @@ class AnnouncementCluster : public RemoteControllable {
         uint16_t flags = 0;
         std::string subchanneluid;
 
-        std::string tostring(void) const;
+        std::string tostring() const;
 
         /* Check if the activation/deactivation timeout occurred,
          * and return of if the Announcement is active
          */
-        bool is_active(void);
+        bool is_active();
 
     private:
         mutable std::mutex m_active_mutex;
@@ -315,7 +312,10 @@ class dabEnsemble : public RemoteControllable {
         virtual const json::map_t get_all_values() const;
 
         /* Check if the Linkage Sets are valid */
-        bool validate_linkage_sets(void);
+        bool validate_linkage_sets() const;
+        static bool validate_linkage_sets(
+                const vec_sp_service& services,
+                std::vector<std::shared_ptr<LinkageSet> > linkagesets);
 
         /* all fields are public, since this was a struct before */
         uint16_t id = 0;
@@ -372,7 +372,7 @@ struct dabProtectionEEP {
     // select EEP profile A and B.
     // Other values are for future use, see
     // EN 300 401 Clause 6.2.1 "Basic sub-channel organisation"
-    uint8_t GetOption(void) const {
+    uint8_t GetOption() const {
         return (this->profile == EEP_A) ? 0 : 1;
     }
 };
@@ -402,16 +402,16 @@ public:
             protection() { }
 
     // Calculate subchannel size in number of CU
-    unsigned short getSizeCu(void) const;
+    unsigned short getSizeCu() const;
 
     // Calculate subchannel size in number of bytes
-    unsigned short getSizeByte(void) const;
+    unsigned short getSizeByte() const;
 
     // Calculate subchannel size in number of uint32_t
-    unsigned short getSizeWord(void) const;
+    unsigned short getSizeWord() const;
 
     // Calculate subchannel size in number of uint64_t
-    unsigned short getSizeDWord(void) const;
+    unsigned short getSizeDWord() const;
 
     // Read from the input, using the correct buffer management
     size_t readFrame(uint8_t *buffer, size_t size, std::time_t seconds, int utco, uint32_t tsta);
@@ -574,7 +574,7 @@ class LinkageSet {
                 bool hard,
                 bool international);
 
-        std::string get_name(void) const { return m_name; }
+        std::string get_name() const { return m_name; }
 
         std::list<ServiceLink> id_list;