From c8c9d5abf8238c3531ecae8fb272fdf5bbffd336 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Mon, 8 Jul 2019 12:08:44 +0200
Subject: Unify Socket library with other mmbTools

---
 src/InputReader.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/InputReader.h')

diff --git a/src/InputReader.h b/src/InputReader.h
index 63451e5..1a63cea 100644
--- a/src/InputReader.h
+++ b/src/InputReader.h
@@ -144,7 +144,7 @@ class InputTcpReader : public InputReader
         virtual std::string GetPrintableInfo() const override;
 
     private:
-        TCPClient m_tcpclient;
+        Socket::TCPClient m_tcpclient;
         std::string m_uri;
 };
 
-- 
cgit v1.2.3


From f0a767b8059abe113f422fdbe0a29e9c00a9945f Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Tue, 13 Aug 2019 10:48:06 +0200
Subject: Add missing includes, remove unused m_to_drop

---
 src/DabMod.cpp    | 1 +
 src/InputReader.h | 8 --------
 src/MemlessPoly.h | 8 ++++----
 3 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'src/InputReader.h')

diff --git a/src/DabMod.cpp b/src/DabMod.cpp
index 1f435bf..81882e4 100644
--- a/src/DabMod.cpp
+++ b/src/DabMod.cpp
@@ -37,6 +37,7 @@
 #include <cstdlib>
 #include <stdexcept>
 #include <cstdio>
+#include <cstring>
 #include <cstddef>
 #include <sys/stat.h>
 #include <signal.h>
diff --git a/src/InputReader.h b/src/InputReader.h
index 1a63cea..ab45d4f 100644
--- a/src/InputReader.h
+++ b/src/InputReader.h
@@ -201,14 +201,6 @@ class InputZeroMQReader : public InputReader, public RemoteControllable
 
         zmq::context_t m_zmqcontext; // is thread-safe
         std::thread m_recv_thread;
-
-        /* We must be careful to keep frame phase consistent. If we
-         * drop a single ETI frame, we will break the transmission
-         * frame vs. ETI frame phase.
-         *
-         * Here we keep track of how many ETI frames we must drop.
-         */
-        int m_to_drop = 0;
 };
 
 #endif
diff --git a/src/MemlessPoly.h b/src/MemlessPoly.h
index 43fdb2d..4642596 100644
--- a/src/MemlessPoly.h
+++ b/src/MemlessPoly.h
@@ -30,20 +30,20 @@
 #   include <config.h>
 #endif
 
-
 #include "RemoteControl.h"
 #include "ModPlugin.h"
 #include "PcDebug.h"
 #include "ThreadsafeQueue.h"
 
 #include <sys/types.h>
+#include <array>
 #include <complex>
+#include <memory>
+#include <string>
 #include <thread>
 #include <vector>
-#include <time.h>
+#include <ctime>
 #include <cstdio>
-#include <string>
-#include <memory>
 
 #define MEMLESSPOLY_PIPELINE_DELAY 1
 
-- 
cgit v1.2.3