diff options
| author | Martin Dummer <martin.dummer@gmx.net> | 2012-07-01 23:10:05 +0200 |
|---|---|---|
| committer | Martin Dummer <martin.dummer@gmx.net> | 2012-07-01 23:10:05 +0200 |
| commit | 38501c4557eaf51c9b0896d969ae30023671f4d4 (patch) | |
| tree | 3c73d3f288e4079336b01c4ea0f6adc134869e1f | |
| parent | 95a45ede4ab99e39c9fdf02aea58b46068208f89 (diff) | |
| download | vdr-plugin-playlist-38501c4557eaf51c9b0896d969ae30023671f4d4.tar.gz vdr-plugin-playlist-38501c4557eaf51c9b0896d969ae30023671f4d4.tar.bz2 | |
Changes for VDR >= 1.7.3 by Thomas Günther <tom@toms-cafe.de>
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | dataplaylist.c | 4 | ||||
| -rw-r--r-- | dataplaylist.h | 2 | ||||
| -rw-r--r-- | menucontrol.c | 8 |
4 files changed, 15 insertions, 0 deletions
@@ -18,4 +18,5 @@ VDR Plugin 'playlist' Revision History Support for the APIVERSION define as introduced in VDR-1.3.47 by Thomas Günther <tom@toms-cafe.de> Changes for VDR >= 1.3.25 and VDR >= 1.3.36 by viking at vdrportal.de Changes for VDR >= 1.5.7 by Thomas Günther <tom@toms-cafe.de> + Changes for VDR >= 1.7.3 by Thomas Günther <tom@toms-cafe.de> diff --git a/dataplaylist.c b/dataplaylist.c index 89724f6..60ab5d5 100644 --- a/dataplaylist.c +++ b/dataplaylist.c @@ -125,6 +125,7 @@ void cPlaylistRecord::SetDefaults(cRecording *Recording) isdel = false; isnew = false; isedited = false; + isPesRecording = false; start = 0; title = NULL; summary = NULL; @@ -139,6 +140,9 @@ bool cPlaylistRecord::CopyFromRecording(cRecording *Recording) 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())); diff --git a/dataplaylist.h b/dataplaylist.h index e5e32fe..1312791 100644 --- a/dataplaylist.h +++ b/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; } diff --git a/menucontrol.c b/menucontrol.c index 4ea34ed..1ad873d 100644 --- a/menucontrol.c +++ b/menucontrol.c @@ -188,7 +188,11 @@ eOSState cControlPlaylist::PlayRecording(cPlaylistRecord *PlaylistRecord, bool V { 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(cPlaylistRecord *PlaylistRecord, bool V 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); |