works

OpenHD · Sep 23, 2023 · 137cf15 · 137cf15
1 parent 39ccb0d
commit 137cf15
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/WBStreamRx.cpp b/src/WBStreamRx.cpp
@@ -6,7 +6,7 @@
 
 #include <utility>
 
-WBStreamRx::WBStreamRx(std::shared_ptr<WBTxRx> txrx,Options options1)
+WBStreamRx::WBStreamRx(std::shared_ptr<ExtTxRx> txrx,Options options1)
     : m_txrx(txrx),
       m_options(options1)
 {
@@ -35,7 +35,7 @@ WBStreamRx::WBStreamRx(std::shared_ptr<WBTxRx> txrx,Options options1)
   auto cb_sesssion=[this](){
     this->on_new_session();
   };
-  auto handler=std::make_shared<WBTxRx::StreamRxHandler>(m_options.radio_port,cb_packet,cb_sesssion);
+  auto handler=std::make_shared<ExtTxRx::StreamRxHandler>(m_options.radio_port,cb_packet,cb_sesssion);
   m_txrx->rx_register_stream_handler(handler);
   if(m_options.enable_threading){
     m_packet_queue=std::make_unique<moodycamel::BlockingReaderWriterCircularBuffer<std::shared_ptr<EnqueuedPacket>>>(m_options.packet_queue_size);

diff --git a/src/WBStreamRx.h b/src/WBStreamRx.h
@@ -13,7 +13,7 @@
 #include "HelperSources/TimeHelper.hpp"
 #include "HelperSources/UINT16SeqNrHelper.hpp"
 #include "SimpleStream.hpp"
-#include "WBTxRx.h"
+#include "ExtTxRx.h"
 #include "wifibroadcast_spdlog.h"
 
 /**
@@ -42,7 +42,7 @@ class WBStreamRx {
     // enable fec debug log, obviously only if fec is enbaled
     bool enable_fec_debug_log=false;
   };
-  WBStreamRx(std::shared_ptr<WBTxRx> txrx,Options options1);
+  WBStreamRx(std::shared_ptr<ExtTxRx> txrx,Options options1);
   ~WBStreamRx();
   WBStreamRx(const WBStreamRx &) = delete;
   WBStreamRx &operator=(const WBStreamRx &) = delete;
@@ -73,7 +73,7 @@ class WBStreamRx {
   void reset_stream_stats();
  private:
   const Options m_options;
-  std::shared_ptr<WBTxRx> m_txrx;
+  std::shared_ptr<ExtTxRx> m_txrx;
   std::shared_ptr<spdlog::logger> m_console;
   // Callback that is called with the decoded data
   WBStreamRx::OUTPUT_DATA_CALLBACK m_out_cb= nullptr;

diff --git a/src/WBStreamTx.cpp b/src/WBStreamTx.cpp
@@ -9,7 +9,7 @@
 #include "BlockSizeHelper.hpp"
 #include "SchedulingHelper.hpp"
 
-WBStreamTx::WBStreamTx(std::shared_ptr<WBTxRx> txrx,Options options1)
+WBStreamTx::WBStreamTx(std::shared_ptr<ExtTxRx> txrx,Options options1)
     :options(options1),
       m_txrx(txrx)
 {

diff --git a/src/WBStreamTx.h b/src/WBStreamTx.h
@@ -14,7 +14,7 @@
 #include "FECStream.h"
 #include "SimpleStream.hpp"
 #include "HelperSources/TimeHelper.hpp"
-#include "WBTxRx.h"
+#include "ExtTxRx.h"
 
 /**
  * Transmitter for a (multiplexed) wifbroadcast stream
@@ -46,7 +46,7 @@ class WBStreamTx {
     // set sched_param = max realtime on the thread that dequeues and injects the packets
     bool dequeue_thread_max_realtime= true;
   };
-  WBStreamTx(std::shared_ptr<WBTxRx> txrx,Options options);
+  WBStreamTx(std::shared_ptr<ExtTxRx> txrx,Options options);
   WBStreamTx(const WBStreamTx&) = delete;
   WBStreamTx&operator=(const WBStreamTx&) = delete;
   ~WBStreamTx();
@@ -111,7 +111,7 @@ class WBStreamTx {
   int get_tx_queue_available_size_approximate();
  private:
   const Options options;
-  std::shared_ptr<WBTxRx> m_txrx;
+  std::shared_ptr<ExtTxRx> m_txrx;
   std::shared_ptr<spdlog::logger> m_console;
   // On the tx, either one of those two is active at the same time
   std::unique_ptr<FECEncoder> m_fec_encoder = nullptr;