diff options
Diffstat (limited to 'skinsttng.c')
| -rw-r--r-- | skinsttng.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/skinsttng.c b/skinsttng.c index c9c3031..97e5308 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.11 2011/08/21 11:02:26 kls Exp $ + * $Id: skinsttng.c 2.13 2012/03/05 12:01:26 kls Exp $ */ // Star Trek: The Next Generation® is a registered trademark of Paramount Pictures @@ -284,7 +284,7 @@ void cSkinSTTNGDisplayChannel::SetChannel(const cChannel *Channel, int Number) } } osd->DrawText(x3 + TextFrame, y0, ChannelString(Channel, Number), Theme.Color(clrChannelName), frameColor, cFont::GetFont(fontOsd), x - x3 - TextFrame); - lastSignalDisplay = time(NULL); // don't get slowed down during heavy zapping + lastSignalDisplay = 0; } void cSkinSTTNGDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Following) @@ -341,8 +341,8 @@ void cSkinSTTNGDisplayChannel::Flush(void) osd->DrawText(x3 + TextFrame, y6, Track ? Track->description : "", Theme.Color(clrChannelName), frameColor, font, x4 - x3 - w - 2 * TextFrame); strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description)); } - if (time(NULL) != lastSignalDisplay) { - int DeviceNumber = cDevice::ActualDevice()->DeviceNumber() + 1; + int DeviceNumber = cDevice::ActualDevice()->DeviceNumber() + 1; + if (DeviceNumber != lastDeviceNumber || time(NULL) != lastSignalDisplay) { int SignalStrength = cDevice::ActualDevice()->SignalStrength(); int SignalQuality = cDevice::ActualDevice()->SignalQuality(); if (DeviceNumber != lastDeviceNumber || SignalStrength != lastSignalStrength || SignalQuality != lastSignalQuality) { @@ -783,9 +783,6 @@ public: virtual void Flush(void); }; -#define SymbolWidth 30 -#define SymbolHeight 30 - cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly) { const cFont *font = cFont::GetFont(fontSml); @@ -794,7 +791,7 @@ cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly) lastCurrentWidth = 0; cBitmap bm(play_xpm); x0 = 0; - x1 = max(SymbolWidth, bm.Width()); + x1 = max(lineHeight * 2, bm.Width()); x2 = x1 + Roundness; x3 = x2 + Gap; x7 = cOsd::OsdWidth(); @@ -805,7 +802,7 @@ cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly) y1 = lineHeight; y2 = y1 + Roundness; y3 = y2 + Gap; - y4 = y3 + max(SymbolHeight, bm.Height()); + y4 = y3 + max(lineHeight, bm.Height()); y5 = y4 + Gap; y6 = y5 + Roundness; y7 = y6 + font->Height(); @@ -867,10 +864,7 @@ static const char *const *ReplaySymbols[2][2][5] = { void cSkinSTTNGDisplayReplay::SetMode(bool Play, bool Forward, int Speed) { - if (Speed < -1) - Speed = -1; - if (Speed > 3) - Speed = 3; + Speed = constrain(Speed, -1, 3); cBitmap bm(ReplaySymbols[Play][Forward][Speed + 1]); osd->DrawBitmap(x0 + (x1 - x0 - bm.Width()) / 2, y3 + (y4 - y3 - bm.Height()) / 2, bm, Theme.Color(clrReplayMode), frameColor); } |