r2413 - in vdr/vdr-plugin-extrecmenu/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2006-04-15 01:00:58 +0000 (Sat, 15 Apr 2006)
New Revision: 2413

Added:
   vdr/vdr-plugin-extrecmenu/trunk/debian/patches/02_fix-jumpplay.dpatch
Modified:
   vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
   vdr/vdr-plugin-extrecmenu/trunk/debian/control
   vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list
   vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch
Log:
New upstream release 0.9

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/changelog	2006-04-14 19:23:17 UTC (rev 2412)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/changelog	2006-04-15 01:00:58 UTC (rev 2413)
@@ -1,8 +1,13 @@
 vdr-plugin-extrecmenu (0.9-1) unstable; urgency=low
 
+  * NOT RELEASED YET
+
   * Tobias Grimm <tg at e-tobi.net>
     - New upstream release
     - Updated 01_dvdarchive-path.dpatch
+  * Thomas Günther <tom at toms-cafe.de>
+    - Added 02_fix-jumpplay.dpatch
+    - Build-Depend on vdr-dev (>= 1.3.46-2)
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Thu, 13 Apr 2006 22:14:35 +0200
 

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/control	2006-04-14 19:23:17 UTC (rev 2412)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/control	2006-04-15 01:00:58 UTC (rev 2413)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.3.46-1)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.46-2), dpatch
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-extrecmenu

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list	2006-04-14 19:23:17 UTC (rev 2412)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list	2006-04-15 01:00:58 UTC (rev 2413)
@@ -1 +1,2 @@
 01_dvdarchive-path
+02_fix-jumpplay

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch	2006-04-14 19:23:17 UTC (rev 2412)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch	2006-04-15 01:00:58 UTC (rev 2413)
@@ -3,29 +3,17 @@
 ##
 ## Thomas Günther <tom at toms-cafe.de>
 ##   - adapted to extrecmenu-0.8a
+##   - adapted to extrecmenu-0.9
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Set path to dvdarchive.sh script.
 
 @DPATCH@
