From 34c79fdc503a2e63bc9907f68d77f2c4dd781a0c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 11 Jan 2015 13:42:26 +0100
Subject: Fixed support for systemd

---
 HISTORY     | 3 ++-
 interface.c | 8 +++++++-
 vdr.c       | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/HISTORY b/HISTORY
index 757b68fa..328b698f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8307,7 +8307,7 @@ Video Disk Recorder Revision History
 - The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, sdt.h and
   the functional modification to cFont::CreateFont().
 
-2015-01-09: Version 2.1.7
+2015-01-11: Version 2.1.7
 
 - No longer logging an error message in DirSizeMB() if the given directory doesn't
   exist. This avoids lots of log entries in case several VDRs use the same video
@@ -8341,3 +8341,4 @@ Video Disk Recorder Revision History
 - Fixed (well, actually worked around) a problem with subtitles not being displayed
   because the broadcaster doesn't set the data's version numbers as required by the
   DVB standard (thanks to Rolf Ahrenberg).
+- Fixed support for systemd (thanks to Christopher Reimer).
diff --git a/interface.c b/interface.c
index 82091d99..6bf7ffce 100644
--- a/interface.c
+++ b/interface.c
@@ -4,12 +4,15 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 2.2 2012/11/19 12:21:43 kls Exp $
+ * $Id: interface.c 3.1 2015/01/11 13:37:47 kls Exp $
  */
 
 #include "interface.h"
 #include <ctype.h>
 #include <stdlib.h>
+#ifdef SDNOTIFY
+#include <systemd/sd-daemon.h>
+#endif
 #include <unistd.h>
 #include "i18n.h"
 #include "status.h"
@@ -159,6 +162,9 @@ void cInterface::LearnKeys(void)
       bool known = Keys.KnowsRemote(Remote->Name());
       dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys");
       if (!known) {
+#ifdef SDNOTIFY
+         sd_notify(0, "READY=1\nSTATUS=Learning keys...");
+#endif
          cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu();
          DisplayMenu->SetMenuCategory(mcUnknown);
          char Headline[256];
diff --git a/vdr.c b/vdr.c
index 187332e0..dfd37725 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 3.12 2014/04/14 12:17:17 kls Exp $
+ * $Id: vdr.c 3.13 2015/01/11 13:36:28 kls Exp $
  */
 
 #include <getopt.h>
@@ -877,7 +877,7 @@ int main(int argc, char *argv[])
      }
 
 #ifdef SDNOTIFY
-  sd_notify(0, "READY=1");
+  sd_notify(0, "READY=1\nSTATUS=Ready");
 #endif
 
   // Main program loop:
-- 
cgit v1.2.3