- dunno

6 files changed, 27 insertions, 21 deletions

diff --git a/xml/function.c b/xml/function.c
index ca06922..04a3f2f 100644
--- a/xml/function.c
+++ b/xml/function.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: function.c,v 1.1 2004/12/19 22:03:26 lordjaxom Exp $
+ *  $Id: function.c,v 1.2 2004/12/21 18:35:54 lordjaxom Exp $
  */
 
 #include "xml/function.h"
@@ -204,6 +204,7 @@ std::string cxFunction::Evaluate(void) const
 		return FunFile(mParams[0]->Evaluate());
 
 	case fun_trans:
+		Dprintf("|%s| translates to |%s|\n", mParams[0]->Evaluate().c_str(), tr(mParams[0]->Evaluate().c_str()));
 		return tr(mParams[0]->Evaluate().c_str());
 	
 	case fun_plugin:
diff --git a/xml/skin.c b/xml/skin.c
index fb38950..c787021 100644
--- a/xml/skin.c
+++ b/xml/skin.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: skin.c,v 1.1 2004/12/19 22:03:28 lordjaxom Exp $
+ *  $Id: skin.c,v 1.2 2004/12/21 18:35:54 lordjaxom Exp $
  */
 
 #include "xml/skin.h"
@@ -13,7 +13,9 @@ cxSkin::cxSkin(const std::string &Name):
 }
 
 void cxSkin::SetBase(eScreenBase Base) {
-	mBase = Base;
+	if (Base != (eScreenBase)-1)
+		mBase = Base;
+
 	switch (mBase) {
 	case relative:
 		mBaseOffset = txPoint(Setup.OSDLeft, Setup.OSDTop);
diff --git a/xml/skin.h b/xml/skin.h
index 8aae5f1..b44a498 100644
--- a/xml/skin.h
+++ b/xml/skin.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: skin.h,v 1.1 2004/12/19 22:03:28 lordjaxom Exp $
+ *  $Id: skin.h,v 1.2 2004/12/21 18:35:55 lordjaxom Exp $
  */
 
 #ifndef VDR_TEXT2SKIN_XML_SKIN_H 
@@ -37,15 +37,13 @@ private:
 	
 	cxDisplays  mDisplays;
 
-protected:
-	void SetBase(eScreenBase Base);
-
 public:
 	cxSkin(const std::string &Name);
 
 	cxDisplay *Get(cxDisplay::eType Type);
 
 	bool ParseBase(const std::string &Text);
+	void SetBase(eScreenBase Base = (eScreenBase)-1);
 
 	eScreenBase        Base(void)       const { return mBase; }
 	const txPoint     &BaseOffset(void) const { return mBaseOffset; }
diff --git a/xml/string.c b/xml/string.c
index 742439e..5d6b397 100644
--- a/xml/string.c
+++ b/xml/string.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: string.c,v 1.1 2004/12/19 22:03:25 lordjaxom Exp $
+ *  $Id: string.c,v 1.2 2004/12/21 18:35:55 lordjaxom Exp $
  */
 
 #include "xml/string.h"
@@ -11,14 +11,13 @@ static const char *Tokens[__COUNT_TOKEN__] = {
 
 	// Channel Display
 	"ChannelNumber", "ChannelName", "ChannelShortName", "ChannelBouquet", "ChannelPortal", 
-	"ChannelSource", "PresentStartDateTime", 
-	"PresentVPSDateTime", "PresentEndDateTime", "PresentDuration", "PresentProgress", 
-	"PresentRemaining",
+	"ChannelSource", "PresentStartDateTime", "PresentVPSDateTime", "PresentEndDateTime", 
+	"PresentDuration", "PresentProgress", "PresentRemaining",
 	"PresentTitle", "PresentShortText", "PresentDescription", "FollowingStartDateTime", 
 	"FollowingVPSDateTime", "FollowingEndDateTime", "FollowingDuration",
 	"FollowingTitle", "FollowingShortText", "FollowingDescription", "Language",
-	"HasTeletext", "HasMultilang", "HasDolby", "IsEncrypted", "IsRadio", "IsRecording", "HasVPS", 
-	"HasTimer", "IsRunning",
+	"HasTeletext", "HasMultilang", "HasDolby", "IsEncrypted", "IsRadio", "IsRecording", 
+	"CurrentRecording", "HasVPS", "HasTimer", "IsRunning",
 	
 	// Volume Display
 	"VolumeCurrent", "VolumeTotal", "IsMute",
diff --git a/xml/string.h b/xml/string.h
index 00e5fab..e53bafb 100644
--- a/xml/string.h
+++ b/xml/string.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: string.h,v 1.1 2004/12/19 22:03:28 lordjaxom Exp $
+ *  $Id: string.h,v 1.2 2004/12/21 18:35:55 lordjaxom Exp $
  */
 
 #ifndef VDR_TEXT2SKIN_XML_STRING_H
@@ -43,6 +43,8 @@ enum exToken {
 	tIsEncrypted,
 	tIsRadio,
 	tIsRecording,
+	// next 1 also in all other displays
+	tCurrentRecording,
 	// next 3 also in Menu
 	tHasVPS,
 	tHasTimer,
diff --git a/xml/type.h b/xml/type.h
index 74e0a70..c60c404 100644
--- a/xml/type.h
+++ b/xml/type.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: type.h,v 1.1 2004/12/19 22:03:28 lordjaxom Exp $
+ *  $Id: type.h,v 1.2 2004/12/21 18:35:55 lordjaxom Exp $
  */
 
 #ifndef VDR_TEXT2SKIN_XML_TYPE_H
@@ -20,21 +20,25 @@ private:
 	eType       mType;
 	std::string mString;
 	int         mNumber;
+	bool        mNoCache;
 
 public:
 	static cxType True;
 	static cxType False;
 
-	cxType(void): mType(boolean), mNumber(0) {}
-	cxType(const char *String): mType(string), mString(String ?: "") {}
-	cxType(std::string String): mType(string), mString(String) {}
-	cxType(int Number): mType(number), mNumber(Number) {}
-	cxType(time_t Number): mType(number), mNumber(Number) {}
-	cxType(bool Value): mType(boolean), mNumber(Value ? 1 : 0) {}
+	cxType(void): mType(boolean), mNumber(0), mNoCache(false) {}
+	cxType(const char *String): mType(string), mString(String ?: ""), mNoCache(false) {}
+	cxType(std::string String): mType(string), mString(String), mNoCache(false) {}
+	cxType(int Number): mType(number), mNumber(Number), mNoCache(false) {}
+	cxType(time_t Number): mType(number), mNumber(Number), mNoCache(false) {}
+	cxType(bool Value): mType(boolean), mNumber(Value ? 1 : 0), mNoCache(false) {}
 
 	const std::string &String(void);
 	int Number(void) const { return mType == number ? mNumber : 0; }
 
+	void SetNoCache(bool Enable = true) { mNoCache = Enable; }
+	bool NoCache(void) const { return mNoCache; }
+
 	operator std::string () { return String(); }
 	operator int         () { return Number(); }
 	operator bool        () { return Number(); }