frodovdr
/
vdr-plugin-femon
mirror of https://github.com/rofafor/vdr-plugin-femon.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated for vdr-2.1.6.

This commit is contained in:
Rolf Ahrenberg 2014-03-16 17:04:28 +02:00
parent 136c9fb73c
commit 2e5dad9ec5
18 changed files with 63 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
HISTORY
View File

@ -492,3 +492,12 @@ VDR Plugin 'femon' Revision History
2014-03-15: Version 2.0.4 2014-03-15: Version 2.0.4
- Refactored the SAT>IP support. - Refactored the SAT>IP support.
===================================
VDR Plugin 'femon' Revision History
===================================
2014-03-16: Version 2.1.0
- Updated for vdr-2.1.6.

6
femon.c
View File

@ -14,15 +14,15 @@
#include "femonservice.h" #include "femonservice.h"
#include "femontools.h" #include "femontools.h"
#if defined(APIVERSNUM) && APIVERSNUM < 20000 #if defined(APIVERSNUM) && APIVERSNUM < 20106
#error "VDR-2.0.0 API version or greater is required!" #error "VDR-2.1.6 API version or greater is required!"
#endif #endif
#ifndef GITVERSION #ifndef GITVERSION
#define GITVERSION "" #define GITVERSION ""
#endif #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 DESCRIPTION[] = trNOOP("DVB Signal Information Monitor (OSD)");
static const char MAINMENUENTRY[] = trNOOP("Signal Information"); static const char MAINMENUENTRY[] = trNOOP("Signal Information");

7
femonosd.c
View File

