diff options
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | PLUGINS/src/skincurses/HISTORY | 5 | ||||
| -rw-r--r-- | PLUGINS/src/skincurses/skincurses.c | 7 | ||||
| -rw-r--r-- | config.h | 6 | ||||
| -rw-r--r-- | skinclassic.c | 5 | ||||
| -rw-r--r-- | skinlcars.c | 5 | ||||
| -rw-r--r-- | skinsttng.c | 5 |
7 files changed, 22 insertions, 16 deletions
@@ -7684,3 +7684,8 @@ Video Disk Recorder Revision History immediately. - When sorting recordings by name, folders are now always at the top of the list. - Updated the Russian OSD texts (thanks to Oleg Roitburd). + +2013-03-03: Version 1.7.40 + +- The "Recording info" page of the skins that come with VDR now displays the name of + the channel (if available) from which this recording was taken. diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY index 74a36dbe..53e70e81 100644 --- a/PLUGINS/src/skincurses/HISTORY +++ b/PLUGINS/src/skincurses/HISTORY @@ -109,3 +109,8 @@ VDR Plugin 'skincurses' Revision History 2013-01-12: Version 0.1.14 - Adapted Makefile to changes introduced in recent VDR versions. + +2013-03-03: Version 0.1.15 + +- The "Recording info" page now displays the name of the channel (if available) + from which this recording was taken. diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c index 2a9f042d..da9d17ae 100644 --- a/PLUGINS/src/skincurses/skincurses.c +++ b/PLUGINS/src/skincurses/skincurses.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: skincurses.c 2.11 2013/01/12 14:13:12 kls Exp $ + * $Id: skincurses.c 2.12 2013/03/03 15:33:59 kls Exp $ */ #include <ncurses.h> @@ -12,7 +12,7 @@ #include <vdr/skins.h> #include <vdr/videodir.h> -static const char *VERSION = "0.1.14"; +static const char *VERSION = "0.1.15"; static const char *DESCRIPTION = trNOOP("A text only skin"); static const char *MAINMENUENTRY = NULL; @@ -447,8 +447,7 @@ void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording) const cRecordingInfo *Info = Recording->Info(); int y = 2; cTextScroller ts; - char t[32]; - snprintf(t, sizeof(t), "%s %s", *DateString(Recording->Start()), *TimeString(Recording->Start())); + cString t = cString::sprintf("%s %s %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : ""); ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground); y += ts.Height(); if (Info->GetEvent()->ParentalRating()) { @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 2.69 2013/02/18 10:41:43 kls Exp $ + * $Id: config.h 2.70 2013/03/03 15:38:17 kls Exp $ */ #ifndef __CONFIG_H @@ -22,8 +22,8 @@ // VDR's own version number: -#define VDRVERSION "1.7.39" -#define VDRVERSNUM 10739 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.7.40" +#define VDRVERSNUM 10740 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: diff --git a/skinclassic.c b/skinclassic.c index bbf36766..b9919d84 100644 --- a/skinclassic.c +++ b/skinclassic.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinclassic.c 2.9 2013/02/22 15:25:31 kls Exp $ + * $Id: skinclassic.c 2.10 2013/03/03 15:26:09 kls Exp $ */ #include "skinclassic.h" @@ -391,8 +391,7 @@ void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording) const cFont *font = cFont::GetFont(fontOsd); int y = y2; cTextScroller ts; - char t[32]; - snprintf(t, sizeof(t), "%s %s", *DateString(Recording->Start()), *TimeString(Recording->Start())); + cString t = cString::sprintf("%s %s %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : ""); ts.Set(osd, x1, y, x2 - x1, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground)); y += ts.Height(); if (Info->GetEvent()->ParentalRating()) { diff --git a/skinlcars.c b/skinlcars.c index 7079d785..5914f4e6 100644 --- a/skinlcars.c +++ b/skinlcars.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinlcars.c 2.19 2013/02/15 15:08:02 kls Exp $ + * $Id: skinlcars.c 2.20 2013/03/03 15:23:58 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures, @@ -1599,8 +1599,7 @@ void cSkinLCARSDisplayMenu::SetRecording(const cRecording *Recording) int xl = xi00; int y = yi00; cTextScroller ts; - char t[32]; - snprintf(t, sizeof(t), "%s %s", *DateString(Recording->Start()), *TimeString(Recording->Start())); + cString t = cString::sprintf("%s %s %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : ""); ts.Set(osd, xl, y, xi01 - xl, yi01 - y, t, font, Theme.Color(clrEventTime), Theme.Color(clrBackground)); y += ts.Height(); if (Info->GetEvent()->ParentalRating()) { diff --git a/skinsttng.c b/skinsttng.c index 94f54083..39a831a8 100644 --- a/skinsttng.c +++ b/skinsttng.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinsttng.c 2.16 2012/09/09 11:39:06 kls Exp $ + * $Id: skinsttng.c 2.17 2013/03/03 15:29:28 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures @@ -707,8 +707,7 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording) int xl = x3 + TextSpacing; int y = y3; cTextScroller ts; - char t[32]; - snprintf(t, sizeof(t), "%s %s", *DateString(Recording->Start()), *TimeString(Recording->Start())); + cString t = cString::sprintf("%s %s %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : ""); ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground)); y += ts.Height(); if (Info->GetEvent()->ParentalRating()) { |