From 1c50d42ebda1d87a5721da55b819fa2f35ebd043 Mon Sep 17 00:00:00 2001
From: Chris Tallon <chris@vomp.tv>
Date: Fri, 10 Apr 2020 17:13:02 +0100
Subject: [PATCH] TBBoxx CWFs

---
 inputman.cc              | 2 +-
 log.cc                   | 6 ++++--
 udp4.h                   | 4 ++--
 vrecordinglist.h         | 9 ++-------
 vrecordinglistadvanced.h | 9 ++-------
 vrecordinglistclassic.h  | 9 ++-------
 6 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/inputman.cc b/inputman.cc
index 25a81a1..a3ce116 100644
--- a/inputman.cc
+++ b/inputman.cc
@@ -59,7 +59,7 @@ bool InputMan::init()
   i1 = inputLinux->init();
   if (!i1) { delete inputLinux; inputLinux = NULL; }
 
-  // FIXME enable modules by new config system
+  // FIXME enable modules by new config system NCONFIG
 
 //  inputCEC = new InputCEC();
 //  i2 = inputCEC->init();
diff --git a/log.cc b/log.cc
index 31db770..fbb767f 100644
--- a/log.cc
+++ b/log.cc
@@ -89,9 +89,11 @@ int Log::init(int startLogLevel, const char* fileName, int tenabled)
   initted = 1;
   logLevel = startLogLevel;
   enabled = tenabled;
-  logfile = fopen(fileName, "a");
+
+  // FIXME fix this with NCONFIG
+//  logfile = fopen(fileName, "a");
 //  logfile = fopen(stdout, "a");
-  //logfile = stdout;
+  logfile = stdout;
 //  logfile = fopen("/log", "a");
 
   if (logfile) return 1;
diff --git a/udp4.h b/udp4.h
index 783b596..f6fb5f6 100644
--- a/udp4.h
+++ b/udp4.h
@@ -17,8 +17,8 @@
     along with VOMP.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef DSOCK_H
-#define DSOCK_H
+#ifndef UDP4_H
+#define UDP4_H
 
 #ifdef WIN32
   #include <winsock2.h>
diff --git a/vrecordinglist.h b/vrecordinglist.h
index 67659dd..21411e9 100644
--- a/vrecordinglist.h
+++ b/vrecordinglist.h
@@ -42,13 +42,8 @@ class VRecordingList : public TBBoxx
     VRecordingList();
     virtual ~VRecordingList();
 
-/*
-#ifndef WIN32
-    using TBBoxx::draw; // Signal the compiler we are intentionally overriding the draw() virtual with different args
-#endif
-*/
-
-    virtual void draw(bool doIndexPop = false)=0;
+    virtual void draw() { draw(false); }
+    virtual void draw(bool doIndexPop)=0;
 
     int handleCommand(int command);
     void processMessage(Message* m);
diff --git a/vrecordinglistadvanced.h b/vrecordinglistadvanced.h
index d629af1..db39134 100644
--- a/vrecordinglistadvanced.h
+++ b/vrecordinglistadvanced.h
@@ -30,13 +30,8 @@ class VRecordingListAdvanced : public VRecordingList
     VRecordingListAdvanced();
     virtual ~VRecordingListAdvanced();
 
-/*
-#ifndef WIN32
-    using TBBoxx::draw; // Signal the compiler we are intentionally overriding the draw() virtual with different args
-#endif
-*/
-
-    void draw(bool doIndexPop = false);
+    void draw() { draw(false); }
+    void draw(bool doIndexPop);
 
     bool load();
     void drawData(bool doIndexPop = false);
diff --git a/vrecordinglistclassic.h b/vrecordinglistclassic.h
index f917b0f..aa3b86f 100644
--- a/vrecordinglistclassic.h
+++ b/vrecordinglistclassic.h
@@ -28,13 +28,8 @@ class VRecordingListClassic : public VRecordingList
     VRecordingListClassic();
     virtual ~VRecordingListClassic();
 
-/*
-#ifndef WIN32
-    using TBBoxx::draw; // Signal the compiler we are intentionally overriding the draw() virtual with different args
-#endif
-*/
-
-    void draw(bool doIndexPop = false);
+    void draw() { draw(false); }
+    void draw(bool doIndexPop);
 
     bool load();
     void drawData(bool doIndexPop = false);
-- 
2.39.5