diff options
Diffstat (limited to 'xml')
| -rw-r--r-- | xml/object.c | 9 | ||||
| -rw-r--r-- | xml/string.c | 11 | ||||
| -rw-r--r-- | xml/string.h | 43 |
3 files changed, 57 insertions, 6 deletions
diff --git a/xml/object.c b/xml/object.c index 6ea0ab6..4a3beec 100644 --- a/xml/object.c +++ b/xml/object.c @@ -144,14 +144,13 @@ const cFont *cxObject::Font(void) const { const cFont *font; - if ((font = cText2SkinFont::Load(SkinPath() + "/fonts", mFontFace, mFontSize, mFontWidth)) - != NULL) - return font; - if ((font = cText2SkinFont::Load(SkinPath() + "/" + mSkin->Name(), mFontFace, mFontSize, mFontWidth)) != NULL) return font; - + + if ((font = cText2SkinFont::Load(SkinPath() + "/fonts", mFontFace, mFontSize, mFontWidth)) != NULL) + return font; + return cFont::GetFont(fontOsd); } diff --git a/xml/string.c b/xml/string.c index afc0c7a..3f671bd 100644 --- a/xml/string.c +++ b/xml/string.c @@ -11,7 +11,12 @@ static const char *Tokens[__COUNT_TOKEN__] = { // Channel Display "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", "FollowingVPSDateTime", "FollowingEndDateTime", "FollowingDuration", "FollowingTitle", "FollowingShortText", "FollowingDescription", "Language", @@ -30,6 +35,8 @@ static const char *Tokens[__COUNT_TOKEN__] = { // Replay Display "ReplayTitle", "ReplayPositionIndex", "ReplayDurationIndex", "ReplayPrompt", + "ReplayName", "ReplayDateTime", "ReplayShortText", "ReplayDescription", + "ReplayLanguageCode", "ReplayLanguageDescription", "ReplayVideoAR", "IsPlaying", "ReplayIsPlaying", "IsFastForward", "ReplayIsFastForward", "IsFastRewind", "ReplayIsFastRewind", "IsSlowForward", "ReplayIsSlowForward", "IsSlowRewind", "ReplayIsSlowRewind", "IsPausing", "ReplayIsPausing", @@ -38,8 +45,10 @@ static const char *Tokens[__COUNT_TOKEN__] = { // Menu Page "MenuTitle", "MenuGroup", "IsMenuGroup", "MenuItem", "IsMenuItem", "MenuCurrent", - "IsMenuCurrent", "MenuText", "RecordingName", "RecordingDateTime", "RecordingTitle", + "IsMenuCurrent", "MenuText", "RecordingName", "RecordingFilename", "RecordingDateTime", "RecordingTitle", "RecordingShortText", "RecordingDescription", "RecordingLanguageCode", + "FrontendSTR", "FrontendSNR", "FrontendHasLock", "FrontendHasSignal", "RecordingPriority", "RecordingLifetime", + "RecordingVideoAR", "RecordingSize", "RecordingLength", "RecordingCuttedLength", "OsdWidth", "OsdHeight", "RecordingLanguageDescription", "ButtonRed", "ButtonGreen", "ButtonYellow", "ButtonBlue", "CanScrollUp", "CanScrollDown" }; diff --git a/xml/string.h b/xml/string.h index 7c3f30f..a459253 100644 --- a/xml/string.h +++ b/xml/string.h @@ -26,10 +26,33 @@ enum exToken { // next 9 also in Menu tPresentStartDateTime, tPresentVPSDateTime, + tCurrentEventsTitle1, + tCurrentEventsStartDateTime1, + tCurrentEventsStopDateTime1, + tCurrentEventsChannelNumber1, + tCurrentEventsChannelName1, + tCurrentEventsIsRecording1, + tCurrentEventsTitle2, + tCurrentEventsStartDateTime2, + tCurrentEventsStopDateTime2, + tCurrentEventsChannelNumber2, + tCurrentEventsChannelName2, + tCurrentEventsIsRecording2, + tCurrentEventsTitle3, + tCurrentEventsStartDateTime3, + tCurrentEventsStopDateTime3, + tCurrentEventsChannelNumber3, + tCurrentEventsChannelName3, + tCurrentEventsIsRecording3, + tTimerConflicts, tPresentEndDateTime, tPresentDuration, tPresentProgress, tPresentRemaining, + tPresentLanguageCode, + tPresentLanguageDescription, + tPresentVideoAR, + tPresentEventID, tPresentTitle, tPresentShortText, tPresentDescription, @@ -85,6 +108,13 @@ enum exToken { tReplayPositionIndex, tReplayDurationIndex, tReplayPrompt, + tReplayName, + tReplayDateTime, + tReplayShortText, + tReplayDescription, + tReplayLanguageCode, + tReplayLanguageDescription, + tReplayVideoAR, tIsPlaying, tReplayIsPlaying, // alias tIsFastForward, @@ -115,11 +145,24 @@ enum exToken { tMenuText, // Recordings Page tRecordingName, + tRecordingFilename, tRecordingDateTime, tRecordingTitle, tRecordingShortText, tRecordingDescription, tRecordingLanguageCode, + tFrontendSTR, + tFrontendSNR, + tFrontendHasLock, + tFrontendHasSignal, + tRecordingPriority, + tRecordingLifetime, + tRecordingVideoAR, + tRecordingSize, + tRecordingLength, + tRecordingCuttedLength, + tOsdWidth, + tOsdHeight, tRecordingLanguageDescription, // next four also in Channel and Replay display (if supported by vdr/plugin) tButtonRed, |