-diff -urNad vdr-plugin-extrecmenu-0.9~/mymenurecordings.c vdr-plugin-extrecmenu-0.9/mymenurecordings.c
---- vdr-plugin-extrecmenu-0.9~/mymenurecordings.c	2006-04-10 14:28:30.000000000 +0200
-+++ vdr-plugin-extrecmenu-0.9/mymenurecordings.c	2006-04-13 22:13:06.000000000 +0200
-@@ -217,7 +217,7 @@
-  if(mysetup.wasdvd&&!cControl::Control())
-  {
-   char *cmd;
+--- extrecmenu-0.9/mymenurecordings.c
++++ extrecmenu-0.9/mymenurecordings.c
+@@ -220,1 +220,1 @@
 -  asprintf(&cmd,"dvdarchive.sh umount \"%s\"",myReplayControl::LastReplayed());
 +  asprintf(&cmd,"/usr/share/vdr-plugin-extrecmenu/dvdarchive.sh umount \"%s\"",myReplayControl::LastReplayed());
-   isyslog("[extrecmenu] calling %s to unmount dvd",cmd);
-   int result=SystemExec(cmd);
-   if(result)
-@@ -394,7 +394,7 @@
-       free(msg);
-       strcpy(path,recording->FileName());
-       name=strrchr(path,'/')+1;
+@@ -397,1 +397,1 @@
 -      asprintf(&msg,"dvdarchive.sh mount \"%s\" \"%s\"",path,name); // call the dvdarchive.sh script
 +      asprintf(&msg,"/usr/share/vdr-plugin-extrecmenu/dvdarchive.sh mount \"%s\" \"%s\"",path,name); // call the dvdarchive.sh script
- 
-       isyslog("[extrecmenu] calling %s to mount dvd",msg);
-       int result=SystemExec(msg);

Added: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/02_fix-jumpplay.dpatch
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/02_fix-jumpplay.dpatch	2006-04-14 19:23:17 UTC (rev 2412)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/02_fix-jumpplay.dpatch	2006-04-15 01:00:58 UTC (rev 2413)
@@ -0,0 +1,116 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix-jumpplay.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/extrecmenu-0.9-fix-jumpplay.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes BIG(B|P)A(TCH|CK)VERSION confusion - using JUMPPLAYVERSNUM instead
+## DP: to activate the jumpplay features (version >= 0.7 of jumpplay is needed).
+
+ at DPATCH@
+--- extrecmenu-0.9/myreplaycontrol.c
++++ extrecmenu-0.9/myreplaycontrol.c
+@@ -14,10 +14,9 @@
+ char *myReplayControl::title = NULL;
+ 
+ myReplayControl::myReplayControl(void)
+-#ifdef BIGPATCHVERSION
++#ifdef JUMPPLAYVERSNUM
+ :cDvbPlayerControl(fileName,&marks)
+-#endif
+-#ifndef BIGPATCHVERSION
++#else
+ :cDvbPlayerControl(fileName)
+ #endif
+ {
+@@ -29,7 +28,7 @@
+   timeoutShow = 0;
+   timeSearchActive = false;
+   marks.Load(fileName);
+-#ifdef BIGPACKVERSION
++#ifdef JUMPPLAYVERSNUM
+   lastLoadMarks = time(NULL);
+ #endif
+   cRecording Recording(fileName);
+@@ -253,15 +252,14 @@
+         ShowTimed(2);
+         bool Play, Forward;
+         int Speed;
+-#ifndef BIGPACKVERSION
+-        if (GetReplayMode(Play, Forward, Speed) && !Play)
+-           Goto(Current, true);
+-#endif
+-#ifdef BIGBACKVERSION
++#ifdef JUMPPLAYVERSNUM
+         if (GetReplayMode(Play, Forward, Speed) && !Play) {
+            Goto(Current, true);
+            displayFrames = true;
+            }
++#else
++        if (GetReplayMode(Play, Forward, Speed) && !Play)
++           Goto(Current, true);
+ #endif
+         }
+ 
+@@ -276,11 +274,7 @@
+      if (GetIndex(Current, Total)) {
+         cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
+         if (m) {
+-#ifndef BIGPACKVERSION
+-           Goto(m->position, true);
+-           displayFrames = true;
+-#endif
+-#ifdef BIGPACKVERSION
++#ifdef JUMPPLAYVERSNUM
+            bool Play2, Forward2;
+            int Speed;
+            if (Setup.JumpPlay && GetReplayMode(Play2, Forward2, Speed) &&
+@@ -292,6 +286,9 @@
+               Goto(m->position, true);
+               displayFrames = true;
+               }
++#else
++           Goto(m->position, true);
++           displayFrames = true;
+ #endif
+            }
+         }
+@@ -347,11 +344,10 @@
+      if (!m)
+         m = marks.GetNext(Current);
+      if (m) {
+-#ifndef BIGPACKVERSION
+-        if ((m->Index() & 0x01) != 0)
+-#endif
+-#ifdef BIGPACKVERSION
++#ifdef JUMPPLAYVERSNUM
+         if ((m->Index() & 0x01) != 0 && !Setup.PlayJump)
++#else
++        if ((m->Index() & 0x01) != 0)
+ #endif
+            m = marks.Next(m);
+         if (m) {
+@@ -374,7 +370,7 @@
+ {
+   if (!Active())
+      return osEnd;
+-#ifdef BIGPACKVERSION
++#ifdef JUMPPLAYVERSNUM
+   if (Setup.LoadMarksInterval &&
+       time(NULL) >= lastLoadMarks + Setup.LoadMarksInterval) {
+      marks.Load(fileName, true);
+--- extrecmenu-0.9/myreplaycontrol.h
++++ extrecmenu-0.9/myreplaycontrol.h
+@@ -1,3 +1,4 @@
++#include <vdr/config.h>
+ #include <vdr/dvbplayer.h>
+ #define MODETIMEOUT 3 // seconds
+ 
+@@ -11,7 +12,7 @@
+   bool lastPlay, lastForward;
+   int lastSpeed;
+   time_t timeoutShow;
+-#ifdef BIGPACKVERSION
++#ifdef JUMPPLAYVERSNUM
+   time_t lastLoadMarks;
+ #endif
+   bool timeSearchActive, timeSearchHide;