diff options
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | recording.c | 6 | ||||
| -rw-r--r-- | skins.c | 14 |
3 files changed, 9 insertions, 15 deletions
@@ -7052,7 +7052,7 @@ Video Disk Recorder Revision History - Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank Schmirler). -2012-05-19: Version 1.7.28 +2012-05-20: Version 1.7.28 - Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4. - Fixed getting the maximum short channel name length in case there are no short names @@ -7112,3 +7112,5 @@ Video Disk Recorder Revision History which triggers keeping a proper distance from the edge that taLeft or taRight aligns to. - Fixed checking for UTF-8 support in cFont::Bidi() (reported by Torsten Lang). +- If a recording has no info file, the 'title' of the recording's info is now set + to the recording's name. diff --git a/recording.c b/recording.c index e1f7ec96..5400d630 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 2.53 2012/03/13 13:17:57 kls Exp $ + * $Id: recording.c 2.54 2012/05/20 13:19:15 kls Exp $ */ #include "recording.h" @@ -723,7 +723,9 @@ cRecording::cRecording(const char *FileName) } fclose(f); } - else if (errno != ENOENT) + else if (errno == ENOENT) + info->ownEvent->SetTitle(name); + else LOG_ERROR_STR(*InfoFileName); #ifdef SUMMARYFALLBACK // fall back to the old 'summary.vdr' if there was no 'info.vdr': @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skins.c 2.8 2012/05/12 11:27:23 kls Exp $ + * $Id: skins.c 2.9 2012/05/20 13:49:24 kls Exp $ */ #include "skins.h" @@ -174,17 +174,7 @@ cSkinDisplayReplay::cSkinDisplayReplay(void) void cSkinDisplayReplay::SetRecording(const cRecording *Recording) { - const char *Title = NULL; - const char *ShortText = NULL; - const cRecordingInfo *RecordingInfo = Recording->Info(); - if ((Title = RecordingInfo->Title()) != NULL) - ShortText = RecordingInfo->ShortText(); - else - Title = Recording->Name(); - if (ShortText) - SetTitle(cString::sprintf("%s: %s", Title, ShortText)); - else - SetTitle(Title); + SetTitle(Recording->Name()); } void cSkinDisplayReplay::SetMarks(const cMarks *Marks) |