WIP

A few compiler warning fixes
Remove Thread::postStopCleanup everywhere its not currently needed

diff --git a/afeed.h b/afeed.h
index 69ca1338cd129a878483ef68e1ea9bab49e6bc3c..aafb6e987864aebc94f3c3df0c9a86b2af6aa40c 100644 (file)
--- a/afeed.h
+++ b/afeed.h
@@ -44,7 +44,6 @@ class AFeed : public Thread_TYPE
 
   private:
     void threadMethod();
-    void threadPostStopCleanup() {};
     int audioEnabled;
     bool callbacksend;
     Callback& cb;

diff --git a/dvbsubtitles.h b/dvbsubtitles.h
index d268169a41c8b21e595d0ad3c72a24de2771f955..c76abefc1748172130390e361d13299367e9257d 100644 (file)
--- a/dvbsubtitles.h
+++ b/dvbsubtitles.h
@@ -155,7 +155,6 @@ class DVBSubtitles : public Thread_TYPE
     void lockOutput();
     void unlockOutput();
     void threadMethod();
-    void threadPostStopCleanup() {};
 #ifndef WIN32
     pthread_mutex_t input_mutex;
     pthread_mutex_t output_mutex;

diff --git a/imagereader.cc b/imagereader.cc
index 752637bdff39c0e0ef4010cae83af6115f857d9c..68e829302d8e0f7f0e5d67b13dc7c074e13803bd 100644 (file)
--- a/imagereader.cc
+++ b/imagereader.cc
@@ -215,10 +215,6 @@ void ImageReader::threadMethod()
   return;
 }
 
-void ImageReader::threadPostStopCleanup()
-{
-}
-
 void ImageReader::call(void *) {
   threadSignalNoLock();
 }

diff --git a/imagereader.h b/imagereader.h
index 11c73343eac95279048398b221657cb2bfa73dc9..ac6d244ac9e6db90679d4e05fdfda329dea669ec 100644 (file)
--- a/imagereader.h
+++ b/imagereader.h
@@ -69,7 +69,6 @@ class ImageReader : public Thread_TYPE, public Callback
 
   protected:
     void threadMethod();
-    void threadPostStopCleanup();
 
   private:
     MediaProvider * provider;

diff --git a/input.h b/input.h
index e7842ef5bace9902b5d1424b446db8b51d185132..af1fdbbc4770785915aea23042f7bec51a358b2d 100644 (file)
--- a/input.h
+++ b/input.h
@@ -35,6 +35,8 @@ typedef std::map<ULLONG, UCHAR> RemoteTranslationList;
 class Input: public AbstractOption
 {
   public:
+    virtual ~Input() {}
+
     virtual bool start() { return false; }
     virtual void stop() {}
 

diff --git a/inputcec.h b/inputcec.h
index 11f9973fcba42bffd67faf41ebce8b465971c19c..96b7f36f03213c4aabcdb75381dd3e42ec1295d9 100644 (file)
--- a/inputcec.h
+++ b/inputcec.h
@@ -45,7 +45,7 @@ class InputCEC : public Input
     const char* getHardCodedHardwareKeyNamesForVompKey(UCHAR vompKey);
 
   private:
-    constexpr static char* myModName = "InputCEC";
+    static constexpr const char* myModName = "InputCEC";
     const char* modName() { return myModName; }
     void InitKeymap();
     void InitHWCListwithDefaults();

diff --git a/inputlinux.h b/inputlinux.h
index fd69f0ca115c8e67f78fb4c3d0ee750e2190475a..5bafaa964377184ca4faeb5199a668af9ac4e369 100644 (file)
--- a/inputlinux.h
+++ b/inputlinux.h
@@ -42,7 +42,7 @@ class InputLinux : public Input
     void stop();
 
   private:
-    constexpr static char* myModName = "InputLinux";
+    static constexpr const char* myModName = "InputLinux";
     const char* modName() { return myModName; }
 
     int initted{};

diff --git a/inputudp.cc b/inputudp.cc
index 9e29906cbf2dcaea4302be1d4b79ad8ec79dc878..a052a35f15414ad49fff19467a83bb4da4b3cfb6 100644 (file)
--- a/inputudp.cc
+++ b/inputudp.cc
@@ -129,12 +129,12 @@ void InputUDP::processRequest(const void* data, UINT length)
   sendInputKey(command);
 }
 
