From 2e5dad9ec5c904e9e45333cbeb1cfa15eefc1b06 Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Sun, 16 Mar 2014 17:04:28 +0200 Subject: [PATCH] Updated for vdr-2.1.6. --- HISTORY | 9 +++++++++ femon.c | 6 +++--- femonosd.c | 7 ++++++- femontools.c | 5 +++++ femontools.h | 1 + po/de_DE.po | 6 +++--- po/es_ES.po | 6 +++--- po/et_EE.po | 6 +++--- po/fi_FI.po | 6 +++--- po/fr_FR.po | 6 +++--- po/hu_HU.po | 6 +++--- po/it_IT.po | 6 +++--- po/lt_LT.po | 6 +++--- po/ru_RU.po | 6 +++--- po/sk_SK.po | 6 +++--- po/uk_UA.po | 6 +++--- po/zh_CN.po | 6 +++--- po/zh_TW.po | 6 +++--- 18 files changed, 63 insertions(+), 43 deletions(-) diff --git a/HISTORY b/HISTORY index a396097..6f55f35 100644 --- a/HISTORY +++ b/HISTORY @@ -492,3 +492,12 @@ VDR Plugin 'femon' Revision History 2014-03-15: Version 2.0.4 - Refactored the SAT>IP support. + + +=================================== +VDR Plugin 'femon' Revision History +=================================== + +2014-03-16: Version 2.1.0 + +- Updated for vdr-2.1.6. diff --git a/femon.c b/femon.c index 4c2ee4a..eff7506 100644 --- a/femon.c +++ b/femon.c @@ -14,15 +14,15 @@ #include "femonservice.h" #include "femontools.h" -#if defined(APIVERSNUM) && APIVERSNUM < 20000 -#error "VDR-2.0.0 API version or greater is required!" +#if defined(APIVERSNUM) && APIVERSNUM < 20106 +#error "VDR-2.1.6 API version or greater is required!" #endif #ifndef GITVERSION #define GITVERSION "" #endif -static const char VERSION[] = "2.0.4" GITVERSION; +static const char VERSION[] = "2.1.0" GITVERSION; static const char DESCRIPTION[] = trNOOP("DVB Signal Information Monitor (OSD)"); static const char MAINMENUENTRY[] = trNOOP("Signal Information"); diff --git a/femonosd.c b/femonosd.c index 22ddd51..ce74590 100644 --- a/femonosd.c +++ b/femonosd.c @@ -24,7 +24,7 @@ #define OSDWIDTH m_OsdWidth // in pixels #define OSDHEIGHT m_OsdHeight // in pixels #define OSDROWHEIGHT m_Font->Height() // in pixels -#define OSDINFOHEIGHT (OSDROWHEIGHT * 13) // in pixels (13 rows) +#define OSDINFOHEIGHT (OSDROWHEIGHT * 14) // in pixels (14 rows) #define OSDSTATUSHEIGHT (OSDROWHEIGHT * 6) // in pixels (6 rows) #define OSDSYMBOL(id) femonSymbols.Get(id) #define OSDSPACING femonSymbols.GetSpacing() @@ -436,6 +436,8 @@ void cFemonOsd::DrawInfoWindow(void) OSDDRAWINFOLEFT( trVDR("System"), *getSatelliteSystem(dtp.System())); if (dtp.System()) { OSDDRAWINFORIGHT(trVDR("RollOff"), *getRollOff(dtp.RollOff())); + offset += OSDROWHEIGHT; + OSDDRAWINFOLEFT( trVDR("Pilot"), *getPilot(dtp.Pilot())); } } break; @@ -474,6 +476,9 @@ void cFemonOsd::DrawInfoWindow(void) OSDDRAWINFOLEFT( trVDR("System"), *getTerrestrialSystem(dtp.System())); if (dtp.System()) { OSDDRAWINFORIGHT(trVDR("StreamId"), *cString::sprintf("%d", dtp.StreamId())); + offset += OSDROWHEIGHT; + OSDDRAWINFOLEFT( trVDR("T2SystemId"),*cString::sprintf("%d", dtp.T2SystemId())); + OSDDRAWINFORIGHT(trVDR("SISO/MISO"), *cString::sprintf("%d", dtp.SisoMiso())); } } break; diff --git a/femontools.c b/femontools.c index 1bd0c87..6574238 100644 --- a/femontools.c +++ b/femontools.c @@ -378,6 +378,11 @@ cString getRollOff(int value) return cString::sprintf("%s", getUserString(value, RollOffValues)); } +cString getPilot(int value) +{ + return cString::sprintf("%s", getUserString(value, PilotValues)); +} + cString getResolution(int width, int height, int scan) { if ((width > 0) && (height > 0)) { diff --git a/femontools.h b/femontools.h index d7fef1b..abf1a6a 100644 --- a/femontools.h +++ b/femontools.h @@ -59,6 +59,7 @@ cString getModulation(int value); cString getTerrestrialSystem(int value); cString getSatelliteSystem(int value); cString getRollOff(int value); +cString getPilot(int value); cString getResolution(int width, int height, int scan); cString getAspectRatio(int value); cString getVideoFormat(int value); diff --git a/po/de_DE.po b/po/de_DE.po index 7f06153..ea4d202 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Christian Wieninger\n" "Language-Team: German \n" "Language: de\n" diff --git a/po/es_ES.po b/po/es_ES.po index ad2fadf..0f21110 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Luis Palacios\n" "Language-Team: Spanish \n" "Language: es\n" diff --git a/po/et_EE.po b/po/et_EE.po index 6066ed5..9c5611a 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Arthur Konovalov\n" "Language-Team: Estonian \n" "Language: et\n" diff --git a/po/fi_FI.po b/po/fi_FI.po index 1323a4a..3dddcff 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Rolf Ahrenberg\n" "Language-Team: Finnish \n" "Language: fi\n" diff --git a/po/fr_FR.po b/po/fr_FR.po index 6f18db3..908ea5e 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Bernard Jaulin \n" "Language-Team: French \n" "Language: fr\n" diff --git a/po/hu_HU.po b/po/hu_HU.po index 3657399..fab6b79 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Füley István \n" "Language-Team: Hungarian \n" "Language: hu\n" diff --git a/po/it_IT.po b/po/it_IT.po index 24820d8..1683908 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian \n" "Language: it\n" diff --git a/po/lt_LT.po b/po/lt_LT.po index c33a32e..a9a9a69 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Valdemaras Pipiras \n" "Language-Team: Lithuanian \n" "Language: lt\n" diff --git a/po/ru_RU.po b/po/ru_RU.po index 34fc995..4e93574 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Vyacheslav Dikonov\n" "Language-Team: Russian \n" "Language: ru\n" diff --git a/po/sk_SK.po b/po/sk_SK.po index a091f17..797bb1f 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Milan Hrala \n" "Language-Team: Slovak \n" "Language: sk\n" diff --git a/po/uk_UA.po b/po/uk_UA.po index 361cbed..f7d11ae 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -4,10 +4,10 @@ # Yarema aka Knedlyk , 2010. msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" "Language: uk\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 1e721a5..3d4800d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: NanFeng \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index be49af2..00c3a47 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.4\n" +"Project-Id-Version: vdr-femon 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-15 03:15+0200\n" -"PO-Revision-Date: 2014-03-15 03:15+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: NanFeng \n" "Language-Team: Chinese (traditional) \n" "Language: zh_TW\n"