Shutdown VDR Patch from Yaris

diff --git a/vompclient.h b/vompclient.h
index cab15990ec68e57591e32781ad6211fb402e3cc5..4ec905e1430858126b38b9baadc05926eabc7789 100644 (file)
--- a/vompclient.h
+++ b/vompclient.h
@@ -78,9 +78,9 @@ class VompClient
 
   private:
     static int nr_clients;
-    void incClients();
-    void decClients();
-
+    static void incClients();
+    static void decClients();
+    
     static ULLONG ntohll(ULLONG a);
     static ULLONG htonll(ULLONG a);
     

diff --git a/vompclientrrproc.c b/vompclientrrproc.c
index 588472183699ba1181f4446077cba796208d72ee..4698eb3e8469783a53e5ee43dbd7eb276257e40a 100644 (file)
--- a/vompclientrrproc.c
+++ b/vompclientrrproc.c
@@ -27,6 +27,7 @@
 #include <vdr/plugin.h>
 #include <vdr/timers.h>
 #include <vdr/menu.h>
+#include <vdr/remote.h>
 #include "recplayer.h"
 #include "mvpreceiver.h"
 #endif
@@ -42,7 +43,7 @@
 
 bool ResumeIDLock;
 
-ULONG VompClientRRProc::VOMP_PROTOCOL_VERSION = 0x00000200;
+ULONG VompClientRRProc::VOMP_PROTOCOL_VERSION = 0x00000301;
 // format is aabbccdd
 // cc is release protocol version, increase with every release, that changes protocol
 // dd is development protocol version, set to zero at every release, 
@@ -258,7 +259,10 @@ bool VompClientRRProc::processPacket()
     case 23:
       result = processDeleteTimer();
       break;
-#endif        
+    case 666:
+      result = processVDRShutdown();
+      break;
+#endif
     case VDR_GETMEDIALIST:
       result = processGetMediaList();
       break;
@@ -1938,6 +1942,17 @@ int VompClientRRProc::processGetMarks()
   return 1;
 }
 
+int VompClientRRProc::processVDRShutdown()
+{
+  log->log("RRProc", Log::DEBUG, "Trying to shutdown VDR");
+  VompClient::decClients(); // Temporarily make this client disappear
+  cRemote::Put(kPower);
+  VompClient::incClients();
+  resp->finalise();
+  x.tcp.sendPacket(resp->getPtr(), resp->getLen());
+  return 1;
+}
+  
 #endif // !VOMPSTANDALONE
 
 

diff --git a/vompclientrrproc.h b/vompclientrrproc.h
index 8e7bc7be9c0219b4e9f48272672df1ea0e327d0a..da6ef12bbc1b5f09f2ef42287c50757477bf3a3e 100644 (file)
--- a/vompclientrrproc.h
+++ b/vompclientrrproc.h
@@ -81,6 +81,7 @@ class VompClientRRProc : public Thread
     int processGetChannelPids();
     int processDeleteTimer();
     int processReScanRecording();           // FIXME obselete
+    int processVDRShutdown();
 #endif
     int processLogin();
     int processConfigSave();
@@ -93,7 +94,7 @@ class VompClientRRProc : public Thread
     int processGetLanguageList();
     int processGetLanguageContent();
     int processSetCharset();
-
+    
     void threadMethod();
 
     VompClient& x;