summaryrefslogtreecommitdiff
path: root/xml/object.c
diff options
context:
space:
mode:
authorAndreas Brugger <brougs78@gmx.net>2005-11-19 12:00:00 +0100
committerThomas Günther <tom@toms-cafe.de>2009-06-03 01:03:47 +0200
commit662dd62488f6f842fe5d940e986f798abe1c7691 (patch)
tree0406592c45332e6ba26ed63f3bff91ab42d30b4a /xml/object.c
parent71023584dc849dc3705c6db303878fd27e8704c7 (diff)
downloadvdr-plugin-text2skin-662dd62488f6f842fe5d940e986f798abe1c7691.tar.gz
vdr-plugin-text2skin-662dd62488f6f842fe5d940e986f798abe1c7691.tar.bz2
2005-11-19: Version 1.1-cvs_ext-0.2 (vdr-text2skin-1.1-cvs_ext-0.2.diff)
- removed the previously introduced tokens NextTimerName, NextTimerStart, NextTimerChannel, CurrentRecordingsCount and added tokens for the next 3 timers: CurrentEventsTitle[123], CurrentEventsStartDateTime[123], CurrentEventsStopDateTime[123], CurrentEventsChannelNumber[123], CurrentEventsChannelName[123], CurrentEventsIsRecording[123] - added audio- and video-tokens: PresentLanguageCode, PresentLanguageDescription, PresentVideoAR and implemented the missing code for the Language-token - added tokens for replay: ReplayName, ReplayDateTime, ReplayShortText, ReplayDescription, ReplayLanguageCode, ReplayLanguageDescription, ReplayVideoAR (not activated yet) - additional recording-tokens: RecordingVideoAR, RecordingSize - added a reset for scrolling text (configurable) - included Text2skin.diff from the rotor-plugin
Diffstat (limited to 'xml/object.c')
-rw-r--r--xml/object.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/xml/object.c b/xml/object.c
index 6ea0ab6..73d8a26 100644
--- a/xml/object.c
+++ b/xml/object.c
@@ -140,10 +140,14 @@ const std::string &cxObject::TypeName(void) const
return ObjectNames[mType];
}
+int cxObject::UseTTF = true;
+
const cFont *cxObject::Font(void) const
{
const cFont *font;
+ if (UseTTF) {
+
if ((font = cText2SkinFont::Load(SkinPath() + "/fonts", mFontFace, mFontSize, mFontWidth))
!= NULL)
return font;
@@ -152,6 +156,8 @@ const cFont *cxObject::Font(void) const
mFontWidth)) != NULL)
return font;
+ }
+
return cFont::GetFont(fontOsd);
}