diff options
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | skinclassic.c | 18 | ||||
| -rw-r--r-- | skinsttng.c | 18 |
3 files changed, 4 insertions, 34 deletions
@@ -6505,3 +6505,5 @@ Video Disk Recorder Revision History - Fixed unjustified log entries about changed channel pids (reported by Derek Kelly). - Added an include of VDR's 'Make.global' to libsi's Makefile (thanks to Rolf Ahrenberg). +- Removed displaying the "contents" information from the "Classic VDR" and + "ST:TNG Panels" skins, because it is often wrong and nothing but irritating. diff --git a/skinclassic.c b/skinclassic.c index 38520107..33332467 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.4 2010/02/13 13:44:48 kls Exp $ + * $Id: skinclassic.c 2.5 2010/11/07 15:10:23 kls Exp $ */ #include "skinclassic.h" @@ -361,14 +361,6 @@ void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event) ts.Set(osd, x1, y, x2 - x1, y3 - y, Event->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground)); y += ts.Height(); } - for (int i = 0; Event->Contents(i); i++) { - const char *s = Event->ContentToString(Event->Contents(i)); - if (!isempty(s)) { - const cFont *font = cFont::GetFont(fontSml); - ts.Set(osd, x1, y, x2 - x1, y3 - y, s, font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground)); - y += ts.Height(); - } - } y += font->Height(); if (!isempty(Event->Description())) { textScroller.Set(osd, x1, y, x2 - x1, y3 - y, Event->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground)); @@ -405,14 +397,6 @@ void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording) ts.Set(osd, x1, y, x2 - x1, y3 - y, Info->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground)); y += ts.Height(); } - for (int i = 0; Info->GetEvent()->Contents(i); i++) { - const char *s = Info->GetEvent()->ContentToString(Info->GetEvent()->Contents(i)); - if (!isempty(s)) { - const cFont *font = cFont::GetFont(fontSml); - ts.Set(osd, x1, y, x2 - x1, y3 - y, s, font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground)); - y += ts.Height(); - } - } y += font->Height(); if (!isempty(Info->Description())) { textScroller.Set(osd, x1, y, x2 - x1, y3 - y, Info->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground)); diff --git a/skinsttng.c b/skinsttng.c index b37a2e9d..c39ecce0 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.5 2010/02/13 13:30:59 kls Exp $ + * $Id: skinsttng.c 2.6 2010/11/07 15:10:08 kls Exp $ */ // Star Trek: The Next Generation® is a registered trademark of Paramount Pictures @@ -612,14 +612,6 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event) ts.Set(osd, xl, y, x4 - xl, y4 - y, Event->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground)); y += ts.Height(); } - for (int i = 0; Event->Contents(i); i++) { - const char *s = Event->ContentToString(Event->Contents(i)); - if (!isempty(s)) { - const cFont *font = cFont::GetFont(fontSml); - ts.Set(osd, xl, y, x4 - xl, y4 - y, s, font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground)); - y += ts.Height(); - } - } y += font->Height(); if (!isempty(Event->Description())) { int yt = y; @@ -666,14 +658,6 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording) ts.Set(osd, xl, y, x4 - xl, y4 - y, Info->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground)); y += ts.Height(); } - for (int i = 0; Info->GetEvent()->Contents(i); i++) { - const char *s = Info->GetEvent()->ContentToString(Info->GetEvent()->Contents(i)); - if (!isempty(s)) { - const cFont *font = cFont::GetFont(fontSml); - ts.Set(osd, xl, y, x4 - xl, y4 - y, s, font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground)); - y += ts.Height(); - } - } y += font->Height(); if (!isempty(Info->Description())) { int yt = y; |