diff options
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | HISTORY | 6 | ||||
| -rw-r--r-- | config.h | 4 | ||||
| -rw-r--r-- | dvbdevice.c | 4 | ||||
| -rw-r--r-- | libdtv/libvdr/libvdr.c | 4 | ||||
| -rwxr-xr-x | newplugin | 2 |
6 files changed, 14 insertions, 8 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f988ff4..b1dee06 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -643,6 +643,8 @@ Torsten Herz <torsten.herz@web.de> for reporting a wrong EPG bugfix code number for the MAX_USEFUL_SUBTITLE_LENGTH fix for fixing a bug in resetting OSD color palettes for adding missing 'const' to some cChannel member functions + for fixing handling Priority -1 in cDvbDevice::ProvidesChannel() + for fixing processing EPG data in case there is no title Steffen Becker <stbecker@rbg.informatik.tu-darmstadt.de> for reporting a problem with CPU load peaks (in the EPG scanner) @@ -2459,3 +2459,9 @@ Video Disk Recorder Revision History - Added North American satellites to 'sources.conf' (thanks to Luke Jenkins). - Fixed getting the list of recordings in case VDR is started from a directory where it doesn't have access to (thanks to Dirk Mueller). + +2003-11-09: Version 1.2.6pre6 + +- Fixed handling Priority -1 in cDvbDevice::ProvidesChannel() (thanks to + Torsten Herz). +- Fixed processing EPG data in case there is no title (thanks to Torsten Herz). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.176.1.4 2003/11/07 15:12:42 kls Exp $ + * $Id: config.h 1.176.1.5 2003/11/09 11:06:10 kls Exp $ */ #ifndef __CONFIG_H @@ -19,7 +19,7 @@ #include "device.h" #include "tools.h" -#define VDRVERSION "1.2.6pre5" +#define VDRVERSION "1.2.6pre6" #define VDRVERSNUM 10206 // Version * 10000 + Major * 100 + Minor #define MAXPRIORITY 99 diff --git a/dvbdevice.c b/dvbdevice.c index 4e7b50c..5ae8c6f 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 1.67.1.3 2003/11/07 13:24:49 kls Exp $ + * $Id: dvbdevice.c 1.67.1.4 2003/11/09 11:08:22 kls Exp $ */ #include "dvbdevice.h" @@ -654,7 +654,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) { result = hasPriority; - if (Receiving()) { + if (Priority >= 0 && Receiving()) { if (dvbTuner->IsTunedTo(Channel)) { if (!HasPid(Channel->Vpid())) { #ifdef DO_MULTIPLE_RECORDINGS diff --git a/libdtv/libvdr/libvdr.c b/libdtv/libvdr/libvdr.c index e041fd8..5f90125 100644 --- a/libdtv/libvdr/libvdr.c +++ b/libdtv/libvdr/libvdr.c @@ -118,7 +118,6 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer) AddItemToText (Item->Text, VdrProgramInfo->ExtendedText); } - GotVdrProgramInfo = 1; } break; @@ -134,7 +133,6 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer) VdrProgramInfo->ContentNibble2 = GetContentContentNibble2(Descriptor, j); } - GotVdrProgramInfo = 1; } break; @@ -147,12 +145,12 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer) if (!strncmp (VdrProgramInfo->LanguageCode, Rating->LanguageCode, 3)) VdrProgramInfo->Rating = Rating->Rating; - GotVdrProgramInfo = 1; } break; } } if (GotVdrProgramInfo) xAddTail (Result, VdrProgramInfo); + else xMemFree (VdrProgramInfo); } return (Result); @@ -261,7 +261,7 @@ The next steps you should perform now are: sub CreateFile { my ($Name, $Content) = @_; - open(FILE, ">$PLUGINDIR/$Name") || die "$Name: V126pre5 $!\n"; + open(FILE, ">$PLUGINDIR/$Name") || die "$Name: $!\n"; print FILE $Content; close(FILE); } |