frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Removed unused variables in skinclassic.c and skinsttng.c

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-01-01 14:40:09 +01:00
parent 26cb900ddf
commit fef0b70bb1
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1260,6 +1260,7 @@ Marco Schl
repeating timer repeating timer
for figuring out some obscure length bytes the the CA PMT Reply data of AlphaCrypt CAMs 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 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> Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP for reporting a bug in displaying the current channel when switching via the SVDRP

2
HISTORY
View File

@ -4055,3 +4055,5 @@ Video Disk Recorder Revision History
the lock is lost (based on a patch from Reinhard Nissl). the lock is lost (based on a patch from Reinhard Nissl).
- Fixed handling multi byte key sequences in cKbdRemote (based on a patch from - Fixed handling multi byte key sequences in cKbdRemote (based on a patch from
Jürgen Schneider). Jürgen Schneider).
- Removed unused variables in skinclassic.c and skinsttng.c (thanks to Marco
Schlüßler).

9
skinclassic.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "skinclassic.h"
@ -378,7 +378,6 @@ private:
int x0, x1; int x0, x1;
int y0, y1, y2, y3; int y0, y1, y2, y3;
int lastCurrentWidth; int lastCurrentWidth;
bool message;
public: public:
cSkinClassicDisplayReplay(bool ModeOnly); cSkinClassicDisplayReplay(bool ModeOnly);
virtual ~cSkinClassicDisplayReplay(); virtual ~cSkinClassicDisplayReplay();
@ -397,7 +396,6 @@ cSkinClassicDisplayReplay::cSkinClassicDisplayReplay(bool ModeOnly)
const cFont *font = cFont::GetFont(fontOsd); const cFont *font = cFont::GetFont(fontOsd);
int lineHeight = font->Height(); int lineHeight = font->Height();
lastCurrentWidth = 0; lastCurrentWidth = 0;
message = false;
x0 = 0; x0 = 0;
x1 = Setup.OSDWidth; x1 = Setup.OSDWidth;
y0 = 0; y0 = 0;
@ -467,12 +465,9 @@ void cSkinClassicDisplayReplay::SetMessage(eMessageType Type, const char *Text)
if (Text) { if (Text) {
osd->SaveRegion(x0, y2, x1 - 1, y3 - 1); 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); 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(); osd->RestoreRegion();
message = false;
}
} }
void cSkinClassicDisplayReplay::Flush(void) void cSkinClassicDisplayReplay::Flush(void)

9
skinsttng.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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 // 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; int y0, y1, y2, y3, y4, y5, y6, y7;
tColor frameColor; tColor frameColor;
int lastCurrentWidth; int lastCurrentWidth;
bool message;
public: public:
cSkinSTTNGDisplayReplay(bool ModeOnly); cSkinSTTNGDisplayReplay(bool ModeOnly);
virtual ~cSkinSTTNGDisplayReplay(); virtual ~cSkinSTTNGDisplayReplay();
@ -666,7 +665,6 @@ cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly)
int lineHeight = font->Height(); int lineHeight = font->Height();
frameColor = Theme.Color(clrReplayFrame); frameColor = Theme.Color(clrReplayFrame);
lastCurrentWidth = 0; lastCurrentWidth = 0;
message = false;
cBitmap bm(play_xpm); cBitmap bm(play_xpm);
x0 = 0; x0 = 0;
x1 = max(SymbolWidth, bm.Width()); 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->SaveRegion(x2, y6, x4 - 1, y7 - 1);
osd->DrawRectangle(x2, y6, x3 - 1, y7 - 1, Theme.Color(clrBackground)); 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); 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(); osd->RestoreRegion();
message = false;
}
} }
void cSkinSTTNGDisplayReplay::Flush(void) void cSkinSTTNGDisplayReplay::Flush(void)