diff options
Diffstat (limited to 'recording.c')
| -rw-r--r-- | recording.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/recording.c b/recording.c index ba85ded..e14bb43 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.70 2002/10/20 11:54:29 kls Exp $ + * $Id: recording.c 1.72 2003/01/06 15:36:12 kls Exp $ */ #include "recording.h" @@ -58,6 +58,8 @@ #define TIMERMACRO_TITLE "TITLE" #define TIMERMACRO_EPISODE "EPISODE" +#define MAX_SUBTITLE_LENGTH 40 + void RemoveDeletedRecordings(void) { static time_t LastRemoveCheck = 0; @@ -306,10 +308,17 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c fileName = NULL; name = NULL; // set up the actual name: + const char *OriginalSubtitle = Subtitle; + char SubtitleBuffer[MAX_SUBTITLE_LENGTH]; if (isempty(Title)) Title = Timer->Channel()->Name(); if (isempty(Subtitle)) Subtitle = " "; + else if (strlen(Subtitle) > MAX_SUBTITLE_LENGTH) { + // let's make sure the Subtitle doesn't produce too long a file name: + strn0cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH); + Subtitle = SubtitleBuffer; + } char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE); char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE); if (macroTITLE || macroEPISODE) { @@ -333,6 +342,7 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c // handle summary: summary = !isempty(Timer->Summary()) ? strdup(Timer->Summary()) : NULL; if (!summary) { + Subtitle = OriginalSubtitle; if (isempty(Subtitle)) Subtitle = ""; if (isempty(Summary)) @@ -758,7 +768,7 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi #define MAXINDEXCATCHUP 2 // seconds // The minimum age of an index file for considering it no longer to be written: -#define MININDEXAGE 10 // seconds +#define MININDEXAGE 60 // seconds cIndexFile::cIndexFile(const char *FileName, bool Record) :resumeFile(FileName) |