diff options
| -rw-r--r-- | recording.c | 12 | ||||
| -rw-r--r-- | recording.h | 6 |
2 files changed, 14 insertions, 4 deletions
diff --git a/recording.c b/recording.c index 199d6827..a946fca4 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.100 2005/05/16 15:17:22 kls Exp $ + * $Id: recording.c 1.101 2005/05/22 09:13:26 kls Exp $ */ #include "recording.h" @@ -230,6 +230,14 @@ cRecordingInfo::~cRecordingInfo() delete ownEvent; } +void cRecordingInfo::SetTitleAndDescription(const char *Title, const char *Description) +{ + if (isempty(event->Title()) && !isempty(Title)) + ((cEvent *)event)->SetTitle(Title); + if (!isempty(Description)) + ((cEvent *)event)->SetDescription(Description); +} + bool cRecordingInfo::Read(FILE *f) { if (ownEvent) { @@ -414,7 +422,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event) // timer into the recording info, but it saves us from having to actually // copy the entire event data: if (!isempty(Timer->Summary())) - ((cEvent *)Event)->SetDescription(Timer->Summary()); + info->SetTitleAndDescription(Timer->File(), Timer->Summary()); } cRecording::cRecording(const char *FileName) diff --git a/recording.h b/recording.h index 12b07930..548e8017 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.35 2005/05/16 14:18:43 kls Exp $ + * $Id: recording.h 1.36 2005/05/22 09:08:40 kls Exp $ */ #ifndef __RECORDING_H @@ -34,11 +34,13 @@ public: }; class cRecordingInfo { + friend class cRecording; private: const cEvent *event; cEvent *ownEvent; -public: cRecordingInfo(const cEvent *Event = NULL); + void SetTitleAndDescription(const char *Title, const char *Description); +public: ~cRecordingInfo(); const char *Title(void) const { return event->Title(); } const char *ShortText(void) const { return event->ShortText(); } |