summaryrefslogtreecommitdiff
path: root/display.c
diff options
context:
space:
mode:
authorAndreas Brugger <brougs78@gmx.net>2006-01-07 12:00:00 +0100
committerThomas Günther <tom@toms-cafe.de>2009-06-03 01:37:19 +0200
commiteb6eaf285edd82c212810f066313f93dc4a8a129 (patch)
treeccd809304ccfaf710db31e5ba765b92961a821ca /display.c
parenteeda27b9d069161db0261f6e2f51ac9463bde910 (diff)
downloadvdr-plugin-text2skin-eb6eaf285edd82c212810f066313f93dc4a8a129.tar.gz
vdr-plugin-text2skin-eb6eaf285edd82c212810f066313f93dc4a8a129.tar.bz2
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
Diffstat (limited to 'display.c')
-rw-r--r--display.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/display.c b/display.c
index 3db4063..ac00950 100644
--- a/display.c
+++ b/display.c
@@ -16,7 +16,7 @@
cText2SkinDisplayChannel::cText2SkinDisplayChannel(cText2SkinLoader *Loader, bool WithInfo):
cText2SkinRender(Loader, WithInfo ? cxDisplay::channelInfo : cxDisplay::channelSmall),
mFallbackDisplay(NULL),
- mChannel(NULL),
+ mChannel(NULL),
mNumber(0),
mPresent(NULL),
mFollowing(NULL),
@@ -116,7 +116,9 @@ cxType cText2SkinDisplayChannel::GetTokenData(const txToken &Token)
{
switch (Token.Type) {
case tChannelNumber:
- return (cxType)ChannelNumber(mChannel, mNumber);
+ return mChannel != NULL
+ ? (cxType)ChannelNumber(mChannel, mNumber)
+ : (cxType)false;
case tChannelName:
return mChannel != NULL
@@ -1088,6 +1090,7 @@ cxType cText2SkinDisplayMenu::GetTokenData(const txToken &Token)
? (cxType)mEvent->Description()
: (cxType)false;
+#if VDRVERSNUM >= 10318
case tPresentLanguageCode:
if (mEvent)
{
@@ -1154,6 +1157,7 @@ cxType cText2SkinDisplayMenu::GetTokenData(const txToken &Token)
}
}
return false;
+#endif
case tHasVPS:
case tChannelHasVPS: