From 71c17e50642d9256dc5cac86a284f80f8acf75bb Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Tue, 3 Oct 2000 12:44:15 +0200 Subject: [PATCH] Implemented 'new recording' indicator --- CONTRIBUTORS | 1 + HISTORY | 5 +++-- MANUAL | 2 +- menu.c | 4 ++-- recording.c | 14 +++++++++++--- recording.h | 4 ++-- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 03fd4bc0..a70ff64b 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -6,6 +6,7 @@ Carsten Koch for implementing the 'Summary' feature for adding the 'epg2timers' tool (see Tools/epg2timers) for his idea of using multiple disks (and for testing this feature) + for implementing the 'new recording' indicator Plamen Ganev for fixing the frequency offset for Hotbird channels diff --git a/HISTORY b/HISTORY index 31a40a1c..143eb2fe 100644 --- a/HISTORY +++ b/HISTORY @@ -206,11 +206,12 @@ Video Disk Recorder Revision History 2000-10-03: Version 0.65 -- Modified LIRC interface to better handle repeat function (by Carsten Koch). +- Modified LIRC interface to better handle repeat function. - Faster OSD by first writing into a bitmap and then sending the entire bitmap to the DVB driver at once (requires the patch 'dvb.c.071.diff' to be applied against the version 0.71 DVB driver file 'dvb.c'). - When switching channels the channel is now immediately displayed, and the current/next information is shown as soon as it becomes available. - No longer displaying the year in the 'Recordings' menu to save space for the - title (by Carsten Koch). + title. +- The 'Recordings' menu now displays a '*' to indicate new recordings. diff --git a/MANUAL b/MANUAL index 91c9bffd..44c875f8 100644 --- a/MANUAL +++ b/MANUAL @@ -97,7 +97,7 @@ Video Disk Recorder User's Manual All recordings are listed in the "Recordings" menu. Browse through the list with the "Up" and "Down" button and press "Ok" (or the "Red" button) - to start playback. + to start playback. New recordings are marked with an '*'. Playback can be stopped via the Main menu by selecting "Stop replaying", or by pressing the "Blue" button outside the menu. diff --git a/menu.c b/menu.c index 63cd0a47..00b94b5a 100644 --- a/menu.c +++ b/menu.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 1.28 2000/10/03 11:32:41 kls Exp $ + * $Id: menu.c 1.29 2000/10/03 12:38:03 kls Exp $ */ #include "menu.h" @@ -985,7 +985,7 @@ cMenuRecordingItem::cMenuRecordingItem(cRecording *Recording) void cMenuRecordingItem::Set(void) { - SetText(recording->Title('\t')); + SetText(recording->Title('\t', true)); } // --- cMenuRecordings ------------------------------------------------------- diff --git a/recording.c b/recording.c index ae59688f..60ea4a1c 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 1.17 2000/10/03 11:32:03 kls Exp $ + * $Id: recording.c 1.18 2000/10/03 12:39:28 kls Exp $ */ #define _GNU_SOURCE @@ -15,6 +15,7 @@ #include #include #include +#include "dvbapi.h" #include "interface.h" #include "tools.h" #include "videodir.h" @@ -170,17 +171,24 @@ const char *cRecording::FileName(void) return fileName; } -const char *cRecording::Title(char Delimiter) +const char *cRecording::Title(char Delimiter, bool NewIndicator) { + char New = ' '; + if (NewIndicator) { + cResumeFile ResumeFile(FileName()); + if (ResumeFile.Read() <= 0) + New = '*'; + } delete titleBuffer; titleBuffer = NULL; struct tm *t = localtime(&start); - asprintf(&titleBuffer, "%02d.%02d%c%02d:%02d%c%s", + asprintf(&titleBuffer, "%02d.%02d%c%02d:%02d%c%c%s", t->tm_mday, t->tm_mon + 1, Delimiter, t->tm_hour, t->tm_min, + New, Delimiter, name); return titleBuffer; diff --git a/recording.h b/recording.h index dc3b3d74..7511c659 100644 --- a/recording.h +++ b/recording.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.h 1.9 2000/07/28 13:53:54 kls Exp $ + * $Id: recording.h 1.10 2000/10/03 12:27:49 kls Exp $ */ #ifndef __RECORDING_H @@ -31,7 +31,7 @@ public: cRecording(const char *FileName); ~cRecording(); const char *FileName(void); - const char *Title(char Delimiter = ' '); + const char *Title(char Delimiter = ' ', bool NewIndicator = false); const char *Summary(void) { return summary; } bool WriteSummary(void); bool Delete(void);