r346 - vdr/vdr-xxv/trunk/debian/patches

[Tobias Grimm]

Author: tiber-guest
Date: 2005-03-28 16:52:22 +0000 (Mon, 28 Mar 2005)
New Revision: 346

Modified:
   vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch
Log:
xxv: use XXV_GRABDIR environment variable

Modified: vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch	2005-03-28 16:38:32 UTC (rev 345)
+++ vdr/vdr-xxv/trunk/debian/patches/02_secure-grab.dpatch	2005-03-28 16:52:22 UTC (rev 346)
@@ -5,33 +5,25 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm /tmp/dpep.oAarZ2/vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm
---- vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm	2005-03-28 12:59:55.000000000 +0200
-+++ /tmp/dpep.oAarZ2/vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm	2005-03-28 13:24:12.000000000 +0200
-@@ -96,17 +96,26 @@
-     my $obj = shift || return error ('No Object!' );
-     my $watcher = shift;
-     my $console = shift;
-+    my $file;
-+    
-+    if (! $ENV{TEMPDIR} == "") {
-+        $file = "$ENV{TEMPDIR}/live.jpg";
-+    } else {
-+        $file = $obj->{file};
+diff -urNad vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm /tmp/dpep.41cLFZ/vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm
+--- vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm	2005-03-28 15:35:45.000000000 +0200
++++ /tmp/dpep.41cLFZ/vdr-xxv-0.20/lib/XXV/MODULES/GRAB.pm	2005-03-28 15:45:00.000000000 +0200
+@@ -87,6 +87,10 @@
+         },
+     );
+ 
++    if ($ENV{XXV_GRABDIR}) {
++        $obj->{file} = "$ENV{XXV_GRABDIR}/live.jpg";
 +    }
++
+ 	return $self;
+ }
  
-     # the svdrp module
-     my $svdrp = $obj->{svdrp};
- 
-     # the command
-     my $cmd = sprintf('grab %s jpeg 80 %d %d',
--            $obj->{file},
-+            $file
-             $obj->{xsize},
+@@ -107,6 +111,8 @@
              $obj->{ysize},
      );
  
-+    unlink($file);
++    unlink($obj->{file});
 +    
      my $erg = $svdrp->command($cmd);
      $console->message($erg)