From 225b0cc29714d5532c9f9b0b202664b7b2e94123 Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Mon, 1 Apr 2013 22:36:41 +0300 Subject: [PATCH] Updated for vdr-2.0.0. --- HISTORY | 8 +++++++- device.c | 4 ++-- iptv.c | 6 +++--- po/de_DE.po | 6 +++--- po/fi_FI.po | 6 +++--- po/fr_FR.po | 6 +++--- po/it_IT.po | 6 +++--- po/nl_NL.po | 6 +++--- po/ru_RU.po | 6 +++--- sectionfilter.c | 4 ++-- sidscanner.c | 2 +- 11 files changed, 33 insertions(+), 27 deletions(-) diff --git a/HISTORY b/HISTORY index 12f5d72..d7616c7 100644 --- a/HISTORY +++ b/HISTORY @@ -200,8 +200,14 @@ VDR Plugin 'iptv' Revision History to Jeremy Hall). - Fixed the channel editor. -2013-xx-xx: Version 1.2.2 +================================== +VDR Plugin 'iptv' Revision History +================================== + +2013-04-01: Version 2.0.0 + +- Updated for vdr-2.0.0. - Enabled I/O throttling and tweaked buffer timeouts. - Fixed a nasty network byte order bug. - Fixed and refactored the section filtering code. diff --git a/device.c b/device.c index bbbfbd4..472b70c 100644 --- a/device.c +++ b/device.c @@ -287,7 +287,7 @@ bool cIptvDevice::SetPid(cPidHandle *handleP, int typeP, bool onP) int cIptvDevice::OpenFilter(u_short pidP, u_char tidP, u_char maskP) { - debug("cIptvDevice::%s(%d): pid=%d tid=%d mask=%d", __FUNCTION__, deviceIndexM, pidP, tidP, maskP); + //debug("cIptvDevice::%s(%d): pid=%d tid=%d mask=%d", __FUNCTION__, deviceIndexM, pidP, tidP, maskP); if (pIptvSectionM && IptvConfig.GetSectionFiltering()) return pIptvSectionM->Open(pidP, tidP, maskP); return -1; @@ -295,7 +295,7 @@ int cIptvDevice::OpenFilter(u_short pidP, u_char tidP, u_char maskP) void cIptvDevice::CloseFilter(int handleP) { - debug("cIptvDevice::%s(%d): handle=%d", __FUNCTION__, deviceIndexM, handleP); + //debug("cIptvDevice::%s(%d): handle=%d", __FUNCTION__, deviceIndexM, handleP); if (pIptvSectionM) pIptvSectionM->Close(handleP); } diff --git a/iptv.c b/iptv.c index 6e86c20..8158e67 100644 --- a/iptv.c +++ b/iptv.c @@ -13,15 +13,15 @@ #include "device.h" #include "iptvservice.h" -#if defined(APIVERSNUM) && APIVERSNUM < 10738 -#error "VDR-1.7.38 API version or greater is required!" +#if defined(APIVERSNUM) && APIVERSNUM < 20000 +#error "VDR-2.0.0 API version or greater is required!" #endif #ifndef GITVERSION #define GITVERSION "" #endif - const char VERSION[] = "1.2.2" GITVERSION; + const char VERSION[] = "2.0.0" GITVERSION; static const char DESCRIPTION[] = trNOOP("Experience the IPTV"); class cPluginIptv : public cPlugin { diff --git a/po/de_DE.po b/po/de_DE.po index 3a339a2..5808f61 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 1.2.2\n" +"Project-Id-Version: vdr-iptv 2.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-03 06:03+0300\n" -"PO-Revision-Date: 2012-06-03 06:03+0300\n" +"POT-Creation-Date: 2013-04-01 04:01+0200\n" +"PO-Revision-Date: 2013-04-01 04:01+0200\n" "Last-Translator: Tobias Grimm \n" "Language-Team: German \n" "Language: de\n" diff --git a/po/fi_FI.po b/po/fi_FI.po index bc2a6dc..1bf20e0 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 1.2.2\n" +"Project-Id-Version: vdr-iptv 2.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-03 06:03+0300\n" -"PO-Revision-Date: 2012-06-03 06:03+0300\n" +"POT-Creation-Date: 2013-04-01 04:01+0200\n" +"PO-Revision-Date: 2013-04-01 04:01+0200\n" "Last-Translator: Rolf Ahrenberg\n" "Language-Team: Finnish \n" "Language: fi\n" diff --git a/po/fr_FR.po b/po/fr_FR.po index dc5c5f9..55201f2 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 1.2.2\n" +"Project-Id-Version: vdr-iptv 2.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-03 06:03+0300\n" -"PO-Revision-Date: 2012-06-03 06:03+0300\n" +"POT-Creation-Date: 2013-04-01 04:01+0200\n" +"PO-Revision-Date: 2013-04-01 04:01+0200\n" "Last-Translator: NIVAL Michaël \n" "Language-Team: French \n" "Language: fr\n" diff --git a/po/it_IT.po b/po/it_IT.po index 629d575..302905a 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 1.2.2\n" +"Project-Id-Version: vdr-iptv 2.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-03 06:03+0300\n" -"PO-Revision-Date: 2012-06-03 06:03+0300\n" +"POT-Creation-Date: 2013-04-01 04:01+0200\n" +"PO-Revision-Date: 2013-04-01 04:01+0200\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian \n" "Language: it\n" diff --git a/po/nl_NL.po b/po/nl_NL.po index 4ff8715..5004872 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 1.2.2\n" +"Project-Id-Version: vdr-iptv 2.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-03 06:03+0300\n" -"PO-Revision-Date: 2012-06-03 06:03+0300\n" +"POT-Creation-Date: 2013-04-01 04:01+0200\n" +"PO-Revision-Date: 2013-04-01 04:01+0200\n" "Last-Translator: Carel\n" "Language-Team: Dutch \n" "Language: nl\n" diff --git a/po/ru_RU.po b/po/ru_RU.po index 24698fc..9e6301e 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 1.2.2\n" +"Project-Id-Version: vdr-iptv 2.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-03 06:03+0300\n" -"PO-Revision-Date: 2012-06-03 06:03+0300\n" +"POT-Creation-Date: 2013-04-01 04:01+0200\n" +"PO-Revision-Date: 2013-04-01 04:01+0200\n" "Last-Translator: Alexander Gross \n" "Language-Team: Russian \n" "Language: ru\n" diff --git a/sectionfilter.c b/sectionfilter.c index e6048a0..375b7de 100644 --- a/sectionfilter.c +++ b/sectionfilter.c @@ -348,8 +348,8 @@ int cIptvSectionFilterHandler::Open(u_short pidP, u_char tidP, u_char maskP) // Search the next free filter slot for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) { if (!filtersM[i]) { - //debug("cIptvSectionFilterHandler::%s(%d): pid=%d tid=%02X mask=%02X index=%d", __FUNCTION__, deviceIndexM, pidP, tidP, maskP, i); filtersM[i] = new cIptvSectionFilter(deviceIndexM, pidP, tidP, maskP); + debug("cIptvSectionFilterHandler::%s(%d): pid=%d tid=%02X mask=%02X handle=%d index=%d", __FUNCTION__, deviceIndexM, pidP, tidP, maskP, filtersM[i]->GetFd(), i); return filtersM[i]->GetFd(); } } @@ -364,7 +364,7 @@ void cIptvSectionFilterHandler::Close(int handleP) // Search the filter for deletion for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) { if (filtersM[i] && (handleP == filtersM[i]->GetFd())) { - //debug(""cIptvSectionFilterHandler::%s(%d): handle=%d", __FUNCTION__, deviceIndex, handleP); + debug("cIptvSectionFilterHandler::%s(%d): pid=%d handle=%d index=%d", __FUNCTION__, deviceIndexM, filtersM[i]->GetPid(), filtersM[i]->GetFd(), i); Delete(i); break; } diff --git a/sidscanner.c b/sidscanner.c index 27f3285..c989561 100644 --- a/sidscanner.c +++ b/sidscanner.c @@ -45,7 +45,7 @@ void cSidScanner::Process(u_short pidP, u_char tidP, const u_char *dataP, int le return; if (channelIdM.Valid()) { if ((pidP == 0x00) && (tidP == 0x00)) { - debug("cSidScanner::%s(%d, %02X)", __FUNCTION__, pidP, tidP); + //debug("cSidScanner::%s(%d, %02X)", __FUNCTION__, pidP, tidP); SI::PAT pat(dataP, false); if (!pat.CheckCRCAndParse()) return;