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.2.6pre6

Browse Source 
- 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).
This commit is contained in:
Klaus Schmidinger 2003-11-09 18:00:00 +01:00
parent 17c5b4169e
commit 0b283547ac
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -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 reporting a wrong EPG bugfix code number for the MAX_USEFUL_SUBTITLE_LENGTH fix
for fixing a bug in resetting OSD color palettes for fixing a bug in resetting OSD color palettes
for adding missing 'const' to some cChannel member functions 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> Steffen Becker <stbecker@rbg.informatik.tu-darmstadt.de>
for reporting a problem with CPU load peaks (in the EPG scanner) for reporting a problem with CPU load peaks (in the EPG scanner)

6
HISTORY
View File

@ -2459,3 +2459,9 @@ Video Disk Recorder Revision History
- Added North American satellites to 'sources.conf' (thanks to Luke Jenkins). - 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 - 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). 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
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.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 #ifndef __CONFIG_H
@ -19,7 +19,7 @@
#include "device.h" #include "device.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.2.6pre5" #define VDRVERSION "1.2.6pre6"
#define VDRVERSNUM 10206 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10206 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99 #define MAXPRIORITY 99

4
dvbdevice.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: 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" #include "dvbdevice.h"
@ -654,7 +654,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) { if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
result = hasPriority; result = hasPriority;
if (Receiving()) { if (Priority >= 0 && Receiving()) {
if (dvbTuner->IsTunedTo(Channel)) { if (dvbTuner->IsTunedTo(Channel)) {
if (!HasPid(Channel->Vpid())) { if (!HasPid(Channel->Vpid())) {
#ifdef DO_MULTIPLE_RECORDINGS #ifdef DO_MULTIPLE_RECORDINGS

4
libdtv/libvdr/libvdr.c
View File

@ -118,7 +118,6 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
AddItemToText (Item->Text, AddItemToText (Item->Text,
VdrProgramInfo->ExtendedText); VdrProgramInfo->ExtendedText);
} }
GotVdrProgramInfo = 1;
} }
break; break;
@ -134,7 +133,6 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
VdrProgramInfo->ContentNibble2 = VdrProgramInfo->ContentNibble2 =
GetContentContentNibble2(Descriptor, j); GetContentContentNibble2(Descriptor, j);
} }
GotVdrProgramInfo = 1;
} }
break; break;
@ -147,12 +145,12 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
if (!strncmp (VdrProgramInfo->LanguageCode, if (!strncmp (VdrProgramInfo->LanguageCode,
Rating->LanguageCode, 3)) Rating->LanguageCode, 3))
VdrProgramInfo->Rating = Rating->Rating; VdrProgramInfo->Rating = Rating->Rating;
GotVdrProgramInfo = 1;
} }
break; break;
} }
} }
if (GotVdrProgramInfo) xAddTail (Result, VdrProgramInfo); if (GotVdrProgramInfo) xAddTail (Result, VdrProgramInfo);
else xMemFree (VdrProgramInfo);
} }
return (Result); return (Result);

2
newplugin
View File

@ -261,7 +261,7 @@ The next steps you should perform now are:
sub CreateFile sub CreateFile
{ {
my ($Name, $Content) = @_; my ($Name, $Content) = @_;
open(FILE, ">$PLUGINDIR/$Name") || die "$Name: V126pre5 $!\n"; open(FILE, ">$PLUGINDIR/$Name") || die "$Name: $!\n";
print FILE $Content; print FILE $Content;
close(FILE); close(FILE);
} }