diff --git a/HISTORY b/HISTORY index 54f7cd3..5e3a33f 100644 --- a/HISTORY +++ b/HISTORY @@ -452,3 +452,4 @@ VDR Plugin 'femon' Revision History - Added the dynamite compatibility patch (Thanks to Lars Hanisch). - Silenced error log messages when accessing pseudo devices. - Added a new theme: PearlHD (Thanks to Taipan @ VDRPortal). +- Added transponder info window support for IPTV devices. diff --git a/femonosd.c b/femonosd.c index ad12657..3cf021d 100644 --- a/femonosd.c +++ b/femonosd.c @@ -11,6 +11,7 @@ #include #include +#include "iptvservice.h" #include "femoncfg.h" #include "femonreceiver.h" #include "femontools.h" @@ -475,9 +476,21 @@ void cFemonOsd::DrawInfoWindow(void) } break; - case ('I' << 24): { + case stIptv: { OSDDRAWINFOLINE(*cString::sprintf("IPTV #%d - %s", (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), *m_FrontendName)); offset += OSDROWHEIGHT; + if (m_SvdrpFrontend < 0) { + cPlugin *p; + IptvService_v1_0 data; + data.cardIndex = cDevice::ActualDevice()->CardIndex(); + p = cPluginManager::CallFirstService("IptvService-v1.0", &data); + if (p) { + OSDDRAWINFOLEFT(tr("Protocol"), *data.protocol); + offset += OSDROWHEIGHT; + OSDDRAWINFOLEFT(tr("Bitrate"), *data.bitrate); + offset += OSDROWHEIGHT; + } + } } break; diff --git a/iptvservice.h b/iptvservice.h new file mode 100644 index 0000000..1e48665 --- /dev/null +++ b/iptvservice.h @@ -0,0 +1,22 @@ +/* + * iptvservice.h: IPTV plugin for the Video Disk Recorder + * + * See the README file for copyright information and how to reach the author. + * + */ + +#ifndef __IPTVSERVICE_H +#define __IPTVSERVICE_H + +#include + +#define stIptv ('I' << 24) + +struct IptvService_v1_0 { + unsigned int cardIndex; + cString protocol; + cString bitrate; + }; + +#endif //__IPTVSERVICE_H + diff --git a/po/de_DE.po b/po/de_DE.po index b055e29..12d8f8f 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -180,6 +180,12 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" +msgid "Protocol" +msgstr "" + +msgid "Bitrate" +msgstr "Bitrate" + msgid "Stream Information" msgstr "Streaminformation" @@ -189,9 +195,6 @@ msgstr "Video Stream" msgid "Codec" msgstr "" -msgid "Bitrate" -msgstr "Bitrate" - msgid "Aspect Ratio" msgstr "Seitenverhältnis" diff --git a/po/es_ES.po b/po/es_ES.po index 1fb48a0..9b73602 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -178,6 +178,12 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" +msgid "Protocol" +msgstr "" + +msgid "Bitrate" +msgstr "Tasa de bits" + msgid "Stream Information" msgstr "Información del flujo" @@ -187,9 +193,6 @@ msgstr "Flujo de video" msgid "Codec" msgstr "" -msgid "Bitrate" -msgstr "Tasa de bits" - msgid "Aspect Ratio" msgstr "Proporciones de la imagen" diff --git a/po/et_EE.po b/po/et_EE.po index 18fe5e5..a311548 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -178,6 +178,12 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" +msgid "Protocol" +msgstr "" + +msgid "Bitrate" +msgstr "Bitikiirus" + msgid "Stream Information" msgstr "Vooinfo" @@ -187,9 +193,6 @@ msgstr "Videovoog" msgid "Codec" msgstr "Koodek" -msgid "Bitrate" -msgstr "Bitikiirus" - msgid "Aspect Ratio" msgstr "Külgsuhe" diff --git a/po/fi_FI.po b/po/fi_FI.po index 8beb4cc..23d5ee6 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -178,6 +178,12 @@ msgstr "Radio-ID" msgid "Coderate" msgstr "Suojaustaso" +msgid "Protocol" +msgstr "Protokolla" + +msgid "Bitrate" +msgstr "Bittinopeus" + msgid "Stream Information" msgstr "Lähetteen tiedot" @@ -187,9 +193,6 @@ msgstr "Kuvaraita" msgid "Codec" msgstr "Koodekki" -msgid "Bitrate" -msgstr "Bittinopeus" - msgid "Aspect Ratio" msgstr "Kuvasuhde" @@ -384,3 +387,9 @@ msgstr "Mbit/s" msgid "kbit/s" msgstr "kbit/s" + +#~ msgid "Information" +#~ msgstr "Tiedot" + +#~ msgid "Statistics" +#~ msgstr "Tilastot" diff --git a/po/fr_FR.po b/po/fr_FR.po index f4a0f8d..f14ec13 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -178,6 +178,12 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" +msgid "Protocol" +msgstr "" + +msgid "Bitrate" +msgstr "Bitrate" + msgid "Stream Information" msgstr "Information flux" @@ -187,9 +193,6 @@ msgstr "Flux vid msgid "Codec" msgstr "" -msgid "Bitrate" -msgstr "Bitrate" - msgid "Aspect Ratio" msgstr "Proportions d'image" diff --git a/po/hu_HU.po b/po/hu_HU.po index d0a00a9..ebaa3f6 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -181,6 +181,12 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" +msgid "Protocol" +msgstr "" + +msgid "Bitrate" +msgstr "Bitráta" + msgid "Stream Information" msgstr "Adatfolyam infó" @@ -190,9 +196,6 @@ msgstr "Vide msgid "Codec" msgstr "Kodek" -msgid "Bitrate" -msgstr "Bitráta" - msgid "Aspect Ratio" msgstr "Méretarány" diff --git a/po/it_IT.po b/po/it_IT.po index e23ab4c..aece477 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -182,6 +182,12 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" +msgid "Protocol" +msgstr "" + +msgid "Bitrate" +msgstr "Bitrate" + msgid "Stream Information" msgstr "Informazioni flusso" @@ -191,9 +197,6 @@ msgstr "Flusso video" msgid "Codec" msgstr "Codifica" -msgid "Bitrate" -msgstr "Bitrate" - msgid "Aspect Ratio" msgstr "Formato immagine" diff --git a/po/lt_LT.po b/po/lt_LT.po index e2e3ffd..77c035c 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -178,6 +178,12 @@ msgstr "Rid" msgid "Coderate" msgstr "Kodavimo dažnis" +msgid "Protocol" +msgstr "" + +msgid "Bitrate" +msgstr "KokybÄ—" + msgid "Stream Information" msgstr "Srauto informacija" @@ -187,9 +193,6 @@ msgstr "Video srautas" msgid "Codec" msgstr "Kodekas" -msgid "Bitrate" -msgstr "KokybÄ—" - msgid "Aspect Ratio" msgstr "Proporcijos" diff --git a/po/ru_RU.po b/po/ru_RU.po index 6e95f91..71e6823 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -178,6 +178,12 @@ msgstr "Rid" msgid "Coderate" msgstr "Coderate" +msgid "Protocol" +msgstr "" + +msgid "Bitrate" +msgstr "" + msgid "Stream Information" msgstr "" @@ -187,9 +193,6 @@ msgstr "" msgid "Codec" msgstr "" -msgid "Bitrate" -msgstr "" - msgid "Aspect Ratio" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index c015db5..1f79c2e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -178,6 +178,12 @@ msgstr "Rid" msgid "Coderate" msgstr "ç é€ŸçŽ‡" +msgid "Protocol" +msgstr "" + +msgid "Bitrate" +msgstr "比特率" + msgid "Stream Information" msgstr "æµä¿¡æ¯" @@ -187,9 +193,6 @@ msgstr "视频æµ" msgid "Codec" msgstr "解ç æ¨¡å¼" -msgid "Bitrate" -msgstr "比特率" - msgid "Aspect Ratio" msgstr "纵横比" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5eda195..6f40e76 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -178,6 +178,12 @@ msgstr "Rid" msgid "Coderate" msgstr "碼速率" +msgid "Protocol" +msgstr "" + +msgid "Bitrate" +msgstr "比特率" + msgid "Stream Information" msgstr "æµä¿¡æ¯" @@ -187,9 +193,6 @@ msgstr "視頻æµ" msgid "Codec" msgstr "解碼模å¼" -msgid "Bitrate" -msgstr "比特率" - msgid "Aspect Ratio" msgstr "縱橫比"