r619 - vdr/vdr-plugin-wapd/trunk/debian/patches

[Thomas Schmidt]

Author: tschmidt
Date: 2005-05-31 13:31:49 +0000 (Tue, 31 May 2005)
New Revision: 619

Modified:
   vdr/vdr-plugin-wapd/trunk/debian/patches/03_vdr_1.3.24-fix.dpatch
Log:
vdr-plugin-wapd: updated 03_vdr_1.3.24-fix to work with vdr 1.3.25 too ;-)


Modified: vdr/vdr-plugin-wapd/trunk/debian/patches/03_vdr_1.3.24-fix.dpatch
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/patches/03_vdr_1.3.24-fix.dpatch	2005-05-31 13:24:15 UTC (rev 618)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/03_vdr_1.3.24-fix.dpatch	2005-05-31 13:31:49 UTC (rev 619)
@@ -6,9 +6,9 @@
 ## DP: (Many thanks to Ville Skyttä)
 
 @DPATCH@
-diff -urNad vdr-plugin-wapd-0.7a/server.c /tmp/dpep.Y3Ruln/vdr-plugin-wapd-0.7a/server.c
---- vdr-plugin-wapd-0.7a/server.c	2005-05-31 15:12:27.956145104 +0200
-+++ /tmp/dpep.Y3Ruln/vdr-plugin-wapd-0.7a/server.c	2005-05-31 15:12:56.190852776 +0200
+diff -urNad vdr-plugin-wapd-0.7a/server.c /tmp/dpep.xmLJUd/vdr-plugin-wapd-0.7a/server.c
+--- vdr-plugin-wapd-0.7a/server.c	2005-05-31 15:26:10.520829328 +0200
++++ /tmp/dpep.xmLJUd/vdr-plugin-wapd-0.7a/server.c	2005-05-31 15:30:28.740573960 +0200
 @@ -229,7 +229,11 @@
    if (Option("settings")) {
       unurilize(getopt);
@@ -21,3 +21,17 @@
          if (nr) {
             cChannel *channel = Channels.GetByNumber(nr);
             if (Channels.HasUniqueChannelID(&ch, channel)) {
+@@ -549,8 +553,13 @@
+            int level = recording->HierarchyLevels();
+            char *title = wmlescape(strdup(recording->Title(' ', false, level)));
+            ReplyBuffer("%s" WML_BR(), title);
++#if VDRVERSNUM > 10324
++           if (recording->Info()->Description()) {
++              char *sum = wmlescape(strdup(recording->Info()->Description()));
++#else
+            if (recording->Summary()) {
+               char *sum = wmlescape(strdup(recording->Summary()));
++#endif
+               char *tok;
+               char *subtitle = strtok_r(sum, "\n", &tok);
+               subtitle = strtok_r(NULL, "\n", &tok);