frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version 1.4.3-4

Browse Source 
- 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.
This commit is contained in:
Klaus Schmidinger 2006-10-29 17:00:00 +01:00
parent f99e13afb4
commit d45b4aba73
4 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HISTORY
View File

@ -4974,3 +4974,9 @@ Video Disk Recorder Revision History
- Fixed setting audio track descriptions after a replay has been stopped (reported - 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). 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.

4
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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 #ifndef __CONFIG_H
@ -21,7 +21,7 @@
// VDR's own version number: // 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 #define VDRVERSNUM 10403 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:

10
epg.c
View File

@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by * Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* *
* $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" #include "epg.h"
@ -664,6 +664,8 @@ cEvent *cSchedule::AddEvent(cEvent *Event)
void cSchedule::DelEvent(cEvent *Event) void cSchedule::DelEvent(cEvent *Event)
{ {
if (Event->schedule == this) { if (Event->schedule == this) {
if (hasRunning && Event->IsRunning())
ClrRunningStatus();
UnhashEvent(Event); UnhashEvent(Event);
events.Del(Event); events.Del(Event);
} }
@ -742,8 +744,10 @@ void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Cha
hasRunning = false; hasRunning = false;
for (cEvent *p = events.First(); p; p = events.Next(p)) { for (cEvent *p = events.First(); p; p = events.Next(p)) {
if (p == Event) { if (p == Event) {
if (p->RunningStatus() > SI::RunningStatusNotRunning || RunningStatus > SI::RunningStatusNotRunning) if (p->RunningStatus() > SI::RunningStatusNotRunning || RunningStatus > SI::RunningStatusNotRunning) {
p->SetRunningStatus(RunningStatus, Channel); p->SetRunningStatus(RunningStatus, Channel);
break;
}
} }
else if (RunningStatus >= SI::RunningStatusPausing && p->StartTime() < Event->StartTime()) else if (RunningStatus >= SI::RunningStatusPausing && p->StartTime() < Event->StartTime())
p->SetRunningStatus(SI::RunningStatusNotRunning); 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 // 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 // a pointer to it, so let's set its id and start time to 0 to have it
// "phased out": // "phased out":
if (hasRunning && p->IsRunning())
ClrRunningStatus();
UnhashEvent(p); UnhashEvent(p);
p->eventID = 0; p->eventID = 0;
p->startTime = 0; p->startTime = 0;

50
nit.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #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)) { 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 (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
if (Setup.UpdateChannels >= 5) { if (Setup.UpdateChannels >= 5) {
if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) { if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) { // only modify channels if we're actually receiving this transponder
for (int n = 0; n < NumFrequencies; n++) { if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) {
if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) { for (int n = 0; n < NumFrequencies; n++) {
Frequency = Frequencies[n]; if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) {
break; Frequency = Frequencies[n];
break;
}
} }
} }
Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
} }
Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
} }
found = true; 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)) { 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 (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
if (Setup.UpdateChannels >= 5) { if (Setup.UpdateChannels >= 5) {
if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) { if (ISTRANSPONDER(Frequency / 1000, Transponder())) { // only modify channels if we're actually receiving this transponder
for (int n = 0; n < NumFrequencies; n++) { if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) {
if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) { for (int n = 0; n < NumFrequencies; n++) {
Frequency = Frequencies[n]; if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) {
break; Frequency = Frequencies[n];
break;
}
} }
} }
Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
} }
Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
} }
found = true; 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)) { 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 (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
if (Setup.UpdateChannels >= 5) { if (Setup.UpdateChannels >= 5) {
if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) { if (ISTRANSPONDER(Frequency / 1000000, Transponder())) { // only modify channels if we're actually receiving this transponder
for (int n = 0; n < NumFrequencies; n++) { if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) {
if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) { for (int n = 0; n < NumFrequencies; n++) {
Frequency = Frequencies[n]; if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) {
break; 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; found = true;
} }