diff options
Diffstat (limited to 'skinsttng.c')
| -rw-r--r-- | skinsttng.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/skinsttng.c b/skinsttng.c index cf60ae14..844cd29f 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 1.8 2004/12/19 15:48:55 kls Exp $ + * $Id: skinsttng.c 1.9 2004/12/26 11:34:29 kls Exp $ */ // Star Trek: The Next Generation® is a registered trademark of Paramount Pictures @@ -289,9 +289,9 @@ void cSkinSTTNGDisplayChannel::Flush(void) { if (withInfo) { if (!message) { - cDayDateTime date; + cString date = DayDateTime(); const cFont *font = cFont::GetFont(fontSml); - osd->DrawText(x4 - font->Width(*date) - 2, y7 - font->Height(*date), *date, Theme.Color(clrChannelDate), frameColor, font); + osd->DrawText(x4 - font->Width(date) - 2, y7 - font->Height(date), date, Theme.Color(clrChannelDate), frameColor, font); } int seen = 0; @@ -456,11 +456,11 @@ void cSkinSTTNGDisplayMenu::SetTitle(const char *Title) void cSkinSTTNGDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue) { - cDayDateTime date; + cString date = DayDateTime(); const cFont *font = cFont::GetFont(fontSml); int d = 10; int d2 = d / 2; - int t4 = x4 - font->Width(*date) - 2; + int t4 = x4 - font->Width(date) - 2; int w = t4 - x3; int t0 = x3 + d2; int t1 = x3 + w / 4; @@ -533,11 +533,11 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event) int y = y3; cTextScroller ts; char t[32]; - snprintf(t, sizeof(t), "%s %s - %s", Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString()); + snprintf(t, sizeof(t), "%s %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString()); ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground)); if (Event->Vps() && Event->Vps() != Event->StartTime()) { char *buffer; - asprintf(&buffer, " VPS: %s", Event->GetVpsString()); + asprintf(&buffer, " VPS: %s", *Event->GetVpsString()); const cFont *font = cFont::GetFont(fontSml); osd->DrawText(x4 - font->Width(buffer), y, buffer, Theme.Color(clrMenuEventVps), frameColor, font); int yb = y + font->Height(); @@ -583,9 +583,9 @@ void cSkinSTTNGDisplayMenu::SetText(const char *Text, bool FixedFont) void cSkinSTTNGDisplayMenu::Flush(void) { if (!message) { - cDayDateTime date; + cString date = DayDateTime(); const cFont *font = cFont::GetFont(fontSml); - osd->DrawText(x4 - font->Width(*date) - 2, y7 - font->Height(*date), *date, Theme.Color(clrMenuDate), frameColor, font); + osd->DrawText(x4 - font->Width(date) - 2, y7 - font->Height(date), date, Theme.Color(clrMenuDate), frameColor, font); } osd->Flush(); } |