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

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,
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;