Updated for vdr-2.1.6.

2023-10-10 11:36:53 +00:00 · 2014-03-16 17:04:28 +02:00
18 changed files with 63 additions and 43 deletions
--- a/9
+++ b/9
@@ -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.
--- 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");

--- 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;
--- 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)) {
--- 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);
--- 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: <see README>\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 <vdr@linuxtv.org>\n"
 "Language: de\n"
--- 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: <see README>\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 <vdr@linuxtv.org>\n"
 "Language: es\n"
--- 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: <see README>\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 <vdr@linuxtv.org>\n"
 "Language: et\n"
--- 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: <see README>\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 <vdr@linuxtv.org>\n"
 "Language: fi\n"
--- 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: <see README>\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 <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
--- 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: <see README>\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<74>n <ifuley at tigercomp dot ro>\n"
 "Language-Team: Hungarian <ifuley at tigercomp dot ro>\n"
 "Language: hu\n"
--- 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: <see README>\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 <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
--- 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: <see README>\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 <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
 "Language: lt\n"
--- 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: <see README>\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 <vdr@linuxtv.org>\n"
 "Language: ru\n"
--- 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: <see README>\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 <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
 "Language: sk\n"
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -4,10 +4,10 @@
 # Yarema aka Knedlyk <yupadmin@gmail.com>, 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: <see README>\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 <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "Language: uk\n"
--- 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: <see README>\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 <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
 "Language: zh_CN\n"
--- 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: <see README>\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 <nfgx@21cn.com>\n"
 "Language-Team: Chinese (traditional) <vdr@linuxtv.org>\n"
 "Language: zh_TW\n"