r7590 - in /vdr/vdr-plugin-playlist/trunk/debian: changelog dirs patches/00list patches/94_playlist-0.0.2-1.7.3.dpatch

[tom-guest at users.alioth.debian.org]

Author: tom-guest
Date: Tue Apr  7 00:26:18 2009
New Revision: 7590

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7590
Log:
Added 94_playlist-0.0.2-1.7.3.dpatch

Added:
    vdr/vdr-plugin-playlist/trunk/debian/patches/94_playlist-0.0.2-1.7.3.dpatch
Removed:
    vdr/vdr-plugin-playlist/trunk/debian/dirs
Modified:
    vdr/vdr-plugin-playlist/trunk/debian/changelog
    vdr/vdr-plugin-playlist/trunk/debian/patches/00list

Modified: vdr/vdr-plugin-playlist/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-playlist/trunk/debian/changelog?rev=7590&op=diff
==============================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-playlist/trunk/debian/changelog Tue Apr  7 00:26:18 2009
@@ -1,3 +1,9 @@
+vdr-plugin-playlist (0.0.1+0.0.2rc3-29) UNRELEASED; urgency=low
+
+  * Added 94_playlist-0.0.2-1.7.3.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Mon, 06 Apr 2009 23:16:07 +0200
+
 vdr-plugin-playlist (0.0.1+0.0.2rc3-28) experimental; urgency=low
 
   * Dropped patchlevel control field

Modified: vdr/vdr-plugin-playlist/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-playlist/trunk/debian/patches/00list?rev=7590&op=diff
==============================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-playlist/trunk/debian/patches/00list Tue Apr  7 00:26:18 2009
@@ -3,3 +3,4 @@
 90_APIVERSION
 91_playlist-0.0.2rc3-fix-1.3.25
 93_playlist-0.0.2-1.5.7
+94_playlist-0.0.2-1.7.3

Added: vdr/vdr-plugin-playlist/trunk/debian/patches/94_playlist-0.0.2-1.7.3.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-playlist/trunk/debian/patches/94_playlist-0.0.2-1.7.3.dpatch?rev=7590&op=file
==============================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/patches/94_playlist-0.0.2-1.7.3.dpatch (added)
+++ vdr/vdr-plugin-playlist/trunk/debian/patches/94_playlist-0.0.2-1.7.3.dpatch Tue Apr  7 00:26:18 2009
@@ -1,0 +1,72 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 94_playlist-0.0.2-1.7.3.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/playlist-0.0.2-1.7.3.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.7.3.
+
+ at DPATCH@
+--- playlist-0.0.2/dataplaylist.c
++++ playlist-0.0.2/dataplaylist.c
+@@ -125,6 +125,7 @@ void cPlaylistRecord::SetDefaults(cRecor
+   isdel = false;
+   isnew = false;
+   isedited = false;
++  isPesRecording = false;
+   start = 0;
+   title = NULL;
+   summary = NULL;
+@@ -139,6 +140,9 @@ bool cPlaylistRecord::CopyFromRecording(
+   if (recording)
+   {
+     isedited = recording->IsEdited();
++#if VDRVERSNUM >= 10703
++    isPesRecording = recording->IsPesRecording();
++#endif
+     isnew = recording->IsNew();
+     start = recording->start;
+     title = strdup(recording->Title('\t', true, recording->HierarchyLevels()));
+--- playlist-0.0.2/dataplaylist.h
++++ playlist-0.0.2/dataplaylist.h
+@@ -43,6 +43,7 @@ private:
+   time_t start;    // copy from cRecording
+   char   *title;   // copy from cRecording
+   bool   isedited; // copy from cRecording
++  bool   isPesRecording; // copy from cRecording
+   char   *summary; // copy from cRecording
+   int    options[Option_max];
+   cPlaylistRecord *parent;
+@@ -66,6 +67,7 @@ public:
+   char *Filename(void)      { return filename; }
+   bool IsNew(void)          { return isnew; }
+   bool IsEdited(void)       { return isedited; }
++  bool IsPesRecording(void) const { return isPesRecording; }
+   bool IsDir(void)          { return isdir; }
+   bool IsDel(void)          { return isdel; }
+   bool IsDirOrDel(void)     { return isdir || isdel; }
+--- playlist-0.0.2/menucontrol.c
++++ playlist-0.0.2/menucontrol.c
+@@ -188,7 +188,11 @@ eOSState cControlPlaylist::PlayRecording
+   {
+     if (PlaylistRecord->IsNew() && !PlaylistRecord->IsEdited() && PlaylistRecord->Option(Option_jumpmark))
+     {
++#if VDRVERSNUM >= 10703
++      cResumeFile *resume = new cResumeFile(PlaylistRecord->Filename(), PlaylistRecord->IsPesRecording());
++#else
+       cResumeFile *resume = new cResumeFile(PlaylistRecord->Filename());
++#endif
+       int res = resume->Read();
+       delete resume;
+       if (res < 0) // new file
+@@ -205,7 +209,11 @@ eOSState cControlPlaylist::PlayRecording
+               mark = marks->GetNext(mark)->position;
+               mark = marks->GetNext(mark)->position;
+             }
++#if VDRVERSNUM >= 10703
++            cResumeFile *resume = new cResumeFile(PlaylistRecord->Filename(), PlaylistRecord->IsPesRecording());
++#else
+             cResumeFile *resume = new cResumeFile(PlaylistRecord->Filename());
++#endif
+             if (mark > 0 && resume)
+             {
+               resume->Save(mark);