-const char* InputUDP::getHardCodedHardwareKeyNamesForVompKey(UCHAR vompKey)
+const char* InputUDP::getHardCodedHardwareKeyNamesForVompKey(UCHAR /* vompKey */)
 {
   return "";
 }
 
-std::string InputUDP::getHardwareKeyName(int hardwareKey)
+std::string InputUDP::getHardwareKeyName(int /* hardwareKey */)
 {
   std::string retval;
   return retval;

diff --git a/inputudp.h b/inputudp.h
index 1b61d1aaf5744767af0c9422b25c609be4f42f0b..3b1805724be1b39c6b9882230d479bf0b903fd29 100644 (file)
--- a/inputudp.h
+++ b/inputudp.h
@@ -41,12 +41,12 @@ class InputUDP : public Input
 
     // InputUDP doesn't do any translation stuff so just keep everything happy here
     void InitHWCListwithDefaults() {};
-    UCHAR TranslateHWCFixed(int code) { return code; };
+    UCHAR TranslateHWCFixed(int code) { return static_cast<UCHAR>(code); };
     const char* getHardCodedHardwareKeyNamesForVompKey(UCHAR vompKey);
     std::string getHardwareKeyName(int hardwareKey);
 
   private:
-    constexpr static char* myModName = "InputUDP";
+    static constexpr const char* myModName = "InputUDP";
     const char* modName() { return myModName; }
 
     bool initted{};

diff --git a/osdopengl.cc b/osdopengl.cc
index 8e22988977c53ae1d0a8356de7ca5d23bcf76890..7cd1fcdc61ea5852fc30b8d962712c3db2f05e53 100644 (file)
--- a/osdopengl.cc
+++ b/osdopengl.cc
@@ -344,15 +344,6 @@ void OsdOpenGL::threadMethod()
        //eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT );
 }
 
-
-void OsdOpenGL::threadPostStopCleanup()
-{
-       //Doing nothing
-       //goo;
-}
-
-
-
 void OsdOpenGL::InternalRendering(){
 
     BeginPainting();

diff --git a/osdopengl.h b/osdopengl.h
index aa078df71e029329d2c30bc64e06cbd47c00bf28..61ca7eee8dbd55d4c0492ecb9b8c022600c71c9f 100644 (file)
--- a/osdopengl.h
+++ b/osdopengl.h
@@ -107,7 +107,6 @@ private:
 
 
        void threadMethod();
-    void threadPostStopCleanup();
 
        // This indicates, that currently a video is played, thus the osd updates are driven by the Videosystem
        bool external_driving;

diff --git a/osdopenvg.cc b/osdopenvg.cc
index 50abcebd442113f995d43021ccdd960eed9d0627..7e68201e299331e179ecb708beb1d85c25f8f7d0 100644 (file)
--- a/osdopenvg.cc
+++ b/osdopenvg.cc
@@ -606,14 +606,6 @@ void OsdOpenVG::threadMethod()
        eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT );
 }
 
-
-void OsdOpenVG::threadPostStopCleanup()
-{
-       //Doing nothing
-       //goo;
-       Log::getInstance()->log("OSD", Log::NOTICE, "Exiting drawing thread");
-}
-
 void OsdOpenVG::InternalRendering(){
        vgmutex.Lock();
        Colour bg=DrawStyle::WALLPAPER;

diff --git a/osdopenvg.h b/osdopenvg.h
index a0b0cc7484d19807eaa360085cfdded63504b9fe..4a293ab27d742998aba82fae7cab8fb0b0e39f96 100644 (file)
--- a/osdopenvg.h
+++ b/osdopenvg.h
@@ -165,7 +165,6 @@ protected:
 
 
     void threadMethod();
-    void threadPostStopCleanup();
 
     /* BCM specific */
 

diff --git a/osdvector.cc b/osdvector.cc
index 0ee1c5fd738e162a742988c171468ec5e648e9cc..a0b44b6479ac13f2a2f612d87b73e4c0677755f3 100644 (file)
--- a/osdvector.cc
+++ b/osdvector.cc
@@ -846,11 +846,6 @@ void OsdVector::PictureReader::threadMethod()
        }
 }
 
