diff options
| -rw-r--r-- | display.c | 8 | ||||
| -rw-r--r-- | xml/string.c | 4 | ||||
| -rw-r--r-- | xml/string.h | 7 |
3 files changed, 8 insertions, 11 deletions
@@ -1,5 +1,5 @@ /* - * $Id: display.c,v 1.12 2005/01/20 14:04:15 lordjaxom Exp $ + * $Id: display.c,v 1.13 2005/01/20 15:12:16 lordjaxom Exp $ */ #include "render.h" @@ -961,15 +961,15 @@ cxType cText2SkinDisplayMenu::GetTokenData(const txToken &Token) case tChannelHasVPS: return mEvent != NULL && mEvent->Vps() != 0; - case tEventHasVPS: + case tPresentHasVPS: return mEvent != NULL && mEvent->Vps() != mEvent->StartTime(); case tHasTimer: - case tEventHasTimer: + case tPresentHasTimer: return mEvent != NULL && mEvent->HasTimer(); case tIsRunning: - case tEventIsRunning: + case tPresentIsRunning: return mEvent != NULL && mEvent->IsRunning(); case tMenuText: diff --git a/xml/string.c b/xml/string.c index 12d8faf..9e5a909 100644 --- a/xml/string.c +++ b/xml/string.c @@ -1,5 +1,5 @@ /* - * $Id: string.c,v 1.12 2005/01/20 14:02:41 lordjaxom Exp $ + * $Id: string.c,v 1.13 2005/01/20 15:12:16 lordjaxom Exp $ */ #include "xml/string.h" @@ -39,7 +39,7 @@ static const char *Tokens[__COUNT_TOKEN__] = { // Menu Page "MenuTitle", "MenuGroup", "IsMenuGroup", "MenuItem", "IsMenuItem", "MenuCurrent", "IsMenuCurrent", "MenuText", "ButtonRed", "ButtonGreen", "ButtonYellow", "ButtonBlue", - "CanScrollUp", "CanScrollDown", "EventHasTimer", "EventIsRunning", "EventHasVPS", + "CanScrollUp", "CanScrollDown" }; std::string txToken::Token(const txToken &Token) diff --git a/xml/string.h b/xml/string.h index 0c95bd5..8174b60 100644 --- a/xml/string.h +++ b/xml/string.h @@ -1,5 +1,5 @@ /* - * $Id: string.h,v 1.13 2005/01/20 14:02:41 lordjaxom Exp $ + * $Id: string.h,v 1.14 2005/01/20 15:12:16 lordjaxom Exp $ */ #ifndef VDR_TEXT2SKIN_XML_STRING_H @@ -119,11 +119,8 @@ enum exToken { tButtonBlue, tCanScrollUp, tCanScrollDown, - tEventHasTimer, // alias - tEventIsRunning, // alias - tEventHasVPS, // alias -#define __COUNT_TOKEN__ (tEventHasVPS + 1) +#define __COUNT_TOKEN__ (tCanScrollDown + 1) }; enum exAttrib { |