r1372 - in vdr/vdr/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2005-10-02 16:34:25 +0000 (Sun, 02 Oct 2005)
New Revision: 1372

Added:
   vdr/vdr/trunk/debian/patches/18_vdr-1.3.33-recordingsmenu.dpatch
   vdr/vdr/trunk/debian/patches/19_vdr-1.3.33-recordingsupdate.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
Log:
Added 18_vdr-1.3.33-recordingsmenu.dpatch and 19_vdr-1.3.33-recordingsupdate.dpatch

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-10-02 10:22:14 UTC (rev 1371)
+++ vdr/vdr/trunk/debian/changelog	2005-10-02 16:34:25 UTC (rev 1372)
@@ -8,6 +8,9 @@
       + Removed 18_vdr-plugin-sky-fix
     - Added initial Swedish translation (sv.po) of the debconf template
       from Daniel Nylander (closes: #330988)
+  * Thomas Günther <tom at toms-cafe.de>
+    - Added 18_vdr-1.3.33-recordingsmenu.dpatch
+    - Added 19_vdr-1.3.33-recordingsupdate.dpatch
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 25 Sep 2005 17:51:14 +0200
 

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2005-10-02 10:22:14 UTC (rev 1371)
+++ vdr/vdr/trunk/debian/patches/00list	2005-10-02 16:34:25 UTC (rev 1372)
@@ -14,6 +14,8 @@
 15_dvbplayer
 16_avoidTrashing
 17_replay
+18_vdr-1.3.33-recordingsmenu
+19_vdr-1.3.33-recordingsupdate
 22_vdr-playerepg
 
 # Patch needed for DVB subtitles or ttxtsubs (does not work with AC3-patch)

Added: vdr/vdr/trunk/debian/patches/18_vdr-1.3.33-recordingsmenu.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/18_vdr-1.3.33-recordingsmenu.dpatch	2005-10-02 10:22:14 UTC (rev 1371)
+++ vdr/vdr/trunk/debian/patches/18_vdr-1.3.33-recordingsmenu.dpatch	2005-10-02 16:34:25 UTC (rev 1372)
@@ -0,0 +1,39 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## 18_vdr-1.3.33-recordingsmenu.dpatch by Klaus Schmidinger <kls at cadsoft.de>
+## from vdr at linuxtv.org mailinglist (Sat, 01 Oct 2005 12:16:44 +0200)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes an error after deleting a recording from a subfolder.
+
+ at DPATCH@
+--- vdr-1.3.33/menu.c	2005/09/25 13:37:21	1.362
++++ vdr-1.3.33/menu.c	2005/10/01 10:12:32
+@@ -1513,6 +1513,7 @@
+      SetCurrent(First());
+   else if (OpenSubMenus && cReplayControl::LastReplayed() && Open(true))
+      return;
++  Display();
+   SetHelpKeys();
+ }
+ 
+@@ -1556,7 +1557,7 @@
+   if (Refresh) {
+      cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
+      if (ri) {
+-        cRecording *Recording = GetRecording(ri);
++        cRecording *Recording = Recordings.GetByName(ri->FileName());
+         if (Recording)
+            CurrentRecording = Recording->FileName();
+         }
+@@ -1583,7 +1584,8 @@
+          }
+       }
+   free(LastItemText);
+-  Display();
++  if (Refresh)
++     Display();
+ }
+ 
+ cRecording *cMenuRecordings::GetRecording(cMenuRecordingItem *Item)
+

Added: vdr/vdr/trunk/debian/patches/19_vdr-1.3.33-recordingsupdate.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/19_vdr-1.3.33-recordingsupdate.dpatch	2005-10-02 10:22:14 UTC (rev 1371)
+++ vdr/vdr/trunk/debian/patches/19_vdr-1.3.33-recordingsupdate.dpatch	2005-10-02 16:34:25 UTC (rev 1372)
@@ -0,0 +1,78 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## 19_vdr-1.3.33-recordingsupdate.dpatch by Klaus Schmidinger <kls at cadsoft.de>
+## from vdr at linuxtv.org mailinglist (Sat, 01 Oct 2005 12:35:30 +0200)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes .update detection if recording dir != /video.
+
+ at DPATCH@
+--- vdr-1.3.33/recording.h	2005/09/25 14:30:13	1.44
++++ vdr-1.3.33/recording.h	2005/10/01 10:24:41
+@@ -93,10 +93,11 @@
+ 
+ class cRecordings : public cList<cRecording>, public cThread {
+ private:
+-  char *updateFileName;
++  static char *updateFileName;
+   bool deleted;
+   time_t lastUpdate;
+   int state;
++  const char *UpdateFileName(void);
+   void Refresh(bool Foreground = false);
+   void ScanVideoDir(const char *DirName, bool Foreground = false);
+ protected:
+--- vdr-1.3.33/recording.c	2005/09/25 14:29:49	1.119
++++ vdr-1.3.33/recording.c	2005/10/01 10:29:02
+@@ -743,10 +743,11 @@
+ 
+ cRecordings Recordings;
+ 
++char *cRecordings::updateFileName = NULL;
++
+ cRecordings::cRecordings(bool Deleted)
+ :cThread("video directory scanner")
+ {
+-  updateFileName = strdup(AddDirectory(VideoDirectory, ".update"));
+   deleted = Deleted;
+   lastUpdate = 0;
+   state = 0;
+@@ -755,7 +756,6 @@
+ cRecordings::~cRecordings()
+ {
+   Cancel(3);
+-  free(updateFileName);
+ }
+ 
+ void cRecordings::Action(void)
+@@ -763,6 +763,13 @@
+   Refresh();
+ }
+ 
++const char *cRecordings::UpdateFileName(void)
++{
++  if (!updateFileName)
++     updateFileName = strdup(AddDirectory(VideoDirectory, ".update"));
++  return updateFileName;
++}
++
+ void cRecordings::Refresh(bool Foreground)
+ {
+   lastUpdate = time(NULL); // doing this first to make sure we don't miss anything
+@@ -825,13 +832,13 @@
+ 
+ void cRecordings::TouchUpdate(void)
+ {
+-  TouchFile(updateFileName);
++  TouchFile(UpdateFileName());
+   lastUpdate = time(NULL); // make sure we don't tigger ourselves
+ }
+ 
+ bool cRecordings::NeedsUpdate(void)
+ {
+-  return lastUpdate < LastModifiedTime(updateFileName);
++  return lastUpdate < LastModifiedTime(UpdateFileName());
+ }
+ 
+ bool cRecordings::Update(bool Wait)
+