diff options
Diffstat (limited to 'xml')
| -rw-r--r-- | xml/object.c | 6 | ||||
| -rw-r--r-- | xml/object.h | 1 | ||||
| -rw-r--r-- | xml/string.c | 9 | ||||
| -rw-r--r-- | xml/string.h | 36 |
4 files changed, 46 insertions, 6 deletions
diff --git a/xml/object.c b/xml/object.c index 6ea0ab6..73d8a26 100644 --- a/xml/object.c +++ b/xml/object.c @@ -140,10 +140,14 @@ const std::string &cxObject::TypeName(void) const return ObjectNames[mType]; } +int cxObject::UseTTF = true; + const cFont *cxObject::Font(void) const { const cFont *font; + if (UseTTF) { + if ((font = cText2SkinFont::Load(SkinPath() + "/fonts", mFontFace, mFontSize, mFontWidth)) != NULL) return font; @@ -152,6 +156,8 @@ const cFont *cxObject::Font(void) const mFontWidth)) != NULL) return font; + } + return cFont::GetFont(fontOsd); } diff --git a/xml/object.h b/xml/object.h index bbc37a0..96cdd14 100644 --- a/xml/object.h +++ b/xml/object.h @@ -45,6 +45,7 @@ class cxObject { friend class VSkinnerItem; public: + static int UseTTF; enum eType { image, text, diff --git a/xml/string.c b/xml/string.c index 845b766..c64fbb1 100644 --- a/xml/string.c +++ b/xml/string.c @@ -10,8 +10,12 @@ static const char *Tokens[__COUNT_TOKEN__] = { // Channel Display "ChannelNumber", "ChannelName", "ChannelShortName", "ChannelBouquet", "ChannelPortal", - "ChannelSource", "ChannelID", "NextTimerName", "NextTimerStart", "NextTimerChannel", "TimerConflict", "CurrentRecordingsCount", "PresentStartDateTime", "PresentVPSDateTime", + "ChannelSource", "ChannelID", "PresentStartDateTime", "PresentVPSDateTime", + "CurrentEventsTitle1", "CurrentEventsStartDateTime1", "CurrentEventsStopDateTime1", "CurrentEventsChannelNumber1", "CurrentEventsChannelName1", "CurrentEventsIsRecording1", "CurrentEventsTitle2", "CurrentEventsStartDateTime2", "CurrentEventsStopDateTime2", "CurrentEventsChannelNumber2", "CurrentEventsChannelName2", "CurrentEventsIsRecording2", + "CurrentEventsTitle3", "CurrentEventsStartDateTime3", "CurrentEventsStopDateTime3", "CurrentEventsChannelNumber3", "CurrentEventsChannelName3", "CurrentEventsIsRecording3", + "TimerConflict", "PresentEndDateTime", "PresentDuration", "PresentProgress", "PresentRemaining", + "PresentLanguageCode", "PresentLanguageDescription", "PresentVideoAR", "PresentTitle", "PresentShortText", "PresentDescription", "FollowingStartDateTime", "FollowingVPSDateTime", "FollowingEndDateTime", "FollowingDuration", "FollowingTitle", "FollowingShortText", "FollowingDescription", "Language", @@ -30,6 +34,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", @@ -40,6 +46,7 @@ static const char *Tokens[__COUNT_TOKEN__] = { "MenuTitle", "MenuGroup", "IsMenuGroup", "MenuItem", "IsMenuItem", "MenuCurrent", "IsMenuCurrent", "MenuText", "RecordingName", "RecordingDateTime", "RecordingTitle", "RecordingShortText", "RecordingDescription", "RecordingLanguageCode", + "RecordingVideoAR", "RecordingSize", "RecordingLanguageDescription", "ButtonRed", "ButtonGreen", "ButtonYellow", "ButtonBlue", "CanScrollUp", "CanScrollDown" }; diff --git a/xml/string.h b/xml/string.h index 6c78373..8b3d4a4 100644 --- a/xml/string.h +++ b/xml/string.h @@ -24,17 +24,34 @@ enum exToken { tChannelSource, tTChannelID, // (name clash) // next 9 also in Menu - tNextTimerName, - tNextTimerStart, - tNextTimerChannel, - tTimerConflict, - tCurrentRecordingsCount, tPresentStartDateTime, tPresentVPSDateTime, + tCurrentEventsTitle1, + tCurrentEventsStartDateTime1, + tCurrentEventsStopDateTime1, + tCurrentEventsChannelNumber1, + tCurrentEventsChannelName1, + tCurrentEventsIsRecording1, + tCurrentEventsTitle2, + tCurrentEventsStartDateTime2, + tCurrentEventsStopDateTime2, + tCurrentEventsChannelNumber2, + tCurrentEventsChannelName2, + tCurrentEventsIsRecording2, + tCurrentEventsTitle3, + tCurrentEventsStartDateTime3, + tCurrentEventsStopDateTime3, + tCurrentEventsChannelNumber3, + tCurrentEventsChannelName3, + tCurrentEventsIsRecording3, + tTimerConflict, tPresentEndDateTime, tPresentDuration, tPresentProgress, tPresentRemaining, + tPresentLanguageCode, + tPresentLanguageDescription, + tPresentVideoAR, tPresentTitle, tPresentShortText, tPresentDescription, @@ -90,6 +107,13 @@ enum exToken { tReplayPositionIndex, tReplayDurationIndex, tReplayPrompt, + tReplayName, + tReplayDateTime, + tReplayShortText, + tReplayDescription, + tReplayLanguageCode, + tReplayLanguageDescription, + tReplayVideoAR, tIsPlaying, tReplayIsPlaying, // alias tIsFastForward, @@ -125,6 +149,8 @@ enum exToken { tRecordingShortText, tRecordingDescription, tRecordingLanguageCode, + tRecordingVideoAR, + tRecordingSize, tRecordingLanguageDescription, // next four also in Channel and Replay display (if supported by vdr/plugin) tButtonRed, |