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

Updated for vdr-1.7.14.

This commit is contained in:
Rolf Ahrenberg 2010-03-14 17:39:52 +02:00
parent 204c6020c4
commit 6eb259e8fb
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -137,3 +137,7 @@ VDR Plugin 'iptv' Revision History
- Fixed channel parameter corruption. - Fixed channel parameter corruption.
- Added Dutch translation (Thanks to Carel). - Added Dutch translation (Thanks to Carel).
2010-xx-xx: Version 0.4.2
- Updated for vdr-1.7.14.

2
device.c
View File

@ -181,7 +181,7 @@ cString cIptvDevice::GetInformation(unsigned int Page)
bool cIptvDevice::ProvidesSource(int Source) const bool cIptvDevice::ProvidesSource(int Source) const
{ {
debug("cIptvDevice::ProvidesSource(%d)\n", deviceIndex); debug("cIptvDevice::ProvidesSource(%d)\n", deviceIndex);
return ((Source & cSource::st_Mask) == (IPTV_SOURCE_CHARACTER << 24)); return (cSource::IsType(Source, IPTV_SOURCE_CHARACTER));
} }
bool cIptvDevice::ProvidesTransponder(const cChannel *Channel) const bool cIptvDevice::ProvidesTransponder(const cChannel *Channel) const

6
iptv.c
View File

@ -12,11 +12,11 @@
#include "setup.h" #include "setup.h"
#include "device.h" #include "device.h"
#if defined(APIVERSNUM) && APIVERSNUM < 10713 #if defined(APIVERSNUM) && APIVERSNUM < 10714
#error "VDR-1.7.13 API version or greater is required!" #error "VDR-1.7.14 API version or greater is required!"
#endif #endif
static const char VERSION[] = "0.4.1"; static const char VERSION[] = "0.4.2";
static const char DESCRIPTION[] = trNOOP("Experience the IPTV"); static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
class cPluginIptv : public cPlugin { class cPluginIptv : public cPlugin {

10
patches/vdr-1.7.13-disable_ca_updates.patch → patches/vdr-1.7.14-disable_ca_updates.patch
View File

@ -1,11 +1,11 @@
diff -Nru vdr-1.7.13-vanilla/pat.c vdr-1.7.13-disable_ca_updates/pat.c diff -Nru vdr-1.7.14-vanilla/pat.c vdr-1.7.14-disable_ca_updates/pat.c
--- vdr-1.7.13-vanilla/pat.c 2010-01-01 17:40:05.000000000 +0200 --- vdr-1.7.14-vanilla/pat.c 2010-03-14 16:57:06.000000000 +0200
+++ vdr-1.7.13-disable_ca_updates/pat.c 2010-03-09 16:33:03.000000000 +0200 +++ vdr-1.7.14-disable_ca_updates/pat.c 2010-03-14 17:35:55.000000000 +0200
@@ -458,6 +458,7 @@ @@ -481,6 +481,7 @@
} }
if (Setup.UpdateChannels >= 2) { if (Setup.UpdateChannels >= 2) {
Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid); Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+ if ((Channel->Source() & cSource::st_Mask) != ('I' << 24)) + if (!cSource::IsType(Channel->Source(), 'I'))
Channel->SetCaIds(CaDescriptors->CaIds()); Channel->SetCaIds(CaDescriptors->CaIds());
Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds); Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
} }

8
patches/vdr-1.7.13-disable_eitscan.patch → patches/vdr-1.7.14-disable_eitscan.patch
View File

@ -1,12 +1,12 @@
diff -Nru vdr-1.7.13-vanilla/eitscan.c vdr-1.7.13-disable_eitscan/eitscan.c diff -Nru vdr-1.7.14-vanilla/eitscan.c vdr-1.7.14-disable_eitscan/eitscan.c
--- vdr-1.7.13-vanilla/eitscan.c 2010-02-07 14:12:05.000000000 +0200 --- vdr-1.7.14-vanilla/eitscan.c 2010-03-14 16:57:06.000000000 +0200
+++ vdr-1.7.13-disable_eitscan/eitscan.c 2010-03-09 16:30:02.000000000 +0200 +++ vdr-1.7.14-disable_eitscan/eitscan.c 2010-03-14 17:34:16.000000000 +0200
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
if (Device) { if (Device) {
for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) { for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) {
const cChannel *Channel = ScanData->GetChannel(); const cChannel *Channel = ScanData->GetChannel();
- if (Channel) { - if (Channel) {
+ if (Channel && ((Channel->Source() & cSource::st_Mask) != ('I' << 24))) { + if (Channel && !cSource::IsType(Channel->Source(), 'I')) {
if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) { if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
if (Device->ProvidesTransponder(Channel)) { if (Device->ProvidesTransponder(Channel)) {
if (!Device->Receiving()) { if (!Device->Receiving()) {