mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Now the EPG scan skips channels that have their 'Ca' parameter explicitly set to an other DVB card
This commit is contained in:
parent
cb0e6f1b14
commit
d00b5d8828
@ -199,6 +199,8 @@ Sergei Haller <Sergei.Haller@math.uni-giessen.de>
|
|||||||
for fixing the LastActivity timestamp after a shutdown prompt
|
for fixing the LastActivity timestamp after a shutdown prompt
|
||||||
for fixing the "Low disk space!" message
|
for fixing the "Low disk space!" message
|
||||||
for adding the TPID to Hessen-3 in 'channels.conf'
|
for adding the TPID to Hessen-3 in 'channels.conf'
|
||||||
|
for suggesting that the EPG scan should skip channels with their 'Ca' parameter
|
||||||
|
explicitly set to an other DVB card
|
||||||
|
|
||||||
Andreas Gebel <andreas@xcapenet.de>
|
Andreas Gebel <andreas@xcapenet.de>
|
||||||
for his help in keeping 'channels.conf' up to date
|
for his help in keeping 'channels.conf' up to date
|
||||||
|
2
HISTORY
2
HISTORY
@ -1182,3 +1182,5 @@ Video Disk Recorder Revision History
|
|||||||
- Fixed the still picture workaround in case the progress display is active.
|
- Fixed the still picture workaround in case the progress display is active.
|
||||||
- Fixed a problem with accessing the epg.data file before it is fully written
|
- Fixed a problem with accessing the epg.data file before it is fully written
|
||||||
(thanks to Thilo Wunderlich for reporting this one).
|
(thanks to Thilo Wunderlich for reporting this one).
|
||||||
|
- Now the EPG scan skips channels that have their 'Ca' parameter explicitly set
|
||||||
|
to an other DVB card (suggested by Sergei Haller).
|
||||||
|
18
dvbapi.c
18
dvbapi.c
@ -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: dvbapi.c 1.167 2002/04/06 11:08:54 kls Exp $
|
* $Id: dvbapi.c 1.168 2002/04/06 13:14:40 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dvbapi.h"
|
#include "dvbapi.h"
|
||||||
@ -2804,12 +2804,16 @@ void cEITScanner::Process(void)
|
|||||||
numTransponders = 0;
|
numTransponders = 0;
|
||||||
}
|
}
|
||||||
cChannel *Channel = Channels.GetByNumber(ch);
|
cChannel *Channel = Channels.GetByNumber(ch);
|
||||||
if (Channel && Channel->pnr && !TransponderScanned(Channel)) {
|
if (Channel) {
|
||||||
if (DvbApi == cDvbApi::PrimaryDvbApi && !currentChannel)
|
if (Channel->ca <= MAXDVBAPI && !DvbApi->ProvidesCa(Channel->ca))
|
||||||
currentChannel = DvbApi->Channel();
|
break; // the channel says it explicitly needs a different card
|
||||||
Channel->Switch(DvbApi, false);
|
if (Channel->pnr && !TransponderScanned(Channel)) {
|
||||||
lastChannel = ch;
|
if (DvbApi == cDvbApi::PrimaryDvbApi && !currentChannel)
|
||||||
break;
|
currentChannel = DvbApi->Channel();
|
||||||
|
Channel->Switch(DvbApi, false);
|
||||||
|
lastChannel = ch;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
ch++;
|
ch++;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user