diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | skinclassic.c | 9 | ||||
| -rw-r--r-- | skinsttng.c | 9 |
4 files changed, 7 insertions, 14 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 298f5ad1..48c95d8b 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1260,6 +1260,7 @@ Marco Schlüßler <marco@lordzodiac.de> repeating timer for figuring out some obscure length bytes the the CA PMT Reply data of AlphaCrypt CAMs for fixing handling OSD areas that have invalid sizes + for removing unused variables in skinclassic.c and skinsttng.c Jürgen Schmitz <j.schmitz@web.de> for reporting a bug in displaying the current channel when switching via the SVDRP @@ -4055,3 +4055,5 @@ Video Disk Recorder Revision History the lock is lost (based on a patch from Reinhard Nissl). - Fixed handling multi byte key sequences in cKbdRemote (based on a patch from Jürgen Schneider). +- Removed unused variables in skinclassic.c and skinsttng.c (thanks to Marco + Schlüßler). diff --git a/skinclassic.c b/skinclassic.c index fd3ab0b1..18851a8e 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 1.12 2005/05/16 10:45:07 kls Exp $ + * $Id: skinclassic.c 1.13 2006/01/01 14:37:58 kls Exp $ */ #include "skinclassic.h" @@ -378,7 +378,6 @@ private: int x0, x1; int y0, y1, y2, y3; int lastCurrentWidth; - bool message; public: cSkinClassicDisplayReplay(bool ModeOnly); virtual ~cSkinClassicDisplayReplay(); @@ -397,7 +396,6 @@ cSkinClassicDisplayReplay::cSkinClassicDisplayReplay(bool ModeOnly) const cFont *font = cFont::GetFont(fontOsd); int lineHeight = font->Height(); lastCurrentWidth = 0; - message = false; x0 = 0; x1 = Setup.OSDWidth; y0 = 0; @@ -467,12 +465,9 @@ void cSkinClassicDisplayReplay::SetMessage(eMessageType Type, const char *Text) if (Text) { osd->SaveRegion(x0, y2, x1 - 1, y3 - 1); osd->DrawText(x0, y2, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, x1 - x0, y3 - y2, taCenter); - message = true; } - else { + else osd->RestoreRegion(); - message = false; - } } void cSkinClassicDisplayReplay::Flush(void) diff --git a/skinsttng.c b/skinsttng.c index e7f3d8b8..1e2d8cdc 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.15 2005/08/15 11:14:59 kls Exp $ + * $Id: skinsttng.c 1.16 2006/01/01 14:38:14 kls Exp $ */ // Star Trek: The Next Generation® is a registered trademark of Paramount Pictures @@ -643,7 +643,6 @@ private: int y0, y1, y2, y3, y4, y5, y6, y7; tColor frameColor; int lastCurrentWidth; - bool message; public: cSkinSTTNGDisplayReplay(bool ModeOnly); virtual ~cSkinSTTNGDisplayReplay(); @@ -666,7 +665,6 @@ cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly) int lineHeight = font->Height(); frameColor = Theme.Color(clrReplayFrame); lastCurrentWidth = 0; - message = false; cBitmap bm(play_xpm); x0 = 0; x1 = max(SymbolWidth, bm.Width()); @@ -772,12 +770,9 @@ void cSkinSTTNGDisplayReplay::SetMessage(eMessageType Type, const char *Text) osd->SaveRegion(x2, y6, x4 - 1, y7 - 1); osd->DrawRectangle(x2, y6, x3 - 1, y7 - 1, Theme.Color(clrBackground)); osd->DrawText(x3, y6, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, x4 - x3, 0, taCenter); - message = true; } - else { + else osd->RestoreRegion(); - message = false; - } } void cSkinSTTNGDisplayReplay::Flush(void) |