summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2014-01-12 20:52:09 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2014-01-12 20:52:09 +0100
commit1ee5bb5d436067d979fd95f98ed36addcd2efaed (patch)
tree272addaf7f77d2a6e4c2b443b7826c9f4d6cc336
parent57e15e67007c8e416cfdc1e0437f5aea42348b29 (diff)
downloaddabmux-1ee5bb5d436067d979fd95f98ed36addcd2efaed.tar.gz
dabmux-1ee5bb5d436067d979fd95f98ed36addcd2efaed.tar.bz2
dabmux-1ee5bb5d436067d979fd95f98ed36addcd2efaed.zip
remove some references to tcplog
-rw-r--r--src/DabMux.cpp2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/dabInput.cpp3
-rw-r--r--src/dabInput.h4
-rw-r--r--src/dabInputFifo.h3
-rw-r--r--src/dabInputZmq.cpp2
-rw-r--r--src/dabOutput/dabOutput.h4
7 files changed, 7 insertions, 13 deletions
diff --git a/src/DabMux.cpp b/src/DabMux.cpp
index f291976..5e0fb6c 100644
--- a/src/DabMux.cpp
+++ b/src/DabMux.cpp
@@ -118,6 +118,8 @@ typedef DWORD32 uint32_t;
#include "ParserCmdline.h"
#include "ParserConfigfile.h"
+#include "Log.h"
+
using namespace std;
static unsigned char Padding_FIB[] = {
diff --git a/src/Makefile.am b/src/Makefile.am
index 0a877cd..6dea558 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,7 +74,7 @@ crc_dabmux_SOURCES =DabMux.cpp \
ParserCmdline.cpp ParserCmdline.h \
ParserConfigfile.cpp ParserConfigfile.h \
Eti.h Eti.cpp \
- TcpLog.h TcpLog.cpp \
+ Log.h Log.cpp \
UdpSocket.h UdpSocket.cpp \
InetAddress.h InetAddress.cpp \
prbs.h prbs.c \
diff --git a/src/dabInput.cpp b/src/dabInput.cpp
index e937008..fa3eece 100644
--- a/src/dabInput.cpp
+++ b/src/dabInput.cpp
@@ -23,9 +23,6 @@
#include <string.h>
-TcpLog etiLog;
-
-
bool dabInputOperations::operator==(const dabInputOperations& ops)
{
return memcmp(this, &ops, sizeof(*this)) == 0;
diff --git a/src/dabInput.h b/src/dabInput.h
index 245a162..685f7b2 100644
--- a/src/dabInput.h
+++ b/src/dabInput.h
@@ -25,8 +25,8 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "TcpLog.h"
-extern TcpLog etiLog;
+#include "Log.h"
+extern Logger etiLog;
struct dabInputOperations {
diff --git a/src/dabInputFifo.h b/src/dabInputFifo.h
index 1844d1e..b309130 100644
--- a/src/dabInputFifo.h
+++ b/src/dabInputFifo.h
@@ -26,8 +26,7 @@
# include "config.h"
#endif
#include "dabInputFile.h"
-#include "TcpLog.h"
-extern TcpLog etiLog;
+#include "Log.h"
#ifdef _WIN32
diff --git a/src/dabInputZmq.cpp b/src/dabInputZmq.cpp
index 5ef6b2e..92d3ab9 100644
--- a/src/dabInputZmq.cpp
+++ b/src/dabInputZmq.cpp
@@ -43,8 +43,6 @@
#include <string>
#include <limits.h>
-extern TcpLog etiLog;
-
#ifdef __MINGW32__
# define bzero(s, n) memset(s, 0, n)
#endif
diff --git a/src/dabOutput/dabOutput.h b/src/dabOutput/dabOutput.h
index a39a6ca..5cb619f 100644
--- a/src/dabOutput/dabOutput.h
+++ b/src/dabOutput/dabOutput.h
@@ -29,7 +29,7 @@
#include "UdpSocket.h"
#include "TcpServer.h"
-#include "TcpLog.h"
+#include "Log.h"
#include <stdexcept>
#include <signal.h>
#ifdef _WIN32
@@ -50,8 +50,6 @@
# include "zmq.hpp"
#endif
-extern TcpLog etiLog;
-
// Abstract base class for all outputs
class DabOutput
{