diff options
Diffstat (limited to 'xml/string.c')
| -rw-r--r-- | xml/string.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/xml/string.c b/xml/string.c index dda65bb..6504f64 100644 --- a/xml/string.c +++ b/xml/string.c @@ -7,57 +7,57 @@ static const char *Tokens[__COUNT_TOKEN__] = { "DateTime", "FreeDiskSpace", "UsedDiskSpace", "TotalDiskSpace", "VideoSizeWidth", "VideoSizeHeight", "AudioTrack", "AudioChannel", // Channel Display - "ChannelNumber", "ChannelName", "ChannelShortName", "ChannelBouquet", "ChannelPortal", - "ChannelSource", "ChannelID", "PresentStartDateTime", "PresentVPSDateTime", + "ChannelNumber", "ChannelName", "ChannelShortName", "ChannelBouquet", "ChannelPortal", + "ChannelSource", "ChannelID", "PresentStartDateTime", "PresentVPSDateTime", "CurrentEventsTitle1", "CurrentEventsStartDateTime1", "CurrentEventsStopDateTime1", "CurrentEventsChannelNumber1", "CurrentEventsChannelName1", "CurrentEventsIsRecording1", "CurrentEventsTitle2", "CurrentEventsStartDateTime2", "CurrentEventsStopDateTime2", "CurrentEventsChannelNumber2", "CurrentEventsChannelName2", "CurrentEventsIsRecording2", "CurrentEventsTitle3", "CurrentEventsStartDateTime3", "CurrentEventsStopDateTime3", "CurrentEventsChannelNumber3", "CurrentEventsChannelName3", "CurrentEventsIsRecording3", "TimerConflicts", "PresentEndDateTime", "PresentDuration", "PresentProgress", "PresentRemaining", "PresentLanguageCode", "PresentLanguageDescription", "PresentVideoAR", "PresentEventID", - "PresentTitle", "PresentShortText", "PresentDescription", "FollowingStartDateTime", + "PresentTitle", "PresentShortText", "PresentDescription", "FollowingStartDateTime", "FollowingVPSDateTime", "FollowingEndDateTime", "FollowingDuration", "FollowingTitle", "FollowingShortText", "FollowingDescription", "Language", - "HasTeletext", "ChannelHasTeletext", "HasMultilang", "ChannelHasMultilang", "HasDolby", + "HasTeletext", "ChannelHasTeletext", "HasMultilang", "ChannelHasMultilang", "HasDolby", "ChannelHasDolby", "IsEncrypted", "ChannelIsEncrypted", "IsRadio", "ChannelIsRadio", "IsRecording", "CurrentRecording", "HasVPS", "HasTimer", "IsRunning", "ChannelHasVPS", - "PresentHasTimer", "PresentIsRunning", "PresentHasVPS", "FollowingHasTimer", + "PresentHasTimer", "PresentIsRunning", "PresentHasVPS", "FollowingHasTimer", "FollowingIsRunning", "FollowingHasVPS", - + // Volume Display "VolumeCurrent", "VolumeTotal", "IsMute", "VolumeIsMute", - + // Message Display "Message", "MessageStatus", "MessageInfo", "MessageWarning", "MessageError", - + // Replay Display - "ReplayTitle", "ReplayPositionIndex", "ReplayDurationIndex", "ReplayPrompt", + "ReplayTitle", "ReplayPositionIndex", "ReplayDurationIndex", "ReplayPrompt", "ReplayName", "ReplayDateTime", "ReplayShortText", "ReplayDescription", "ReplayLanguageCode", "ReplayLanguageDescription", "ReplayVideoAR", - "IsPlaying", "ReplayIsPlaying", "IsFastForward", "ReplayIsFastForward", "IsFastRewind", - "ReplayIsFastRewind", "IsSlowForward", "ReplayIsSlowForward", "IsSlowRewind", + "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", + "MenuTitle", "MenuGroup", "IsMenuGroup", "MenuItem", "IsMenuItem", "MenuCurrent", "IsMenuCurrent", "MenuText", "RecordingName", "RecordingFilename", "RecordingDateTime", "RecordingTitle", "RecordingShortText", "RecordingDescription", "RecordingLanguageCode", "FrontendSTR", "FrontendSNR", "FrontendHasLock", "FrontendHasSignal", "RecordingPriority", "RecordingLifetime", "RecordingVideoAR", "RecordingSize", "RecordingLength", "RecordingCuttedLength", "OsdWidth", "OsdHeight", - "RecordingLanguageDescription", "ButtonRed", "ButtonGreen", + "RecordingLanguageDescription", "ButtonRed", "ButtonGreen", "ButtonYellow", "ButtonBlue", "CanScrollUp", "CanScrollDown" }; -std::string txToken::Token(const txToken &Token) +std::string txToken::Token(const txToken &Token) { std::string result = (std::string)"{" + Tokens[Token.Type]; //if (Token.Attrib.length() > 0) // result += ":" + Token.Attrib; result += "}"; - + return result; } @@ -91,7 +91,7 @@ void cxString::Reparse(void) } } -bool cxString::Parse(const std::string &Text, bool Translate) +bool cxString::Parse(const std::string &Text, bool Translate) { std::string trans = Translate ? mSkin->Translate(Text) : Text; const char *text = trans.c_str(); @@ -114,7 +114,7 @@ bool cxString::Parse(const std::string &Text, bool Translate) ++ptr; continue; - } + } else if (*ptr == '{') { if (inToken) { esyslog("ERROR: Unexpected '{' in token"); @@ -165,14 +165,14 @@ bool cxString::Parse(const std::string &Text, bool Translate) lastToken.Attrib = n; } else lastToken.Attrib = attr; - } + } inAttrib = false; inToken = false; } else { int i; for (i = 0; i < (int)__COUNT_TOKEN__; ++i) { - if ((size_t)(ptr - last) == strlen(Tokens[i]) + if ((size_t)(ptr - last) == strlen(Tokens[i]) && memcmp(last, Tokens[i], ptr - last) == 0) { txToken token((exToken)i, offset, ""); mTokens.push_back(token); @@ -209,7 +209,7 @@ bool cxString::Parse(const std::string &Text, bool Translate) return true; } -cxType cxString::Evaluate(void) const +cxType cxString::Evaluate(void) const { std::string result; int offset = 0; |