diff options
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | display.c | 29 | ||||
| -rw-r--r-- | xml/string.c | 7 | ||||
| -rw-r--r-- | xml/string.h | 8 |
4 files changed, 42 insertions, 5 deletions
@@ -5,6 +5,9 @@ VDR Plugin 'text2skin' Revision History - fixed a race condition (thanks to Reinhard Nissl for pointing this out) - updated finnish translations (thanks to Rolf Ahrenberg) +- added tokens for Recording Info Display + (RecordingName, RecordingDateTime, RecordingTitle, RecordingShortText, + RecordingDescription) 2005-02-06: Version 1.0 @@ -1,5 +1,5 @@ /* - * $Id: display.c,v 1.20 2005/05/30 09:23:41 lordjaxom Exp $ + * $Id: display.c,v 1.21 2005/05/30 10:07:45 lordjaxom Exp $ */ #include "render.h" @@ -1067,6 +1067,33 @@ cxType cText2SkinDisplayMenu::GetTokenData(const txToken &Token) case tMenuText: return mText; +#if VDRVERSNUM >= 10325 + case tRecordingName: + return mRecording != NULL + ? (cxType)mRecording->Name() + : (cxType)false; + + case tRecordingDateTime: + return mRecording != NULL + ? (cxType)TimeType(mRecording->start, Token.Attrib.Text) + : (cxType)false; + + case tRecordingTitle: + return mRecording != NULL + ? (cxType)mRecording->Info()->Title() + : (cxType)false; + + case tRecordingShortText: + return mRecording != NULL + ? (cxType)mRecording->Info()->ShortText() + : (cxType)false; + + case tRecordingDescription: + return mRecording != NULL + ? (cxType)mRecording->Info()->Description() + : (cxType)false; +#endif + default: return cText2SkinRender::GetTokenData(Token); } diff --git a/xml/string.c b/xml/string.c index de4f703..6f08eae 100644 --- a/xml/string.c +++ b/xml/string.c @@ -1,5 +1,5 @@ /* - * $Id: string.c,v 1.15 2005/01/26 20:38:45 lordjaxom Exp $ + * $Id: string.c,v 1.16 2005/05/30 10:07:45 lordjaxom Exp $ */ #include "xml/string.h" @@ -38,8 +38,9 @@ static const char *Tokens[__COUNT_TOKEN__] = { // Menu Page "MenuTitle", "MenuGroup", "IsMenuGroup", "MenuItem", "IsMenuItem", "MenuCurrent", - "IsMenuCurrent", "MenuText", "ButtonRed", "ButtonGreen", "ButtonYellow", "ButtonBlue", - "CanScrollUp", "CanScrollDown" + "IsMenuCurrent", "MenuText", "RecordingName", "RecordingDateTime", "RecordingTitle", + "RecordingShortText", "RecordingDescription", "ButtonRed", "ButtonGreen", + "ButtonYellow", "ButtonBlue", "CanScrollUp", "CanScrollDown" }; std::string txToken::Token(const txToken &Token) diff --git a/xml/string.h b/xml/string.h index 3ccaf8b..5961bb0 100644 --- a/xml/string.h +++ b/xml/string.h @@ -1,5 +1,5 @@ /* - * $Id: string.h,v 1.16 2005/01/26 20:38:45 lordjaxom Exp $ + * $Id: string.h,v 1.17 2005/05/30 10:07:45 lordjaxom Exp $ */ #ifndef VDR_TEXT2SKIN_XML_STRING_H @@ -113,6 +113,12 @@ enum exToken { tMenuCurrent, tIsMenuCurrent, tMenuText, + // Recordings Page + tRecordingName, + tRecordingDateTime, + tRecordingTitle, + tRecordingShortText, + tRecordingDescription, // next four also in Channel and Replay display (if supported by vdr/plugin) tButtonRed, tButtonGreen, |