From 4f8e89fbe330a263130ca066a1671297f939e42d Mon Sep 17 00:00:00 2001 From: mrwastl Date: Sat, 15 May 2010 12:15:54 +0200 Subject: call newly introduced NeedsUp() for smooth image looping and text scrolling; added missing tokens --- display.c | 13 +++++++++++++ skinconfig.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/display.c b/display.c index 5040fb9..d72b2e1 100644 --- a/display.c +++ b/display.c @@ -166,6 +166,19 @@ void cGraphLCDDisplay::Action(void) } } + { + GLCD::cSkinDisplay * display = NULL; + + if (mState == StateNormal) + display = mSkin->GetDisplay("normal"); + else if (mState == StateReplay) + display = mSkin->GetDisplay("replay"); + else if (mState == StateMenu) + display = mSkin->GetDisplay("menu"); + if (display && display->NeedsUpdate(currTimeMs ) ) + mUpdate = true; + + } // update Display every minute if (mState == StateNormal && currTimeMs/60000 != mLastTimeMs/60000) { diff --git a/skinconfig.c b/skinconfig.c index 0275910..f99adb9 100644 --- a/skinconfig.c +++ b/skinconfig.c @@ -128,6 +128,14 @@ typedef enum _eTokenId tokSettingShowReplayLogo, tokSettingShowSymbols, tokSettingShowTimebar, + + tokScrollMode, + tokScrollSpeed, + tokScrollTime, + tokBrightnessActive, + tokBrightnessIdle, + tokBrightnessDelay, + tokPrivateSettingEnd, tokCountToken @@ -239,6 +247,14 @@ static const std::string Tokens[tokCountToken] = "SettingShowReplayLogo", "SettingShowSymbols", "SettingShowTimebar", + + "ScrollMode", + "ScrollSpeed", + "ScrollTime", + "BrightnessActive", + "BrightnessIdle", + "BrightnessDelay", + "privateSettingEnd" }; @@ -607,6 +623,20 @@ GLCD::cType cGraphLCDSkinConfig::GetToken(const GLCD::tSkinToken & Token) if (GraphLCDSetup.ShowTimebar) return true; return false; + + case tokScrollMode: + return GraphLCDSetup.ScrollMode; + case tokScrollSpeed: + return GraphLCDSetup.ScrollSpeed; + case tokScrollTime: + return GraphLCDSetup.ScrollTime; + case tokBrightnessActive: + return GraphLCDSetup.BrightnessActive; + case tokBrightnessIdle: + return GraphLCDSetup.BrightnessIdle; + case tokBrightnessDelay: + return GraphLCDSetup.BrightnessDelay; + default: break; } -- cgit v1.2.3