frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Now the EPG scan skips channels that have their 'Ca' parameter explicitly set to an other DVB card

Browse Source
This commit is contained in:
Klaus Schmidinger
2002-04-06 13:21:47 +02:00
parent cb0e6f1b14
commit d00b5d8828
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@@ -199,6 +199,8 @@ Sergei Haller <Sergei.Haller@math.uni-giessen.de>
for fixing the LastActivity timestamp after a shutdown prompt
for fixing the "Low disk space!" message
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>
for his help in keeping 'channels.conf' up to date

2
HISTORY
View File

@@ -1182,3 +1182,5 @@ Video Disk Recorder Revision History
- 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
(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
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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"
@@ -2804,12 +2804,16 @@ void cEITScanner::Process(void)
numTransponders = 0;
}
cChannel *Channel = Channels.GetByNumber(ch);
if (Channel && Channel->pnr && !TransponderScanned(Channel)) {
if (DvbApi == cDvbApi::PrimaryDvbApi && !currentChannel)
currentChannel = DvbApi->Channel();
Channel->Switch(DvbApi, false);
lastChannel = ch;
break;
if (Channel) {
if (Channel->ca <= MAXDVBAPI && !DvbApi->ProvidesCa(Channel->ca))
break; // the channel says it explicitly needs a different card
if (Channel->pnr && !TransponderScanned(Channel)) {
if (DvbApi == cDvbApi::PrimaryDvbApi && !currentChannel)
currentChannel = DvbApi->Channel();
Channel->Switch(DvbApi, false);
lastChannel = ch;
break;
}
}
ch++;
}