2006-01-10: Version 1.1-cvs_ext-0.6 (vdr-text2skin-1.1-cvs_ext-0.6.diff)

- updated to cvs-version of text2skin
- since vdr-1.3.38 it is possible to exactly identify the replayed
  recording, so the replay-tokens work now
- switched the search-order for the fonts to priorise the skin-folder
  (this avoids error-messages in the log)

6 files changed, 55 insertions, 23 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 86ab45f..e763253 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -20,3 +20,7 @@ Reinhard Nissl
 
 Frank Enderle
   for sending a patch to fix a crash due to uninitialized pointer
+
+Chris Warren
+  for sending a patch to fix displaying partial channel numbers while changing
+	channels
diff --git a/HISTORY b/HISTORY
index 4d9da34..16d54d9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,14 @@
 VDR Plugin 'text2skin' Revision History
 ---------------------------------------
 
+2006-01-10: Version 1.1-cvs_ext-0.6 (vdr-text2skin-1.1-cvs_ext-0.6.diff)
+
+- updated to cvs-version of text2skin
+- since vdr-1.3.38 it is possible to exactly identify the replayed
+  recording, so the replay-tokens work now
+- switched the search-order for the fonts to priorise the skin-folder
+  (this avoids error-messages in the log)
+
 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
@@ -54,6 +62,8 @@ VDR Plugin 'text2skin' Revision History
 - patch for PresentRemaining by Björn (VDR-Portal)
 - fixed a race condition (thanks to Reinhard Nissl for pointing this out)
 - updated finnish translations (thanks to Rolf Ahrenberg)
+- fixed displaying of partial channel numbers while changing channels (thanks to
+  Chris Warren)
 - added tokens for Recording Info Display
   (RecordingName, RecordingDateTime, RecordingTitle, RecordingShortText,
   RecordingDescription, RecordingLanguageCode, RecordingLanguageDescription)
diff --git a/display.c b/display.c
index ac00950..227b41a 100644
--- a/display.c
+++ b/display.c
@@ -1,5 +1,5 @@
 /*
- * $Id: display.c,v 1.24 2005/09/20 18:22:56 lordjaxom Exp $
+ * $Id: display.c,v 1.26 2005/12/17 21:51:43 lordjaxom Exp $
  */
 
 #include "render.h"
@@ -116,9 +116,7 @@ cxType cText2SkinDisplayChannel::GetTokenData(const txToken &Token)
 {
 	switch (Token.Type) {
 	case tChannelNumber:
-		return mChannel != NULL
-		       ? (cxType)ChannelNumber(mChannel, mNumber)
-		       : (cxType)false;
+		return ChannelNumber(mChannel, mNumber);
 		
 	case tChannelName:
 		return mChannel != NULL
diff --git a/status.c b/status.c
index 3df40ab..9155bf6 100644
--- a/status.c
+++ b/status.c
@@ -33,7 +33,12 @@ void cText2SkinStatus::SetRender(cText2SkinRender *Render)
 	mNextRecording    = 0;
 }
 
-void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name) {
+#if VDRVERSNUM >= 10338
+void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name, const char *FileName, bool On)
+#else
+void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name)
+#endif
+{
 	Dprintf("cText2SkinStatus::Replaying(%s)\n", Name);
 	eReplayMode oldMode = mReplayMode;
 
@@ -54,27 +59,19 @@ void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name)
 				mReplayIsShuffle = Name[2] == 'S';
 			}
 		}
-		/*
-		I tried the following, but this is not thread-safe and it seems that
-		'LastReplayed()' is not allways up to date, when cStatus::Replaying()
-		is called:
-		
-		else if (const cRecording *rec = GetRecordingByFileName(cReplayControl::LastReplayed()))
+#if VDRVERSNUM >= 10338
+		else if (const cRecording *rec = GetRecordingByFileName(FileName))
 		{
 			mReplay = rec;
 			mReplayMode = replayNormal;
 		}
-		
-		so here is a temporary implementation which has the problem, that several
-		recordings with the same name cannot be seperated. This is deactivated
-		in Enigma (as it is more ore less useless), till there is a decent fix for
-		that.
-		*/
+#else
 		else if (const cRecording *rec = GetRecordingByName(Name))
 		{
 			mReplay = rec;
 			mReplayMode = replayNormal;
-		}	
+		}
+#endif
 		else if (strcmp(Name, "DVD") == 0)
 			mReplayMode = replayDVD;
 		else if (strcmp(Name, "VCD") == 0)
@@ -106,7 +103,11 @@ void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name)
 	}
 }
 
-void cText2SkinStatus::Recording(const cDevice *Device, const char *Name) 
+#if VDRVERSNUM >= 10338
+void cText2SkinStatus::Recording(const cDevice *Device, const char *Name, const char *FileName, bool On)
+#else
+void cText2SkinStatus::Recording(const cDevice *Device, const char *Name)
+#endif
 {
 	if (mRender != NULL)
 		mRender->UpdateLock();
@@ -295,6 +296,7 @@ cxType cText2SkinStatus::GetTokenData(const txToken &Token)
 #endif
 		
 #if VDRVERSNUM >= 10325
+#if VDRVERSNUM >= 10338
 	case tReplayName:
 		return mReplay != NULL
 		       ? (cxType)mReplay->Name()
@@ -314,7 +316,20 @@ cxType cText2SkinStatus::GetTokenData(const txToken &Token)
 		return mReplay != NULL
 		       ? (cxType)mReplay->Info()->Description()
 		       : (cxType)false;
+#else
+	case tReplayName:
+		return (cxType)false;
 
+	case tReplayDateTime:
+		return (cxType)false;
+                         
+	case tReplayShortText:
+		return (cxType)false;
+
+	case tReplayDescription:
+		return (cxType)false;
+#endif
+	
 	case tReplayLanguageCode:
 		if (mReplay)
 		{
diff --git a/status.h b/status.h
index a39d680..2047595 100644
--- a/status.h
+++ b/status.h
@@ -67,8 +67,13 @@ private:
 	bool              mTimerConflict;
 
 protected:
+#if VDRVERSNUM >= 10338
+	virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On);
+	virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
+#else
 	virtual void Replaying(const cControl *Control, const char *Name);
 	virtual void Recording(const cDevice *Device, const char *Name);
+#endif
 	virtual void OsdClear(void);
 	virtual void OsdCurrentItem(const char *Text);
 
diff --git a/xml/object.c b/xml/object.c
index 73d8a26..3979384 100644
--- a/xml/object.c
+++ b/xml/object.c
@@ -148,14 +148,14 @@ const cFont *cxObject::Font(void) const
 
         if (UseTTF) {
          
-	if ((font = cText2SkinFont::Load(SkinPath() + "/fonts", mFontFace, mFontSize, mFontWidth)) 
-	        != NULL)
-		return font;
-	
 	if ((font = cText2SkinFont::Load(SkinPath() + "/" + mSkin->Name(), mFontFace, mFontSize, 
 	                                 mFontWidth)) != NULL)
 		return font;
 	
+	if ((font = cText2SkinFont::Load(SkinPath() + "/fonts", mFontFace, mFontSize, mFontWidth)) 
+	        != NULL)
+		return font;
+	
 		}
 	
 	return cFont::GetFont(fontOsd);