@ -24,7 +24,7 @@
#define OSDWIDTH m_OsdWidth // in pixels #define OSDWIDTH m_OsdWidth // in pixels
#define OSDHEIGHT m_OsdHeight // in pixels #define OSDHEIGHT m_OsdHeight // in pixels
#define OSDROWHEIGHT m_Font->Height() // 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 OSDSTATUSHEIGHT (OSDROWHEIGHT * 6) // in pixels (6 rows)
#define OSDSYMBOL(id) femonSymbols.Get(id) #define OSDSYMBOL(id) femonSymbols.Get(id)
#define OSDSPACING femonSymbols.GetSpacing() #define OSDSPACING femonSymbols.GetSpacing()
@ -436,6 +436,8 @@ void cFemonOsd::DrawInfoWindow(void)
OSDDRAWINFOLEFT( trVDR("System"), *getSatelliteSystem(dtp.System())); OSDDRAWINFOLEFT( trVDR("System"), *getSatelliteSystem(dtp.System()));
if (dtp.System()) { if (dtp.System()) {
OSDDRAWINFORIGHT(trVDR("RollOff"), *getRollOff(dtp.RollOff())); OSDDRAWINFORIGHT(trVDR("RollOff"), *getRollOff(dtp.RollOff()));
offset += OSDROWHEIGHT;
OSDDRAWINFOLEFT( trVDR("Pilot"), *getPilot(dtp.Pilot()));
} }
} }
break; break;
@ -474,6 +476,9 @@ void cFemonOsd::DrawInfoWindow(void)
OSDDRAWINFOLEFT( trVDR("System"), *getTerrestrialSystem(dtp.System())); OSDDRAWINFOLEFT( trVDR("System"), *getTerrestrialSystem(dtp.System()));
if (dtp.System()) { if (dtp.System()) {
OSDDRAWINFORIGHT(trVDR("StreamId"), *cString::sprintf("%d", dtp.StreamId())); 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; break;

5
femontools.c
View File

@ -378,6 +378,11 @@ cString getRollOff(int value)
return cString::sprintf("%s", getUserString(value, RollOffValues)); 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) cString getResolution(int width, int height, int scan)
{ {
if ((width > 0) && (height > 0)) { if ((width > 0) && (height > 0)) {

1
femontools.h
View File

@ -59,6 +59,7 @@ cString getModulation(int value);
cString getTerrestrialSystem(int value); cString getTerrestrialSystem(int value);
cString getSatelliteSystem(int value); cString getSatelliteSystem(int value);
cString getRollOff(int value); cString getRollOff(int value);
cString getPilot(int value);
cString getResolution(int width, int height, int scan); cString getResolution(int width, int height, int scan);
cString getAspectRatio(int value); cString getAspectRatio(int value);
cString getVideoFormat(int value); cString getVideoFormat(int value);

6
po/de_DE.po
View File

@ -7,10 +7,10 @@
# #
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Christian Wieninger\n" "Last-Translator: Christian Wieninger\n"
"Language-Team: German <vdr@linuxtv.org>\n" "Language-Team: German <vdr@linuxtv.org>\n"
"Language: de\n" "Language: de\n"

6
po/es_ES.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Luis Palacios\n" "Last-Translator: Luis Palacios\n"
"Language-Team: Spanish <vdr@linuxtv.org>\n" "Language-Team: Spanish <vdr@linuxtv.org>\n"
"Language: es\n" "Language: es\n"

6
po/et_EE.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Arthur Konovalov\n" "Last-Translator: Arthur Konovalov\n"
"Language-Team: Estonian <vdr@linuxtv.org>\n" "Language-Team: Estonian <vdr@linuxtv.org>\n"
"Language: et\n" "Language: et\n"

6
po/fi_FI.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Rolf Ahrenberg\n" "Last-Translator: Rolf Ahrenberg\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n" "Language-Team: Finnish <vdr@linuxtv.org>\n"
"Language: fi\n" "Language: fi\n"

6
po/fr_FR.po
View File

@ -7,10 +7,10 @@
# #
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n" "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
"Language-Team: French <vdr@linuxtv.org>\n" "Language-Team: French <vdr@linuxtv.org>\n"
"Language: fr\n" "Language: fr\n"

6
po/hu_HU.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Füley István <ifuley at tigercomp dot ro>\n" "Last-Translator: Füley István <ifuley at tigercomp dot ro>\n"
"Language-Team: Hungarian <ifuley at tigercomp dot ro>\n" "Language-Team: Hungarian <ifuley at tigercomp dot ro>\n"
"Language: hu\n" "Language: hu\n"

6
po/it_IT.po
View File

@ -6,10 +6,10 @@
# #
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n" "Language-Team: Italian <vdr@linuxtv.org>\n"
"Language: it\n" "Language: it\n"

6
po/lt_LT.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n" "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
"Language-Team: Lithuanian <vdr@linuxtv.org>\n" "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
"Language: lt\n" "Language: lt\n"

6
po/ru_RU.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Vyacheslav Dikonov\n" "Last-Translator: Vyacheslav Dikonov\n"
"Language-Team: Russian <vdr@linuxtv.org>\n" "Language-Team: Russian <vdr@linuxtv.org>\n"
"Language: ru\n" "Language: ru\n"

6
po/sk_SK.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n" "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: Slovak <vdr@linuxtv.org>\n" "Language-Team: Slovak <vdr@linuxtv.org>\n"
"Language: sk\n" "Language: sk\n"

6
po/uk_UA.po
View File

@ -4,10 +4,10 @@
# Yarema aka Knedlyk <yupadmin@gmail.com>, 2010. # Yarema aka Knedlyk <yupadmin@gmail.com>, 2010.
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n" "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
"Language-Team: Ukrainian <translation@linux.org.ua>\n" "Language-Team: Ukrainian <translation@linux.org.ua>\n"
"Language: uk\n" "Language: uk\n"

6
po/zh_CN.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: NanFeng <nfgx@21cn.com>\n" "Last-Translator: NanFeng <nfgx@21cn.com>\n"
"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n" "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
"Language: zh_CN\n" "Language: zh_CN\n"

6
po/zh_TW.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" 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" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-15 03:15+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-15 03:15+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: NanFeng <nfgx@21cn.com>\n" "Last-Translator: NanFeng <nfgx@21cn.com>\n"
"Language-Team: Chinese (traditional) <vdr@linuxtv.org>\n" "Language-Team: Chinese (traditional) <vdr@linuxtv.org>\n"
"Language: zh_TW\n" "Language: zh_TW\n"