From 71023584dc849dc3705c6db303878fd27e8704c7 Mon Sep 17 00:00:00 2001 From: Andreas Brugger Date: Sat, 22 Oct 2005 12:00:00 +0200 Subject: 2005-10-22: Version 1.1-cvs_ext-0.1 (vdr-text2skin-1.1-cvs_ext-0.1.diff) - added several tokens: NextTimerName, NextTimerStart, NextTimerChannel, TimerConflict, CurrentRecordingsCount, using the service "CheckTimerConflict-v1.0" to check timer conflicts. A patch for the timeline-plugin is included in Enigma-0.4pre2 (timeline_CheckTimerConflictService-0.1.diff) --- xml/string.c | 2 +- xml/string.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'xml') diff --git a/xml/string.c b/xml/string.c index afc0c7a..845b766 100644 --- a/xml/string.c +++ b/xml/string.c @@ -10,7 +10,7 @@ static const char *Tokens[__COUNT_TOKEN__] = { // Channel Display "ChannelNumber", "ChannelName", "ChannelShortName", "ChannelBouquet", "ChannelPortal", - "ChannelSource", "ChannelID", "PresentStartDateTime", "PresentVPSDateTime", + "ChannelSource", "ChannelID", "NextTimerName", "NextTimerStart", "NextTimerChannel", "TimerConflict", "CurrentRecordingsCount", "PresentStartDateTime", "PresentVPSDateTime", "PresentEndDateTime", "PresentDuration", "PresentProgress", "PresentRemaining", "PresentTitle", "PresentShortText", "PresentDescription", "FollowingStartDateTime", "FollowingVPSDateTime", "FollowingEndDateTime", "FollowingDuration", diff --git a/xml/string.h b/xml/string.h index 7c3f30f..6c78373 100644 --- a/xml/string.h +++ b/xml/string.h @@ -24,6 +24,11 @@ enum exToken { tChannelSource, tTChannelID, // (name clash) // next 9 also in Menu + tNextTimerName, + tNextTimerStart, + tNextTimerChannel, + tTimerConflict, + tCurrentRecordingsCount, tPresentStartDateTime, tPresentVPSDateTime, tPresentEndDateTime, -- cgit v1.2.3 From 662dd62488f6f842fe5d940e986f798abe1c7691 Mon Sep 17 00:00:00 2001 From: Andreas Brugger Date: Sat, 19 Nov 2005 12:00:00 +0100 Subject: 2005-11-19: Version 1.1-cvs_ext-0.2 (vdr-text2skin-1.1-cvs_ext-0.2.diff) - removed the previously introduced tokens NextTimerName, NextTimerStart, NextTimerChannel, CurrentRecordingsCount and added tokens for the next 3 timers: CurrentEventsTitle[123], CurrentEventsStartDateTime[123], CurrentEventsStopDateTime[123], CurrentEventsChannelNumber[123], CurrentEventsChannelName[123], CurrentEventsIsRecording[123] - added audio- and video-tokens: PresentLanguageCode, PresentLanguageDescription, PresentVideoAR and implemented the missing code for the Language-token - added tokens for replay: ReplayName, ReplayDateTime, ReplayShortText, ReplayDescription, ReplayLanguageCode, ReplayLanguageDescription, ReplayVideoAR (not activated yet) - additional recording-tokens: RecordingVideoAR, RecordingSize - added a reset for scrolling text (configurable) - included Text2skin.diff from the rotor-plugin --- xml/object.c | 6 ++++++ xml/object.h | 1 + xml/string.c | 9 ++++++++- xml/string.h | 36 +++++++++++++++++++++++++++++++----- 4 files changed, 46 insertions(+), 6 deletions(-) (limited to 'xml') 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, -- cgit v1.2.3 From bb39010021b5fd8a1046200839c678afc76227d5 Mon Sep 17 00:00:00 2001 From: Andreas Brugger Date: Sun, 11 Dec 2005 12:00:00 +0100 Subject: 2005-12-11: Version 1.1-cvs_ext-0.3 (vdr-text2skin-1.1-cvs_ext-0.3.diff) - added recording-tokens: RecordingLength, RecordingCuttedLength --- xml/string.c | 2 +- xml/string.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'xml') diff --git a/xml/string.c b/xml/string.c index c64fbb1..76aa317 100644 --- a/xml/string.c +++ b/xml/string.c @@ -46,7 +46,7 @@ static const char *Tokens[__COUNT_TOKEN__] = { "MenuTitle", "MenuGroup", "IsMenuGroup", "MenuItem", "IsMenuItem", "MenuCurrent", "IsMenuCurrent", "MenuText", "RecordingName", "RecordingDateTime", "RecordingTitle", "RecordingShortText", "RecordingDescription", "RecordingLanguageCode", - "RecordingVideoAR", "RecordingSize", + "RecordingVideoAR", "RecordingSize", "RecordingLength", "RecordingCuttedLength", "RecordingLanguageDescription", "ButtonRed", "ButtonGreen", "ButtonYellow", "ButtonBlue", "CanScrollUp", "CanScrollDown" }; diff --git a/xml/string.h b/xml/string.h index 8b3d4a4..098e43b 100644 --- a/xml/string.h +++ b/xml/string.h @@ -151,6 +151,8 @@ enum exToken { tRecordingLanguageCode, tRecordingVideoAR, tRecordingSize, + tRecordingLength, + tRecordingCuttedLength, tRecordingLanguageDescription, // next four also in Channel and Replay display (if supported by vdr/plugin) tButtonRed, -- cgit v1.2.3 From eb6eaf285edd82c212810f066313f93dc4a8a129 Mon Sep 17 00:00:00 2001 From: Andreas Brugger Date: Sat, 7 Jan 2006 12:00:00 +0100 Subject: 2006-01-07: Version 1.1-cvs_ext-0.5 (vdr-text2skin-1.1-cvs_ext-0.5.diff) - modifications to compile with vdr-versions >= 1.3.18 - added tokens: OsdWidth, OsdHeight - activating the token ReplayVideoAR --- xml/string.c | 2 +- xml/string.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'xml') diff --git a/xml/string.c b/xml/string.c index 76aa317..b8fc1f9 100644 --- a/xml/string.c +++ b/xml/string.c @@ -46,7 +46,7 @@ static const char *Tokens[__COUNT_TOKEN__] = { "MenuTitle", "MenuGroup", "IsMenuGroup", "MenuItem", "IsMenuItem", "MenuCurrent", "IsMenuCurrent", "MenuText", "RecordingName", "RecordingDateTime", "RecordingTitle", "RecordingShortText", "RecordingDescription", "RecordingLanguageCode", - "RecordingVideoAR", "RecordingSize", "RecordingLength", "RecordingCuttedLength", + "RecordingVideoAR", "RecordingSize", "RecordingLength", "RecordingCuttedLength", "OsdWidth", "OsdHeight", "RecordingLanguageDescription", "ButtonRed", "ButtonGreen", "ButtonYellow", "ButtonBlue", "CanScrollUp", "CanScrollDown" }; diff --git a/xml/string.h b/xml/string.h index 098e43b..68cd8fa 100644 --- a/xml/string.h +++ b/xml/string.h @@ -153,6 +153,8 @@ enum exToken { tRecordingSize, tRecordingLength, tRecordingCuttedLength, + tOsdWidth, + tOsdHeight, tRecordingLanguageDescription, // next four also in Channel and Replay display (if supported by vdr/plugin) tButtonRed, @@ -161,7 +163,7 @@ enum exToken { tButtonBlue, tCanScrollUp, tCanScrollDown, - + #define __COUNT_TOKEN__ (tCanScrollDown + 1) }; -- cgit v1.2.3 From 74a5cc8e14900d48386e33cb576f154a6dd7e557 Mon Sep 17 00:00:00 2001 From: Andreas Brugger Date: Sun, 19 Nov 2006 16:58:14 +0100 Subject: 2006-11-19: Version 1.1-cvs_ext-0.9 (vdr-text2skin-1.1-cvs_ext-0.9.diff) - added a test-feature to search for reruns of a program and add the information to the extended epg-info (trigger DEVELOPMENT_FEATURES). This uses a service-interface of the epgsearch-plugin "Epgsearch-searchresults-v1.0" - the timer-conflicts are now checked with epgsearch (service-interface "Epgsearch-lastconflictinfo-v1.0", as it works more reliable and is supported by the plugin author - the extended epg-info and the recording-info are extended by AUX-Infos (configurable) there is also an option to strip known tags - the tab-widths are scaled for taking into account that different TT-Fonts have a different width than the default font from VDR - added tokens for signal-info: FrontendSTR, FrontendSNR, FrontendHasLock, FrontendHasSignal - changed token TimerConflict to TimerConflicts - added token PresentEventID for EPG-images - added tokens for recordings: RecordingFilename, RecordingPriority, RecordingLifetime - removed Text2skin.diff from the rotor-plugin --- xml/object.c | 6 ------ xml/object.h | 1 - xml/string.c | 7 ++++--- xml/string.h | 10 +++++++++- xml/xml.c | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) (limited to 'xml') 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, diff --git a/xml/xml.c b/xml/xml.c index a91f5d6..a6b33c3 100644 --- a/xml/xml.c +++ b/xml/xml.c @@ -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; -- cgit v1.2.3