From 42d54c80ef8591d5ad3ec406e37a138bd8c962e1 Mon Sep 17 00:00:00 2001
From: lordjaxom <lordjaxom>
Date: Sat, 15 Jan 2005 21:00:57 +0000
Subject: - implemented token {ChannelID}

---
 display.c    | 7 ++++++-
 xml/string.c | 6 +++---
 xml/string.h | 3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/display.c b/display.c
index 446f9c7..31ecbb6 100644
--- a/display.c
+++ b/display.c
@@ -1,5 +1,5 @@
 /*
- * $Id: display.c,v 1.9 2005/01/12 21:23:20 lordjaxom Exp $
+ * $Id: display.c,v 1.10 2005/01/15 21:00:57 lordjaxom Exp $
  */
 
 #include "render.h"
@@ -126,6 +126,11 @@ cxType cText2SkinDisplayChannel::GetTokenData(const txToken &Token)
 		       ? (cxType)Sources.Get(mChannel->Source())->Description()
 		       : (cxType)false;
 
+	case tTChannelID:
+		return mChannel != NULL
+		       ? (cxType)(const char*)mChannel->GetChannelID().ToString()
+		       : (cxType)false;
+
 	case tPresentStartDateTime:
 		return mPresent != NULL
 		       ? (cxType)TimeType(mPresent->StartTime(), Token.Attrib.Text)
diff --git a/xml/string.c b/xml/string.c
index 5c0eab7..3727797 100644
--- a/xml/string.c
+++ b/xml/string.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: string.c,v 1.9 2005/01/15 20:54:37 lordjaxom Exp $
+ *  $Id: string.c,v 1.10 2005/01/15 21:00:57 lordjaxom Exp $
  */
 
 #include "xml/string.h"
@@ -10,8 +10,8 @@ static const char *Tokens[__COUNT_TOKEN__] = {
 
 	// Channel Display
 	"ChannelNumber", "ChannelName", "ChannelShortName", "ChannelBouquet", "ChannelPortal", 
-	"ChannelSource", "PresentStartDateTime", "PresentVPSDateTime", "PresentEndDateTime", 
-	"PresentDuration", "PresentProgress", "PresentRemaining",
+	"ChannelSource", "ChannelID", "PresentStartDateTime", "PresentVPSDateTime", 
+	"PresentEndDateTime", "PresentDuration", "PresentProgress", "PresentRemaining",
 	"PresentTitle", "PresentShortText", "PresentDescription", "FollowingStartDateTime", 
 	"FollowingVPSDateTime", "FollowingEndDateTime", "FollowingDuration",
 	"FollowingTitle", "FollowingShortText", "FollowingDescription", "Language",
diff --git a/xml/string.h b/xml/string.h
index 8cd849d..631b35a 100644
--- a/xml/string.h
+++ b/xml/string.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: string.h,v 1.10 2005/01/15 20:54:37 lordjaxom Exp $
+ *  $Id: string.h,v 1.11 2005/01/15 21:00:57 lordjaxom Exp $
  */
 
 #ifndef VDR_TEXT2SKIN_XML_STRING_H
@@ -22,6 +22,7 @@ enum exToken {
 	tChannelBouquet,
 	tChannelPortal,
 	tChannelSource,
+	tTChannelID, // (name clash)
 	// next 8 also in Menu
 	tPresentStartDateTime,
 	tPresentVPSDateTime,
-- 
cgit v1.2.3