r3593 - in vdr/vdr-plugin-vdrcd/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-10-31 16:34:42 +0100 (Tue, 31 Oct 2006)
New Revision: 3593

Added:
   vdr/vdr-plugin-vdrcd/trunk/debian/patches/11_dvd-archive.dpatch
Modified:
   vdr/vdr-plugin-vdrcd/trunk/debian/changelog
   vdr/vdr-plugin-vdrcd/trunk/debian/patches/00list
Log:
Added 11_dvd-archive.dpatch from Christian Wicke <christian at nimkannon.de>


Modified: vdr/vdr-plugin-vdrcd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/changelog	2006-10-23 08:19:47 UTC (rev 3592)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/changelog	2006-10-31 15:34:42 UTC (rev 3593)
@@ -1,3 +1,9 @@
+vdr-plugin-vdrcd (0.0.10.1-24) unstable; urgency=low
+
+  * Added 11_dvd-archive.dpatch from Christian Wicke <christian at nimkannon.de>
+
+ -- Tobias Grimm <tg at e-tobi.net>  Tue, 31 Oct 2006 16:33:42 +0100
+
 vdr-plugin-vdrcd (0.0.10.1-23) unstable; urgency=low
 
   [ Thomas Schmidt ]

Modified: vdr/vdr-plugin-vdrcd/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/patches/00list	2006-10-23 08:19:47 UTC (rev 3592)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/patches/00list	2006-10-31 15:34:42 UTC (rev 3593)
@@ -1,4 +1,5 @@
 01_Makefile-fPIC-fix
 10_mp3-kUp-fix
+11_dvd-archive
 
 90_APIVERSION.dpatch

Added: vdr/vdr-plugin-vdrcd/trunk/debian/patches/11_dvd-archive.dpatch
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/patches/11_dvd-archive.dpatch	2006-10-23 08:19:47 UTC (rev 3592)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/patches/11_dvd-archive.dpatch	2006-10-31 15:34:42 UTC (rev 3593)
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_dvd-archive.dpatch by Christian Wicke <christian at nimkannon.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Instead of changing the whole video directory of VDR to point to the
+## DP: archive DVD, make a symlink within VDR's video directory and
+## DP: open the recordings menu with this symlink as base dir.
+
+ at DPATCH@
+diff -urNad vdr-plugin-vdrcd-0.0.10.1~/vdrcd.c vdr-plugin-vdrcd-0.0.10.1/vdrcd.c
+--- vdr-plugin-vdrcd-0.0.10.1~/vdrcd.c	2006-10-31 16:27:25.000000000 +0100
++++ vdr-plugin-vdrcd-0.0.10.1/vdrcd.c	2006-10-31 16:28:05.000000000 +0100
+@@ -39,6 +39,7 @@
+ 
+ #define VDRSUBDIR "2002-01-01.01.01.99.99.rec"
+ #define FINDCMD   "find %s -follow -type f -name '%s' 2> /dev/null"
++#define ARCHIVEFOLDER ".vdrcd-archive"
+ 
+ #define trP(x,p) I18nTranslate(x, Typelist[p].PlugIn)
+ 
+@@ -271,29 +272,33 @@
+ 	}
+ 
+ 	if (Typelist[type].PlugIn == NULL) {
+-		const char *oldvideodir = VideoDirectory;
++		const char *target;
+ 
+ 		if (Typelist[type].NeedsDir) {
+ 			if (tmpcdrom == NULL) {
+ 				tmpcdrom = tmpnam(NULL);
+ 				mkdir(tmpcdrom,0777);
+-				sprintf(path, "%s/cdrom", tmpcdrom);
++				asprintf(&path, "%s/cdrom", tmpcdrom);
+ 				mkdir(path, 0777);
++				free(path);
+ 				asprintf(&path, "%s/cdrom/%s", tmpcdrom, VDRSUBDIR);
+ 				symlink(Directories[dir], path);
+ 				free(path);
+ 			}
+-			VideoDirectory = tmpcdrom;
++			target = tmpcdrom;
+ 		} else
+-			VideoDirectory = Directories[dir];
++			target = Directories[dir];
+ 
+-		DPRINT("open recmenu in %s\n", VideoDirectory);
++		asprintf(&path, "%s/%s", VideoDirectory, ARCHIVEFOLDER);
++		DPRINT("creating symlink from %s to %s\n", target, path);
++		unlink(path);
++		symlink(target, path);
++		free(path);
+ 
+ #if VDRVERSNUM >= 10311
+ 		Recordings.Load();
+ #endif
+-		cOsdMenu *menu = new cMenuRecordings();
+-		VideoDirectory = oldvideodir;
++		cOsdMenu *menu = new cMenuRecordings(ARCHIVEFOLDER, 1);
+ 		status->NumClears() = 3;
+ 
+ 		return menu;


Property changes on: vdr/vdr-plugin-vdrcd/trunk/debian/patches/11_dvd-archive.dpatch
___________________________________________________________________
Name: svn:executable
   + *