Hello community, here is the log from the commit of package vdr-plugin-femon for openSUSE:Factory checked in at 2015-02-04 09:31:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vdr-plugin-femon (Old) and /work/SRC/openSUSE:Factory/.vdr-plugin-femon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vdr-plugin-femon" Changes: -------- --- /work/SRC/openSUSE:Factory/vdr-plugin-femon/vdr-plugin-femon.changes 2014-05-02 14:03:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vdr-plugin-femon.new/vdr-plugin-femon.changes 2015-02-04 13:04:23.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 2 18:10:08 UTC 2014 - [email protected] + +- update to 2.0.4 + - Added support for SAT>IP devices + +------------------------------------------------------------------- Old: ---- vdr-femon-2.0.2.tgz New: ---- vdr-femon-2.0.4.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr-plugin-femon.spec ++++++ --- /var/tmp/diff_new_pack.1CF5Xv/_old 2015-02-04 13:04:24.000000000 +0100 +++ /var/tmp/diff_new_pack.1CF5Xv/_new 2015-02-04 13:04:24.000000000 +0100 @@ -16,8 +16,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define pluginname femon -%define pluginversion 2.0.2 +%define pluginversion 2.0.4 Name: vdr-plugin-%{pluginname} Version: %{pluginversion} Release: 0 ++++++ vdr-femon-2.0.2.tgz -> vdr-femon-2.0.4.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/HISTORY new/femon-2.0.4/HISTORY --- old/femon-2.0.2/HISTORY 2014-01-18 03:20:00.000000000 +0100 +++ new/femon-2.0.4/HISTORY 2014-03-15 03:20:00.000000000 +0100 @@ -484,3 +484,11 @@ 2014-01-18: Version 2.0.2 - Added initial support for CAMs. + +2014-03-08: Version 2.0.3 + +- Added support for SAT>IP devices. + +2014-03-15: Version 2.0.4 + +- Refactored the SAT>IP support. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/femon.c new/femon-2.0.4/femon.c --- old/femon-2.0.2/femon.c 2014-01-18 03:20:00.000000000 +0100 +++ new/femon-2.0.4/femon.c 2014-03-15 03:20:00.000000000 +0100 @@ -22,7 +22,7 @@ #define GITVERSION "" #endif -static const char VERSION[] = "2.0.2" GITVERSION; +static const char VERSION[] = "2.0.4" GITVERSION; static const char DESCRIPTION[] = trNOOP("DVB Signal Information Monitor (OSD)"); static const char MAINMENUENTRY[] = trNOOP("Signal Information"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/femonosd.c new/femon-2.0.4/femonosd.c --- old/femon-2.0.2/femonosd.c 2014-01-18 03:20:00.000000000 +0100 +++ new/femon-2.0.4/femonosd.c 2014-03-15 03:20:00.000000000 +0100 @@ -625,6 +625,23 @@ m_BERValid = (ioctl(m_Frontend, FE_READ_BER, &m_BER) >= 0); m_UNCValid = (ioctl(m_Frontend, FE_READ_UNCORRECTED_BLOCKS, &m_UNC) >= 0); } + else if (strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) { + m_Quality = cDevice::ActualDevice()->SignalQuality(); + m_QualityValid = (m_Quality >= 0); + m_Strength = cDevice::ActualDevice()->SignalStrength(); + m_StrengthValid = (m_Strength >= 0); + m_FrontendName = cDevice::ActualDevice()->DeviceName(); + m_FrontendStatus = (fe_status_t)(cDevice::ActualDevice()->HasLock() ? (FE_HAS_LOCK | FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC) : 0); + m_FrontendStatusValid = m_StrengthValid; + m_Signal = uint16_t(m_Strength * 0xFFFF / 100); + m_SignalValid = m_StrengthValid; + m_SNR = uint16_t(m_Quality * 0xFFFF / 100); + m_SNRValid = m_QualityValid; + m_BER = 0; + m_BERValid = false; + m_UNC = 0; + m_UNCValid = false; + } else if (m_SvdrpConnection.handle >= 0) { cmd.handle = m_SvdrpConnection.handle; m_SvdrpPlugin->Service("SvdrpCommand-v1.0", &cmd); @@ -715,6 +732,9 @@ return; } } + else if (strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) { + // nop + } else if (femonConfig.usesvdrp) { if (!SvdrpConnect() || !SvdrpTune()) return; @@ -789,6 +809,9 @@ return; } } + else if (strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) { + // nop + } else if (femonConfig.usesvdrp) { if (!SvdrpConnect() || !SvdrpTune()) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/femontools.c new/femon-2.0.4/femontools.c --- old/femon-2.0.2/femontools.c 2014-01-18 03:20:00.000000000 +0100 +++ new/femon-2.0.4/femontools.c 2014-03-15 03:20:00.000000000 +0100 @@ -9,6 +9,7 @@ #define __STDC_FORMAT_MACROS #endif +#include <ctype.h> #include <stdint.h> #include <stdlib.h> #include <unistd.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/femontools.h new/femon-2.0.4/femontools.h --- old/femon-2.0.2/femontools.h 2014-01-18 03:20:00.000000000 +0100 +++ new/femon-2.0.4/femontools.h 2014-03-15 03:20:00.000000000 +0100 @@ -26,6 +26,8 @@ #define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d" +#define SATIP_DEVICE "SAT>IP" + cDvbDevice *getDvbDevice(cDevice* device); cString getFrontendInfo(cDvbDevice *device); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/de_DE.po new/femon-2.0.4/po/de_DE.po --- old/femon-2.0.2/po/de_DE.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/de_DE.po 2014-03-15 11:38:03.000000000 +0100 @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2014-01-08 01:18+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Christian Wieninger\n" "Language-Team: German <[email protected]>\n" "Language: de\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/es_ES.po new/femon-2.0.4/po/es_ES.po --- old/femon-2.0.2/po/es_ES.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/es_ES.po 2014-03-15 11:38:03.000000000 +0100 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2014-01-08 01:18+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Luis Palacios\n" "Language-Team: Spanish <[email protected]>\n" "Language: es\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/et_EE.po new/femon-2.0.4/po/et_EE.po --- old/femon-2.0.2/po/et_EE.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/et_EE.po 2014-03-15 11:38:03.000000000 +0100 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2014-01-08 01:18+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Arthur Konovalov\n" "Language-Team: Estonian <[email protected]>\n" "Language: et\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/fi_FI.po new/femon-2.0.4/po/fi_FI.po --- old/femon-2.0.2/po/fi_FI.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/fi_FI.po 2014-03-15 11:38:03.000000000 +0100 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2014-01-08 01:18+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Rolf Ahrenberg\n" "Language-Team: Finnish <[email protected]>\n" "Language: fi\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/fr_FR.po new/femon-2.0.4/po/fr_FR.po --- old/femon-2.0.2/po/fr_FR.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/fr_FR.po 2014-03-15 11:38:03.000000000 +0100 @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2014-01-08 01:18+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Bernard Jaulin <[email protected]>\n" "Language-Team: French <[email protected]>\n" "Language: fr\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/hu_HU.po new/femon-2.0.4/po/hu_HU.po --- old/femon-2.0.2/po/hu_HU.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/hu_HU.po 2014-03-15 11:38:03.000000000 +0100 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2010-10-10 10:10+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/it_IT.po new/femon-2.0.4/po/it_IT.po --- old/femon-2.0.2/po/it_IT.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/it_IT.po 2014-03-15 11:38:03.000000000 +0100 @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2014-01-08 01:18+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Diego Pierotto <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" "Language: it\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/lt_LT.po new/femon-2.0.4/po/lt_LT.po --- old/femon-2.0.2/po/lt_LT.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/lt_LT.po 2014-03-15 11:38:03.000000000 +0100 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2014-01-08 01:18+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Valdemaras Pipiras <[email protected]>\n" "Language-Team: Lithuanian <[email protected]>\n" "Language: lt\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/ru_RU.po new/femon-2.0.4/po/ru_RU.po --- old/femon-2.0.2/po/ru_RU.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/ru_RU.po 2014-03-15 11:38:03.000000000 +0100 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2014-01-08 01:18+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Vyacheslav Dikonov\n" "Language-Team: Russian <[email protected]>\n" "Language: ru\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/sk_SK.po new/femon-2.0.4/po/sk_SK.po --- old/femon-2.0.2/po/sk_SK.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/sk_SK.po 2014-03-15 11:38:03.000000000 +0100 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2014-01-08 01:18+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Milan Hrala <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" "Language: sk\n" @@ -387,4 +387,3 @@ msgid "kbit/s" msgstr "kbit/s" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/uk_UA.po new/femon-2.0.4/po/uk_UA.po --- old/femon-2.0.2/po/uk_UA.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/uk_UA.po 2014-03-15 11:38:03.000000000 +0100 @@ -4,18 +4,17 @@ # Yarema aka Knedlyk <[email protected]>, 2010. msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2014-01-08 01:18+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: Yarema aka Knedlyk <[email protected]>\n" "Language-Team: Ukrainian <[email protected]>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\\n\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\\n\n" msgid "DVB Signal Information Monitor (OSD)" msgstr "Монітор інформації про DVB сигнал" @@ -113,12 +112,8 @@ msgid "OSD update interval [0.1s]" msgstr "Інтервал оновлення повідомлень [0.1с]" -msgid "" -"Define an interval for OSD updates. The smaller interval generates higher " -"CPU load." -msgstr "" -"Визначення інтервалу оновлення повідомлень. Малий інтервал спричинює більше " -"завантаження процесора." +msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load." +msgstr "Визначення інтервалу оновлення повідомлень. Малий інтервал спричинює більше завантаження процесора." msgid "Analyze stream" msgstr "Аналіз потоку" @@ -129,19 +124,14 @@ msgid "Calculation interval [0.1s]" msgstr "Інтервал обчислення [0.1с]" -msgid "" -"Define an interval for calculation. The bigger interval generates more " -"stable values." -msgstr "" -"Визначення інтервалу обчислення. Більший інтервал дає стабільніші значення." +msgid "Define an interval for calculation. The bigger interval generates more stable values." +msgstr "Визначення інтервалу обчислення. Більший інтервал дає стабільніші значення." msgid "Use SVDRP service" msgstr "Використати SVDRP сервіс" msgid "Define whether the SVDRP service is used in client/server setups." -msgstr "" -"Визначення чи буде використовуватися SVDRP сервіс в налаштуваннях клієнта/" -"сервера" +msgstr "Визначення чи буде використовуватися SVDRP сервіс в налаштуваннях клієнта/сервера" msgid "SVDRP service port" msgstr "Порт SVDRP сервісу" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/zh_CN.po new/femon-2.0.4/po/zh_CN.po --- old/femon-2.0.2/po/zh_CN.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/zh_CN.po 2014-03-15 11:38:03.000000000 +0100 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2014-01-08 01:18+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: NanFeng <[email protected]>\n" "Language-Team: Chinese (simplified) <[email protected]>\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/femon-2.0.2/po/zh_TW.po new/femon-2.0.4/po/zh_TW.po --- old/femon-2.0.2/po/zh_TW.po 2014-01-18 23:19:10.000000000 +0100 +++ new/femon-2.0.4/po/zh_TW.po 2014-03-15 11:38:03.000000000 +0100 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-femon 2.0.2\n" +"Project-Id-Version: vdr-femon 2.0.4\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-01-08 01:18+0200\n" -"PO-Revision-Date: 2014-01-08 01:18+0200\n" +"POT-Creation-Date: 2014-03-15 03:15+0200\n" +"PO-Revision-Date: 2014-03-15 03:15+0200\n" "Last-Translator: NanFeng <[email protected]>\n" "Language-Team: Chinese (traditional) <[email protected]>\n" "Language: zh_TW\n" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