-void OsdVector::PictureReader::threadPostStopCleanup()
-{
-
-}
-
 void OsdVector::PictureReader::invalidateLoadIndex(LoadIndex index)
 {
        pict_lock_incoming.Lock();

diff --git a/osdvector.h b/osdvector.h
index 3f2a8bb9feb8731433fd5ff47e59a9cf1e4e7223..411203e6b7d92ecbd83790d9751bce53800dc438 100644 (file)
--- a/osdvector.h
+++ b/osdvector.h
@@ -324,7 +324,6 @@ class OsdVector : public Osd
     protected:
 
        void threadMethod();
-       void threadPostStopCleanup();
 
        Mutex pict_lock_incoming; //locks
        Mutex decoders_lock;

diff --git a/playerliveradio.h b/playerliveradio.h
index f0e36f8ad2f74fafba5e1e658db33de2936fb887..2b7f67c905420cc5ccbf87c4893333eea7c183d0 100644 (file)
--- a/playerliveradio.h
+++ b/playerliveradio.h
@@ -85,7 +85,6 @@ class PlayerLiveRadio : public PlayerLive, public Thread_TYPE, public Callback,
     
   protected:
     void threadMethod();
-    void threadPostStopCleanup() {};
 
   private:
     MessageQueue* messageQueue;

diff --git a/playerlivetv.h b/playerlivetv.h
index 98e4e34a7967e636338b7210d0a903b532eedfcd..028119d6e7d845c7f4a1ea4360941e334f4d64c7 100644 (file)
--- a/playerlivetv.h
+++ b/playerlivetv.h
@@ -98,7 +98,6 @@ class PlayerLiveTV : public PlayerLive, public Thread_TYPE, public Callback, pub
 
   protected:
     void threadMethod();
-    void threadPostStopCleanup() {};
 
   private:
     bool subtitlesShowing;

diff --git a/tfeed.h b/tfeed.h
index a4fbe617e2953df8a69a250b30e1af728451a83f..255ce17b56adb75c6b431308a365d9793a649c64 100644 (file)
--- a/tfeed.h
+++ b/tfeed.h
@@ -43,8 +43,6 @@ public:
 private:
 
        void threadMethod();
-       void threadPostStopCleanup() {
-       };
        int teletextEnabled;
        Callback& cb;
 };

diff --git a/thread.h b/thread.h
index b8a1b91f336504b39a5f50ef3e3c08f82da306f7..ebe70f5fed24ac00030f492b6a84d217f5bb4aea 100644 (file)
--- a/thread.h
+++ b/thread.h
@@ -28,7 +28,7 @@ class Thread
   protected:
     // Override this method in classes derived from ThreadP or ThreadWin
     virtual void threadMethod()=0;
-    virtual void threadPostStopCleanup()=0;
+    virtual void threadPostStopCleanup() {};
 
     // Methods to use from outside the thread
     virtual int threadStart()=0;    // start the thread. threadMethod() will be called in derived class

diff --git a/threadp.h b/threadp.h
index 0fc2d34fda62682c677b909a08ccbe8ff8737981..db68e5c549dabfd436e3eb8121000626e44b3f15 100644 (file)
--- a/threadp.h
+++ b/threadp.h
@@ -32,7 +32,7 @@ class ThreadP : public Thread
   protected:
     // Override this method in derived classes
     virtual void threadMethod()=0;
-    virtual void threadPostStopCleanup()=0;
+    virtual void threadPostStopCleanup() {};
 
     // Methods to use from outside the thread
     int threadStart();    // start the thread. threadMethod() will be called in derived class

diff --git a/timers.h b/timers.h
index 3cbd1d303a458183e036aad54869e6c71c24f841..d15ef30eb8b752dd983e211c44e5d48e57229417 100644 (file)
--- a/timers.h
+++ b/timers.h
@@ -120,7 +120,6 @@ class TimerEvent : public Thread_TYPE
 
     virtual void run();
     virtual void threadMethod();
-    virtual void threadPostStopCleanup() {};
 
     TimerReceiver* client;
     int clientReference;
@@ -149,7 +148,6 @@ class Timers : public Thread_TYPE
 
     // Thread stuff
     virtual void threadMethod();
-    virtual void threadPostStopCleanup() {};
 
     void timerEventFinished(TimerEvent* timerEvent); // internal use only, does not return
 

diff --git a/vconnect.h b/vconnect.h
index 8773a5acd23d6b425609ac431c65edc46c95ee7d..ea576129936bc671d2b3fac39aa7f10fe3882d8b 100644 (file)
--- a/vconnect.h
+++ b/vconnect.h
@@ -51,7 +51,6 @@ class VConnect : public VInfo, public Thread_TYPE
 
   private:
     void threadMethod();
-    void threadPostStopCleanup() {};
     void clearServerIPs();
 
     BoxStack* boxstack;

