1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

The EPG scanner no longer moves the dish if there is a positioner

This commit is contained in:
Klaus Schmidinger 2015-09-10 11:08:19 +02:00
parent 18f0ce26fd
commit 9e58503aee
2 changed files with 7 additions and 2 deletions

View File

@ -8596,7 +8596,7 @@ Video Disk Recorder Revision History
- Bumped all version numbers to 2.2.0. - Bumped all version numbers to 2.2.0.
- Official release. - Official release.
2015-09-08: Version 2.3.1 2015-09-10: Version 2.3.1
- The new function cOsd::MaxPixmapSize() can be called to determine the maximum size - The new function cOsd::MaxPixmapSize() can be called to determine the maximum size
a cPixmap may have on the current OSD. The 'osddemo' example has been modified a cPixmap may have on the current OSD. The 'osddemo' example has been modified
@ -8808,3 +8808,4 @@ Video Disk Recorder Revision History
- The SVDRP command DELT no longer checks whether the timer that shall be deleted - The SVDRP command DELT no longer checks whether the timer that shall be deleted
is currently recording. is currently recording.
- The character 0x0D is now stripped from EPG texts (reported by Janne Pänkälä). - The character 0x0D is now stripped from EPG texts (reported by Janne Pänkälä).
- The EPG scanner no longer moves the dish if there is a positioner.

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: eitscan.c 4.1 2015/07/18 10:16:51 kls Exp $ * $Id: eitscan.c 4.2 2015/09/10 11:05:03 kls Exp $
*/ */
#include "eitscan.h" #include "eitscan.h"
@ -151,6 +151,10 @@ void cEITScanner::Process(void)
if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) { if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
if (Device->ProvidesTransponder(Channel)) { if (Device->ProvidesTransponder(Channel)) {
if (Device->Priority() < 0) { if (Device->Priority() < 0) {
if (const cPositioner *Positioner = Device->Positioner()) {
if (Positioner->LastLongitude() != cSource::Position(Channel->Source()))
continue;
}
bool MaySwitchTransponder = Device->MaySwitchTransponder(Channel); bool MaySwitchTransponder = Device->MaySwitchTransponder(Channel);
if (MaySwitchTransponder || Device->ProvidesTransponderExclusively(Channel) && now - lastActivity > Setup.EPGScanTimeout * 3600) { if (MaySwitchTransponder || Device->ProvidesTransponderExclusively(Channel) && now - lastActivity > Setup.EPGScanTimeout * 3600) {
if (!MaySwitchTransponder) { if (!MaySwitchTransponder) {