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

Fixed a leftover frame counter in the LCARS skin's replay display after jumping to an editing mark and resuming replay

Browse Source
This commit is contained in:
Klaus Schmidinger 2012-09-19 11:13:17 +02:00
parent e11908cae6
commit e898a28258
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -7249,3 +7249,5 @@ Video Disk Recorder Revision History
- cPatPmtParser::ParsePmt() now also recognizes stream type 0x81 as "AC3", so that - cPatPmtParser::ParsePmt() now also recognizes stream type 0x81 as "AC3", so that
recordings that have been converted from the old PES format to TS can be played recordings that have been converted from the old PES format to TS can be played
(suggested by Jens Vogel). (suggested by Jens Vogel).
- Fixed a leftover frame counter in the LCARS skin's replay display after jumping to
an editing mark and resuming replay.

9
skinlcars.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: skinlcars.c 2.14 2012/09/09 12:16:50 kls Exp $ * $Id: skinlcars.c 2.15 2012/09/19 11:05:50 kls Exp $
*/ */
// "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures, // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@ -1661,6 +1661,7 @@ private:
bool modeOnly; bool modeOnly;
int lineHeight; int lineHeight;
tColor frameColor; tColor frameColor;
int lastCurrentWidth;
cString lastDate; cString lastDate;
tTrackId lastTrackId; tTrackId lastTrackId;
void DrawDate(void); void DrawDate(void);
@ -1685,6 +1686,7 @@ cSkinLCARSDisplayReplay::cSkinLCARSDisplayReplay(bool ModeOnly)
modeOnly = ModeOnly; modeOnly = ModeOnly;
lineHeight = font->Height(); lineHeight = font->Height();
frameColor = Theme.Color(clrReplayFrameBg); frameColor = Theme.Color(clrReplayFrameBg);
lastCurrentWidth = 0;
int d = 5 * lineHeight; int d = 5 * lineHeight;
xp00 = 0; xp00 = 0;
xp01 = xp00 + d / 2; xp01 = xp00 + d / 2;
@ -1801,8 +1803,9 @@ void cSkinLCARSDisplayReplay::SetProgress(int Current, int Total)
void cSkinLCARSDisplayReplay::SetCurrent(const char *Current) void cSkinLCARSDisplayReplay::SetCurrent(const char *Current)
{ {
const cFont *font = cFont::GetFont(fontOsd); const cFont *font = cFont::GetFont(fontOsd);
int w = font->Width(Current) + 10; int w = font->Width(Current);
osd->DrawText(xp03, yp03 - lineHeight, Current, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, w, 0, taLeft); osd->DrawText(xp03, yp03 - lineHeight, Current, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, lastCurrentWidth > w ? lastCurrentWidth : w, 0, taLeft);
lastCurrentWidth = w;
} }
void cSkinLCARSDisplayReplay::SetTotal(const char *Total) void cSkinLCARSDisplayReplay::SetTotal(const char *Total)