diff --git a/vdr.h b/vdr.h
index 6506f7550878adcb8fa9945b636a3a3f5f2227b8..a30b24d927833cc3c3eeb0bbca62ca5aadd75e58 100644 (file)
--- a/vdr.h
+++ b/vdr.h
@@ -265,7 +265,6 @@ public ExternLogger
   
     // Thread
     void threadMethod();
-    void threadPostStopCleanup() {};
 
     // EventDispatcher
     virtual bool ed_cb_find(EDReceiver* edr, void* userTag);

diff --git a/vfeed.h b/vfeed.h
index 9ca213af9c2babdc7a0931499bb265843d7d5d94..18acf382a3c144816e141ef94c1c32f2d9dec00d 100644 (file)
--- a/vfeed.h
+++ b/vfeed.h
@@ -50,7 +50,6 @@ class VFeed : public Thread_TYPE
 
   private:
     void threadMethod();
-    void threadPostStopCleanup() {};
     Callback& cb;
     bool waitForSignal;
 };

diff --git a/vmediaview.cc b/vmediaview.cc
index ff18d404aee2cc72f3a16fbdb410e6c51a2c6d82..e66b072a00c820e86f51ee63151641fdfc3e3806 100644 (file)
--- a/vmediaview.cc
+++ b/vmediaview.cc
@@ -226,8 +226,6 @@ class DrawingThread : public Thread_TYPE {
       }
       Log::getInstance()->log("DrawingThread",Log::DEBUG,"finishing interrupt=%d",(int)_interrupted);
     }
-    virtual void threadPostStopCleanup() {}
-
 };
 
 

diff --git a/vscreensaver.h b/vscreensaver.h
index 684755e3574899421ff10ad9ceaeb19631385938..bbd02865e16d088e4864329ce4fdef9cf72687be 100644 (file)
--- a/vscreensaver.h
+++ b/vscreensaver.h
@@ -42,7 +42,6 @@ class VScreensaver : public Boxx, public Thread_TYPE
   private:
 
     virtual void threadMethod();
-    virtual void threadPostStopCleanup() {};
 
     int screenHeight;
     int screenWidth;

diff --git a/vsleeptimer.h b/vsleeptimer.h
index 4a87beb17ecec6b5d877bf3f0475e8b01e9b2e82..3ca76f0396c39dcb46b282b7ef1890b88530236a 100644 (file)
--- a/vsleeptimer.h
+++ b/vsleeptimer.h
@@ -36,7 +36,6 @@ class Sleeptimer : public Thread_TYPE
    const char* SetTime();
    void shutdown();   
    virtual void threadMethod();
-   virtual void threadPostStopCleanup() {};
    
  private:
    int sec{-1};

diff --git a/vvolume.h b/vvolume.h
index dbe4d491b33b66397cf8b6019f284006ba158805..a1a670b7e1dc212f525ad0e2cfd83e076b1b7af9 100644 (file)
--- a/vvolume.h
+++ b/vvolume.h
@@ -36,7 +36,6 @@ class VVolume : public Boxx, public TimerReceiver
     void timercall(int clientReference);
 
   private:
-    int displayCommand;
     int displayVolume;
 
 };

diff --git a/windowsosd.cc b/windowsosd.cc
index 199286d250e299830b7562c034c6cc0aab350754..780b185e4c61a01aade8d0b388aebf57b45ca8a5 100644 (file)
--- a/windowsosd.cc
+++ b/windowsosd.cc
@@ -264,13 +264,6 @@ void WindowsOsd::threadMethod()
        }
 }
 
-
-void WindowsOsd::threadPostStopCleanup()
-{
-       //Doing nothing
-       //goo;
-}
-
 void WindowsOsd::setExternalDriving(DsAllocator* dsall, DWORD width, DWORD height) {
 
        if (swappy)

diff --git a/windowsosd.h b/windowsosd.h
index ec93f7ce884d7ce9ff8a84bf2d2645a6cf03721c..fa1c7236645618ed635b4e31300d5cbe238f2d9f 100644 (file)
--- a/windowsosd.h
+++ b/windowsosd.h
@@ -73,8 +73,6 @@ public:
        virtual int isInitialized()=0;
 
        void threadMethod();
-       void threadPostStopCleanup();
-
 
        enum EVR_state {
                EVR_pres_off = 0,
@@ -138,4 +136,4 @@ protected:
 
 
 
-#endif
\ No newline at end of file
+#endif