summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2007-09-18 13:52:52 +0000
committerphintuka <phintuka>2007-09-18 13:52:52 +0000
commit8ec2ef52361038d6af828abceb2921b6ca2743aa (patch)
treeb8d00a85064932a62414c02c1710802d80e40ac7
parent3004d4ba2b59710ecddc94640f70d87e876e6e7f (diff)
downloadxineliboutput-8ec2ef52361038d6af828abceb2921b6ca2743aa.tar.gz
xineliboutput-8ec2ef52361038d6af828abceb2921b6ca2743aa.tar.bz2
Remove RegisterI18n(Phrases) for gettext -based VDR versions
-rw-r--r--i18n.c6
-rw-r--r--i18n.h6
-rw-r--r--xineliboutput.c5
3 files changed, 13 insertions, 4 deletions
diff --git a/i18n.c b/i18n.c
index 9f9c7c57..ee9faeba 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: i18n.c,v 1.27 2007-09-18 11:51:12 phintuka Exp $
+ * $Id: i18n.c,v 1.28 2007-09-18 13:52:52 phintuka Exp $
*
* Translations provided by:
*
@@ -17,6 +17,8 @@
#include <vdr/config.h>
#include "i18n.h"
+#if VDRVERSNUM < 10507
+
const tI18nPhrase Phrases[] = {
{ "X11/xine-lib output plugin", // English
"X11/xine-lib Ausgabe-Plugin", // Deutsch
@@ -3377,5 +3379,5 @@ const tI18nPhrase Phrases[] = {
{ NULL }
};
-
+#endif // VDRVERSNUM < 10507
diff --git a/i18n.h b/i18n.h
index 357fe4a8..41faaeee 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: i18n.h,v 1.2 2007-09-12 13:10:28 phintuka Exp $
+ * $Id: i18n.h,v 1.3 2007-09-18 13:52:52 phintuka Exp $
*
*/
@@ -13,6 +13,8 @@
#include <vdr/i18n.h>
+#if VDRVERSNUM < 10507
+
extern const tI18nPhrase Phrases[];
#ifndef trNOOP
@@ -23,4 +25,6 @@ extern const tI18nPhrase Phrases[];
# define trVDR(s) tr(s)
#endif
+#endif // VDRVERSNUM < 10507
+
#endif //__XINELIBOUTPUT_I18N_H
diff --git a/xineliboutput.c b/xineliboutput.c
index 4f09f3ee..0fbf1da3 100644
--- a/xineliboutput.c
+++ b/xineliboutput.c
@@ -21,7 +21,7 @@
*
* xineliboutput.c: VDR Plugin interface
*
- * $Id: xineliboutput.c,v 1.23 2007-09-17 17:56:26 phelin Exp $
+ * $Id: xineliboutput.c,v 1.24 2007-09-18 13:52:52 phintuka Exp $
*
*/
@@ -144,7 +144,10 @@ bool cPluginXinelibOutput::Initialize(void)
// Initialize any background activities the plugin shall perform.
TRACEF("cPluginXinelibOutput::Initialize");
+#if VDRVERSNUM < 10507
RegisterI18n(Phrases);
+#endif
+
cXinelibDevice::Instance();
return true;
}