Some comments and remove an unneeded include

diff --git a/control.cc b/control.cc
index d2f61e436842b919d43b27e120ba49df026aefed..8427fced15eb345de39a37f2a1c35ebd271d3410 100644 (file)
--- a/control.cc
+++ b/control.cc
@@ -902,8 +902,9 @@ void Control::doJustConnected(VConnect* vconnect)
 #endif
       video->shutdown();
 
+      // FIXME FIXME FIXME why do this?
       inputMan->shutdown(); // need on raspberry shut not do any harm, hopefully
-      inputMan->init(); // FIXME this breaks badly now
+      inputMan->init();
 
       // Get video and osd back up with the new mode
       if (!strcmp(config, "PAL"))

diff --git a/vdr.cc b/vdr.cc
index d4d301d2d4958075f130e74d3acdd4169fe1b8fb..6d8a953818df960edb626fb972d2281f5c0615aa 100644 (file)
--- a/vdr.cc
+++ b/vdr.cc
@@ -23,7 +23,6 @@
 #include "recinfo.h"
 #include "channel.h"
 #include "event.h"
-#include "wol.h"
 #include "vdrrequestpacket.h"
 #include "vdrresponsepacket.h"
 #include "control.h"

diff --git a/videoomx.cc b/videoomx.cc
index a194925373caf09cd7b6299323dbc625f6443a4b..c2dc0ba315a661ecf56bc14e7a450b673198fdb1 100644 (file)
--- a/videoomx.cc
+++ b/videoomx.cc
@@ -761,9 +761,10 @@ int VideoOMX::signalOff()
        //TODO reinit osd
        LogNT::getInstance()->info(TAG, "signalOff");
        Osd::getInstance()->stopUpdate(); // turn off drawing thread
+    // FIXME FIXME FIXME why do this? Probably to do with reinitting CEC, but should refine this
        InputMan::getInstance()->shutdown();
        vc_tv_power_off();
-       InputMan::getInstance()->init(); // FIXME
+       InputMan::getInstance()->init();
        signalon=false;
     return 1;
 }