mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed EPG scan on systems with only a single DVB device that use software output
This commit is contained in:
parent
4e8dedb7ad
commit
c24a891568
@ -2792,6 +2792,8 @@ Gerald Dachs <vdr@dachsweb.de>
|
|||||||
|
|
||||||
Juergen Lock <vdr-l@jelal.kn-bremen.de>
|
Juergen Lock <vdr-l@jelal.kn-bremen.de>
|
||||||
for fixing cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE
|
for fixing cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE
|
||||||
|
for reporting a problem with EPG scan on systems with only a single DVB device that
|
||||||
|
use software output
|
||||||
|
|
||||||
Sergiu Dotenco <sergiu.dotenco@googlemail.com>
|
Sergiu Dotenco <sergiu.dotenco@googlemail.com>
|
||||||
for reporting a missing initialization in sDvbSpuRect
|
for reporting a missing initialization in sDvbSpuRect
|
||||||
|
4
HISTORY
4
HISTORY
@ -7052,7 +7052,7 @@ Video Disk Recorder Revision History
|
|||||||
- Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
|
- Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
|
||||||
Schmirler).
|
Schmirler).
|
||||||
|
|
||||||
2012-04-06: Version 1.7.28
|
2012-04-07: Version 1.7.28
|
||||||
|
|
||||||
- Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4.
|
- Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4.
|
||||||
- Fixed getting the maximum short channel name length in case there are no short names
|
- Fixed getting the maximum short channel name length in case there are no short names
|
||||||
@ -7062,3 +7062,5 @@ Video Disk Recorder Revision History
|
|||||||
- Now limiting the number of characters of a channel's (short) name to 16 in the
|
- Now limiting the number of characters of a channel's (short) name to 16 in the
|
||||||
schedules menus, to keep that column from getting overly wide in case there is
|
schedules menus, to keep that column from getting overly wide in case there is
|
||||||
a channel with a very long name that has no short name.
|
a channel with a very long name that has no short name.
|
||||||
|
- Fixed EPG scan on systems with only a single DVB device that use software output
|
||||||
|
(reported by Juergen Lock).
|
||||||
|
@ -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 2.6 2012/03/07 14:16:57 kls Exp $
|
* $Id: eitscan.c 2.7 2012/04/07 14:39:28 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "eitscan.h"
|
#include "eitscan.h"
|
||||||
@ -148,7 +148,7 @@ void cEITScanner::Process(void)
|
|||||||
if (Channel) {
|
if (Channel) {
|
||||||
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->Receiving()) {
|
if (Device->Priority() < 0) {
|
||||||
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) {
|
||||||
|
Loading…
Reference in New Issue
Block a user