diff options
Diffstat (limited to 'xml')
| -rw-r--r-- | xml/string.c | 19 | ||||
| -rw-r--r-- | xml/string.h | 28 |
2 files changed, 37 insertions, 10 deletions
diff --git a/xml/string.c b/xml/string.c index 183535e..12d8faf 100644 --- a/xml/string.c +++ b/xml/string.c @@ -1,5 +1,5 @@ /* - * $Id: string.c,v 1.11 2005/01/19 19:20:37 lordjaxom Exp $ + * $Id: string.c,v 1.12 2005/01/20 14:02:41 lordjaxom Exp $ */ #include "xml/string.h" @@ -15,26 +15,31 @@ static const char *Tokens[__COUNT_TOKEN__] = { "PresentTitle", "PresentShortText", "PresentDescription", "FollowingStartDateTime", "FollowingVPSDateTime", "FollowingEndDateTime", "FollowingDuration", "FollowingTitle", "FollowingShortText", "FollowingDescription", "Language", - "HasTeletext", "HasMultilang", "HasDolby", "IsEncrypted", "IsRadio", "IsRecording", - "CurrentRecording", "HasVPS", "HasTimer", "IsRunning", + "HasTeletext", "ChannelHasTeletext", "HasMultilang", "ChannelHasMultilang", "HasDolby", + "ChannelHasDolby", "IsEncrypted", "ChannelIsEncrypted", "IsRadio", "ChannelIsRadio", + "IsRecording", "CurrentRecording", "HasVPS", "HasTimer", "IsRunning", "ChannelHasVPS", + "PresentHasTimer", "PresentIsRunning", "PresentHasVPS", "FollowingHasTimer", + "FollowingIsRunning", "FollowingHasVPS", // Volume Display - "VolumeCurrent", "VolumeTotal", "IsMute", + "VolumeCurrent", "VolumeTotal", "IsMute", "VolumeIsMute", // Message Display "Message", "MessageStatus", "MessageInfo", "MessageWarning", "MessageError", // Replay Display - "ReplayTitle", "ReplayPositionIndex", "ReplayDurationIndex", "ReplayPrompt", "IsPlaying", - "IsFastForward", "IsFastRewind", "IsSlowForward", "IsSlowRewind", "IsPausing", + "ReplayTitle", "ReplayPositionIndex", "ReplayDurationIndex", "ReplayPrompt", + "IsPlaying", "ReplayIsPlaying", "IsFastForward", "ReplayIsFastForward", "IsFastRewind", + "ReplayIsFastRewind", "IsSlowForward", "ReplayIsSlowForward", "IsSlowRewind", + "ReplayIsSlowRewind", "IsPausing", "ReplayIsPausing", "ReplayPosition", "ReplayDuration", "ReplayRemaining", "ReplayMode", "ReplayIsShuffle", "ReplayIsLoop", // Menu Page "MenuTitle", "MenuGroup", "IsMenuGroup", "MenuItem", "IsMenuItem", "MenuCurrent", "IsMenuCurrent", "MenuText", "ButtonRed", "ButtonGreen", "ButtonYellow", "ButtonBlue", - "CanScrollUp", "CanScrollDown" + "CanScrollUp", "CanScrollDown", "EventHasTimer", "EventIsRunning", "EventHasVPS", }; std::string txToken::Token(const txToken &Token) diff --git a/xml/string.h b/xml/string.h index ee47ef8..0c95bd5 100644 --- a/xml/string.h +++ b/xml/string.h @@ -1,5 +1,5 @@ /* - * $Id: string.h,v 1.12 2005/01/19 19:20:37 lordjaxom Exp $ + * $Id: string.h,v 1.13 2005/01/20 14:02:41 lordjaxom Exp $ */ #ifndef VDR_TEXT2SKIN_XML_STRING_H @@ -42,22 +42,35 @@ enum exToken { tFollowingDescription, tLanguage, tHasTeletext, + tChannelHasTeletext, // alias tHasMultilang, + tChannelHasMultilang, // alias tHasDolby, + tChannelHasDolby, // alias tIsEncrypted, + tChannelIsEncrypted, // alias tIsRadio, + tChannelIsRadio, // alias + // next 2 also in all other displays tIsRecording, - // next 1 also in all other displays tCurrentRecording, // next 3 also in Menu tHasVPS, tHasTimer, tIsRunning, + tChannelHasVPS, // alias + tPresentHasTimer, // alias + tPresentIsRunning, // alias + tPresentHasVPS, + tFollowingHasTimer, + tFollowingIsRunning, + tFollowingHasVPS, // VolumeDisplay tVolumeCurrent, tVolumeTotal, tIsMute, + tVolumeIsMute, // alias // Message Display (also in all other displays) tMessage, @@ -72,11 +85,17 @@ enum exToken { tReplayDurationIndex, tReplayPrompt, tIsPlaying, + tReplayIsPlaying, // alias tIsFastForward, + tReplayIsFastForward, // alias tIsFastRewind, + tReplayIsFastRewind, // alias tIsSlowForward, + tReplayIsSlowForward, // alias tIsSlowRewind, + tReplayIsSlowRewind, // alias tIsPausing, + tReplayIsPausing, // alias tReplayPosition, tReplayDuration, tReplayRemaining, @@ -100,8 +119,11 @@ enum exToken { tButtonBlue, tCanScrollUp, tCanScrollDown, + tEventHasTimer, // alias + tEventIsRunning, // alias + tEventHasVPS, // alias -#define __COUNT_TOKEN__ (tCanScrollDown + 1) +#define __COUNT_TOKEN__ (tEventHasVPS + 1) }; enum exAttrib { |