[vdr-plugin-femon] 01/05: Imported Upstream version 2.1.1
Tobias Grimm
tiber-guest at moszumanska.debian.org
Thu Feb 12 20:37:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-femon.
commit 5cf96d7959bea5510c00ce41558272e587180e0f
Author: etobi <git at e-tobi.net>
Date: Mon Feb 9 18:59:11 2015 +0100
Imported Upstream version 2.1.1
---
HISTORY | 13 +++++++++++++
femon.c | 6 +++---
femonosd.c | 7 ++++++-
femontools.c | 10 ++++++++--
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, 70 insertions(+), 45 deletions(-)
diff --git a/HISTORY b/HISTORY
index a396097..35d64c5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -492,3 +492,16 @@ 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.
+
+2014-05-10: Version 2.1.1
+
+- Fixed the channel frequency value.
diff --git a/femon.c b/femon.c
index 4c2ee4a..b8acc0f 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.1" 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..5b76fc9 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)) {
@@ -519,8 +524,9 @@ cString getAC3DialogLevel(int value)
cString getFrequencyMHz(int value)
{
- while (value > 20000) value /= 1000;
- return cString::sprintf("%d %s", value, tr("MHz"));
+ double freq = value;
+ while (freq > 20000.0) freq /= 1000.0;
+ return cString::sprintf("%s %s", *dtoa(freq, "%lg"), tr("MHz"));
}
cString getAudioSamplingFreq(int value)
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..232764f 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.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Christian Wieninger\n"
"Language-Team: German <vdr at linuxtv.org>\n"
"Language: de\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index ad2fadf..c883a95 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.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Luis Palacios\n"
"Language-Team: Spanish <vdr at linuxtv.org>\n"
"Language: es\n"
diff --git a/po/et_EE.po b/po/et_EE.po
index 6066ed5..3617163 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.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Arthur Konovalov\n"
"Language-Team: Estonian <vdr at linuxtv.org>\n"
"Language: et\n"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 1323a4a..719954d 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.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Rolf Ahrenberg\n"
"Language-Team: Finnish <vdr at linuxtv.org>\n"
"Language: fi\n"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 6f18db3..e32f3f1 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.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Bernard Jaulin <bernard.jaulin at gmail.com>\n"
"Language-Team: French <vdr at linuxtv.org>\n"
"Language: fr\n"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 3657399..3e96f80 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.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: F�ley Istv�n <ifuley at tigercomp dot ro>\n"
"Language-Team: Hungarian <ifuley at tigercomp dot ro>\n"
"Language: hu\n"
diff --git a/po/it_IT.po b/po/it_IT.po
index 24820d8..0f5e9fc 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.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Diego Pierotto <vdr-italian at tiscali.it>\n"
"Language-Team: Italian <vdr at linuxtv.org>\n"
"Language: it\n"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index c33a32e..9c4a4a7 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.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Valdemaras Pipiras <varas at ambernet.lt>\n"
"Language-Team: Lithuanian <vdr at linuxtv.org>\n"
"Language: lt\n"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 34fc995..e73da4c 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.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Vyacheslav Dikonov\n"
"Language-Team: Russian <vdr at linuxtv.org>\n"
"Language: ru\n"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index a091f17..3b8064a 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.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Milan Hrala <hrala.milan at gmail.com>\n"
"Language-Team: Slovak <vdr at linuxtv.org>\n"
"Language: sk\n"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 361cbed..2d41ac5 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -4,10 +4,10 @@
# Yarema aka Knedlyk <yupadmin at gmail.com>, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: vdr-femon 2.0.4\n"
+"Project-Id-Version: vdr-femon 2.1.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Yarema aka Knedlyk <yupadmin at gmail.com>\n"
"Language-Team: Ukrainian <translation at linux.org.ua>\n"
"Language: uk\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1e721a5..7c3d9c3 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.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: NanFeng <nfgx at 21cn.com>\n"
"Language-Team: Chinese (simplified) <vdr at linuxtv.org>\n"
"Language: zh_CN\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index be49af2..f7239a9 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.1\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-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: NanFeng <nfgx at 21cn.com>\n"
"Language-Team: Chinese (traditional) <vdr at linuxtv.org>\n"
"Language: zh_TW\n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-femon.git
More information about the pkg-vdr-dvb-changes
mailing list