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 | 7 | ||||
| -rw-r--r-- | xml/string.h | 10 | ||||
| -rw-r--r-- | xml/xml.c | 2 |
5 files changed, 14 insertions, 12 deletions
diff --git a/xml/object.c b/xml/object.c index 3979384..c63c2ea 100644 --- a/xml/object.c +++ b/xml/object.c @@ -140,14 +140,10 @@ 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() + "/" + mSkin->Name(), mFontFace, mFontSize, mFontWidth)) != NULL) return font; @@ -156,8 +152,6 @@ const cFont *cxObject::Font(void) const != NULL) return font; - } - return cFont::GetFont(fontOsd); } diff --git a/xml/object.h b/xml/object.h index 96cdd14..bbc37a0 100644 --- a/xml/object.h +++ b/xml/object.h @@ -45,7 +45,6 @@ class cxObject { friend class VSkinnerItem; public: - static int UseTTF; enum eType { image, text, diff --git a/xml/string.c b/xml/string.c index b8fc1f9..7568b37 100644 --- a/xml/string.c +++ b/xml/string.c @@ -13,9 +13,9 @@ static const char *Tokens[__COUNT_TOKEN__] = { "ChannelSource", "ChannelID", "PresentStartDateTime", "PresentVPSDateTime", "CurrentEventsTitle1", "CurrentEventsStartDateTime1", "CurrentEventsStopDateTime1", "CurrentEventsChannelNumber1", "CurrentEventsChannelName1", "CurrentEventsIsRecording1", "CurrentEventsTitle2", "CurrentEventsStartDateTime2", "CurrentEventsStopDateTime2", "CurrentEventsChannelNumber2", "CurrentEventsChannelName2", "CurrentEventsIsRecording2", "CurrentEventsTitle3", "CurrentEventsStartDateTime3", "CurrentEventsStopDateTime3", "CurrentEventsChannelNumber3", "CurrentEventsChannelName3", "CurrentEventsIsRecording3", - "TimerConflict", + "TimerConflicts", "PresentEndDateTime", "PresentDuration", "PresentProgress", "PresentRemaining", - "PresentLanguageCode", "PresentLanguageDescription", "PresentVideoAR", + "PresentLanguageCode", "PresentLanguageDescription", "PresentVideoAR", "PresentEventID", "PresentTitle", "PresentShortText", "PresentDescription", "FollowingStartDateTime", "FollowingVPSDateTime", "FollowingEndDateTime", "FollowingDuration", "FollowingTitle", "FollowingShortText", "FollowingDescription", "Language", @@ -44,8 +44,9 @@ 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 68cd8fa..55adbcf 100644 --- a/xml/string.h +++ b/xml/string.h @@ -44,7 +44,7 @@ enum exToken { tCurrentEventsChannelNumber3, tCurrentEventsChannelName3, tCurrentEventsIsRecording3, - tTimerConflict, + tTimerConflicts, tPresentEndDateTime, tPresentDuration, tPresentProgress, @@ -52,6 +52,7 @@ enum exToken { tPresentLanguageCode, tPresentLanguageDescription, tPresentVideoAR, + tPresentEventID, tPresentTitle, tPresentShortText, tPresentDescription, @@ -144,11 +145,18 @@ enum exToken { tMenuText, // Recordings Page tRecordingName, + tRecordingFilename, tRecordingDateTime, tRecordingTitle, tRecordingShortText, tRecordingDescription, tRecordingLanguageCode, + tFrontendSTR, + tFrontendSNR, + tFrontendHasLock, + tFrontendHasSignal, + tRecordingPriority, + tRecordingLifetime, tRecordingVideoAR, tRecordingSize, tRecordingLength, @@ -35,7 +35,7 @@ XML::XML(const string &file) { ifstream f(file.c_str(), ios::in|ios::binary|ios::ate); size = f.tellg(); f.seekg(0, ios::beg); - buffer = new char [size]; + buffer = new char [size+1]; f.read(buffer, size); f.close(); data = buffer; |