mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed handling Priority -1 in cDvbDevice::ProvidesChannel()
This commit is contained in:
parent
a6809c5c7b
commit
454b63416b
@ -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 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()
|
||||||
|
|
||||||
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)
|
||||||
|
5
HISTORY
5
HISTORY
@ -2459,3 +2459,8 @@ 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).
|
||||||
|
4
config.h
4
config.h
@ -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:31:00 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,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
|
||||||
|
Loading…
Reference in New Issue
Block a user