optimize imports

WBLib.cmake

@@ -25,7 +25,7 @@ target_sources(wifibroadcast PUBLIC
         # radiotap and fec
         ${CMAKE_CURRENT_LIST_DIR}/src/external/radiotap/radiotap.c
         ${CMAKE_CURRENT_LIST_DIR}/src/external/fec/fec_base.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/src/FECEnabled.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/src/FECStream.cpp
         ${CMAKE_CURRENT_LIST_DIR}/src/WBStreamRx.cpp
         ${CMAKE_CURRENT_LIST_DIR}/src/WBStreamTx.cpp
         ${CMAKE_CURRENT_LIST_DIR}/src/WBTxRx.cpp

executables/benchmark.cpp

@@ -31,7 +31,7 @@
 #include <string>
 
 #include "../src/Encryption.h"
-#include "../src/FECEnabled.h"
+#include "../src/FECStream.h"
 #include "../src/HelperSources/RandomBufferPot.hpp"
 #include "../src/HelperSources/SchedulingHelper.hpp"
 

executables/unit_test.cpp

@@ -24,7 +24,7 @@
 #include <sstream>
 #include <string>
 
-#include "../src/FECEnabled.h"
+#include "../src/FECStream.h"
 //#include "../src/FECEnabled.hpp"
 
 #include "../src/Encryption.h"

src/FECEnabled.cpp → src/FECStream.cpp

@@ -2,13 +2,11 @@
 // Created by consti10 on 30.06.23.
 //
 
-#include "FECEnabled.h"
-
 #include <cmath>
 
-#include "wifibroadcast-spdlog.h"
-
 #include "FEC.hpp"
+#include "FECStream.h"
+#include "wifibroadcast-spdlog.h"
 
 void FECEncoder::encode_block(
     std::vector<std::shared_ptr<std::vector<uint8_t>>> data_packets,

src/FECEnabled.h → src/FECStream.h

@@ -2,8 +2,8 @@
 // Created by consti10 on 28.06.23.
 //
 
-#ifndef WIFIBROADCAST_FECENABLED_H
-#define WIFIBROADCAST_FECENABLED_H
+#ifndef WIFIBROADCAST_FECSTREAM_H
+#define WIFIBROADCAST_FECSTREAM_H
 
 #include <array>
 #include <map>
@@ -274,4 +274,4 @@ class FECDecoder {
 // which means you might lose a couple of blocks once every 4.6 h )
 // and 8 bits holds max 255.
 
-#endif  // WIFIBROADCAST_FECENABLED_H
+#endif  // WIFIBROADCAST_FECSTREAM_H

src/FECDisabled.hpp → src/SimpleStream.hpp

@@ -2,8 +2,8 @@
 // Created by consti10 on 10.03.21.
 //
 
-#ifndef WIFIBROADCAST_FECDISABLED_HPP
-#define WIFIBROADCAST_FECDISABLED_HPP
+#ifndef WIFIBROADCAST_SIMPLESTREAM_HPP
+#define WIFIBROADCAST_SIMPLESTREAM_HPP
 
 #include <cstdint>
 #include <cerrno>
@@ -109,4 +109,4 @@ class FECDisabledDecoder {
   }
 };
 
-#endif //WIFIBROADCAST_FECDISABLED_HPP
+#endif  // WIFIBROADCAST_SIMPLESTREAM_HPP

src/WBStreamRx.h

@@ -5,18 +5,17 @@
 #ifndef WIFIBROADCAST_WBSTREAMRX_H
 #define WIFIBROADCAST_WBSTREAMRX_H
 
-#include "FECDisabled.hpp"
-#include "FECEnabled.h"
+#include "../moodycamel/concurrentqueue/blockingconcurrentqueue.h"
+#include "../moodycamel/readerwriterqueue/readerwritercircularbuffer.h"
+#include "FECStream.h"
 #include "HelperSources/Helper.hpp"
 #include "HelperSources/SeqNrHelper.hpp"
 #include "HelperSources/SequenceNumberDebugger.hpp"
 #include "HelperSources/TimeHelper.hpp"
+#include "SimpleStream.hpp"
 #include "WBTxRx.h"
 #include "wifibroadcast-spdlog.h"
 
-#include "../moodycamel/concurrentqueue/blockingconcurrentqueue.h"
-#include "../moodycamel/readerwriterqueue/readerwritercircularbuffer.h"
-
 /**
  * Receiver for a (multiplexed) wifbroadcast stream
  * uses WBTxRx to receive packets

src/WBStreamTx.h

@@ -11,8 +11,8 @@
 
 #include "../moodycamel/concurrentqueue/blockingconcurrentqueue.h"
 #include "../moodycamel/readerwriterqueue/readerwritercircularbuffer.h"
-#include "FECDisabled.hpp"
-#include "FECEnabled.h"
+#include "FECStream.h"
+#include "SimpleStream.hpp"
 #include "TimeHelper.hpp"
 #include "WBTxRx.h"