summaryrefslogtreecommitdiff
path: root/display.c
diff options
context:
space:
mode:
authorAndreas Brugger <brougs78@gmx.net>2006-01-10 19:38:22 +0100
committerThomas Günther <tom@toms-cafe.de>2009-06-03 02:39:56 +0200
commitdaad17454a344d50150850fd9b9062b200982140 (patch)
tree6974de13052cbc11cae7255c8b0ae37b0a1666f5 /display.c
parenteb6eaf285edd82c212810f066313f93dc4a8a129 (diff)
parentba472a2d6dc935c03450e0932a22e66703ca3524 (diff)
downloadvdr-plugin-text2skin-daad17454a344d50150850fd9b9062b200982140.tar.gz
vdr-plugin-text2skin-daad17454a344d50150850fd9b9062b200982140.tar.bz2
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)
Diffstat (limited to 'display.c')
-rw-r--r--display.c6
1 files changed, 2 insertions, 4 deletions
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