frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed handling CICAM settings if the first one of a DVB card was FTA

Browse Source
This commit is contained in:
Klaus Schmidinger 2002-03-08 15:06:37 +01:00
parent a5c7994c26
commit 59b8e71d67
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -1072,3 +1072,4 @@ Video Disk Recorder Revision History
- Added 'Ca' code 201 for 'Cryptoworks, GOD-DIGITAL' to 'ca.conf' (thanks to - Added 'Ca' code 201 for 'Cryptoworks, GOD-DIGITAL' to 'ca.conf' (thanks to
Bernd Schweikert). Bernd Schweikert).
- Fixed avoiding the primary DVB interface in case Setup.PrimaryLimit is 0. - Fixed avoiding the primary DVB interface in case Setup.PrimaryLimit is 0.
- Fixed handling CICAM settings if the first one of a DVB card was FTA.

14
config.c
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: config.c 1.88 2002/03/03 16:04:21 kls Exp $ * $Id: config.c 1.89 2002/03/08 14:57:08 kls Exp $
*/ */
#include "config.h" #include "config.h"
@ -962,12 +962,16 @@ cSetup::cSetup(void)
void cSetup::PrintCaCaps(FILE *f, const char *Name) void cSetup::PrintCaCaps(FILE *f, const char *Name)
{ {
for (int d = 0; d < MAXDVBAPI; d++) { for (int d = 0; d < MAXDVBAPI; d++) {
if (CaCaps[d][0]) { int written = 0;
fprintf(f, "CaCaps = %d", d + 1); for (int i = 0; i < MAXCACAPS; i++) {
for (int i = 0; i < MAXCACAPS && CaCaps[d][i]; i++) if (CaCaps[d][i]) {
if (!written++)
fprintf(f, "CaCaps = %d", d + 1);
fprintf(f, " %d", CaCaps[d][i]); fprintf(f, " %d", CaCaps[d][i]);
}
}
if (written)
fprintf(f, "\n"); fprintf(f, "\n");
}
} }
} }

4
dvbapi.c
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: dvbapi.c 1.155 2002/03/08 14:23:29 kls Exp $ * $Id: dvbapi.c 1.156 2002/03/08 15:06:37 kls Exp $
*/ */
#include "dvbapi.h" #include "dvbapi.h"
@ -1870,8 +1870,6 @@ int cDvbApi::ProvidesCa(int Ca)
else else
others++; others++;
} }
else
break;
} }
return result ? result + others : 0; return result ? result + others : 0;
} }