From d45b4aba734515e7f6b007eae4360874059a5a2c Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 29 Oct 2006 17:00:00 +0100 Subject: Version 1.4.3-4 - Fixed deleting EPG events that have a running status of "pausing" or higher. - Fixed handling NITs with more than one delivery system descriptor tag for the same transponder. --- HISTORY | 6 ++++++ config.h | 4 ++-- epg.c | 10 ++++++++-- nit.c | 50 ++++++++++++++++++++++++++++---------------------- 4 files changed, 44 insertions(+), 26 deletions(-) diff --git a/HISTORY b/HISTORY index eb3a391..baa951c 100644 --- a/HISTORY +++ b/HISTORY @@ -4974,3 +4974,9 @@ Video Disk Recorder Revision History - Fixed setting audio track descriptions after a replay has been stopped (reported by Ulf Kiener, thanks to Marco Schlüßler for pointing out what caused the problem). + +2006-10-29: Version 1.4.3-4 + +- Fixed deleting EPG events that have a running status of "pausing" or higher. +- Fixed handling NITs with more than one delivery system descriptor tag for the + same transponder. diff --git a/config.h b/config.h index 2a1fee3..bd2becb 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.275 2006/10/20 13:37:37 kls Exp $ + * $Id: config.h 1.276 2006/10/28 09:15:00 kls Exp $ */ #ifndef __CONFIG_H @@ -21,7 +21,7 @@ // VDR's own version number: -#define VDRVERSION "1.4.3-3" +#define VDRVERSION "1.4.3-4" #define VDRVERSNUM 10403 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: diff --git a/epg.c b/epg.c index 960934f..695ca99 100644 --- a/epg.c +++ b/epg.c @@ -7,7 +7,7 @@ * Original version (as used in VDR before 1.3.0) written by * Robert Schneider and Rolf Hakenes . * - * $Id: epg.c 1.80 2006/10/07 13:47:28 kls Exp $ + * $Id: epg.c 1.81 2006/10/28 09:12:42 kls Exp $ */ #include "epg.h" @@ -664,6 +664,8 @@ cEvent *cSchedule::AddEvent(cEvent *Event) void cSchedule::DelEvent(cEvent *Event) { if (Event->schedule == this) { + if (hasRunning && Event->IsRunning()) + ClrRunningStatus(); UnhashEvent(Event); events.Del(Event); } @@ -742,8 +744,10 @@ void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Cha hasRunning = false; for (cEvent *p = events.First(); p; p = events.Next(p)) { if (p == Event) { - if (p->RunningStatus() > SI::RunningStatusNotRunning || RunningStatus > SI::RunningStatusNotRunning) + if (p->RunningStatus() > SI::RunningStatusNotRunning || RunningStatus > SI::RunningStatusNotRunning) { p->SetRunningStatus(RunningStatus, Channel); + break; + } } else if (RunningStatus >= SI::RunningStatusPausing && p->StartTime() < Event->StartTime()) p->SetRunningStatus(SI::RunningStatusNotRunning); @@ -797,6 +801,8 @@ void cSchedule::DropOutdated(time_t SegmentStart, time_t SegmentEnd, uchar Table // We can't delete the event right here because a timer might have // a pointer to it, so let's set its id and start time to 0 to have it // "phased out": + if (hasRunning && p->IsRunning()) + ClrRunningStatus(); UnhashEvent(p); p->eventID = 0; p->startTime = 0; diff --git a/nit.c b/nit.c index 007093d..4f53562 100644 --- a/nit.c +++ b/nit.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: nit.c 1.12 2006/05/27 15:35:16 kls Exp $ + * $Id: nit.c 1.13 2006/10/28 12:31:04 kls Exp $ */ #include "nit.h" @@ -144,15 +144,17 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) { if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) { if (Setup.UpdateChannels >= 5) { - if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) { - for (int n = 0; n < NumFrequencies; n++) { - if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) { - Frequency = Frequencies[n]; - break; + if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) { // only modify channels if we're actually receiving this transponder + if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) { + for (int n = 0; n < NumFrequencies; n++) { + if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) { + Frequency = Frequencies[n]; + break; + } } - } + } + Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate); } - Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate); } found = true; } @@ -193,15 +195,17 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) { if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) { if (Setup.UpdateChannels >= 5) { - if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) { - for (int n = 0; n < NumFrequencies; n++) { - if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) { - Frequency = Frequencies[n]; - break; + if (ISTRANSPONDER(Frequency / 1000, Transponder())) { // only modify channels if we're actually receiving this transponder + if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) { + for (int n = 0; n < NumFrequencies; n++) { + if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) { + Frequency = Frequencies[n]; + break; + } } - } + } + Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate); } - Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate); } found = true; } @@ -249,15 +253,17 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) { if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) { if (Setup.UpdateChannels >= 5) { - if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) { - for (int n = 0; n < NumFrequencies; n++) { - if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) { - Frequency = Frequencies[n]; - break; + if (ISTRANSPONDER(Frequency / 1000000, Transponder())) { // only modify channels if we're actually receiving this transponder + if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) { + for (int n = 0; n < NumFrequencies; n++) { + if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) { + Frequency = Frequencies[n]; + break; + } } - } + } + Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode); } - Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode); } found = true; } -- cgit v1.2.3