frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed handling Priority -1 in cDvbDevice::ProvidesChannel()

This commit is contained in:
Klaus Schmidinger 2003-11-09 11:16:21 +01:00
parent a6809c5c7b
commit 454b63416b
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -643,6 +643,7 @@ 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()
Steffen Becker <stbecker@rbg.informatik.tu-darmstadt.de>
for reporting a problem with CPU load peaks (in the EPG scanner)

5
HISTORY
View File

@ -2459,3 +2459,8 @@ 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).

4
config.h
View File

@ -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:31:00 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

4
dvbdevice.c
View File

@ -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