diff options
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.c 1.88 2002/03/03 16:04:21 kls Exp $ + * $Id: config.c 1.91 2002/03/17 14:24:09 kls Exp $ */ #include "config.h" @@ -811,7 +811,7 @@ cChannel *cChannels::GetByNumber(int Number) { cChannel *channel = (cChannel *)First(); while (channel) { - if (channel->number == Number) + if (!channel->groupSep && channel->number == Number) return channel; channel = (cChannel *)channel->Next(); } @@ -822,7 +822,7 @@ cChannel *cChannels::GetByServiceID(unsigned short ServiceId) { cChannel *channel = (cChannel *)First(); while (channel) { - if (channel->pnr == ServiceId) + if (!channel->groupSep && channel->pnr == ServiceId) return channel; channel = (cChannel *)channel->Next(); } @@ -931,6 +931,7 @@ cSetup::cSetup(void) LnbFrequHi = 10600; DiSEqC = 0; SetSystemTime = 0; + TimeTransponder = 0; MarginStart = 2; MarginStop = 10; EPGScanTimeout = 5; @@ -962,12 +963,16 @@ cSetup::cSetup(void) void cSetup::PrintCaCaps(FILE *f, const char *Name) { for (int d = 0; d < MAXDVBAPI; d++) { - if (CaCaps[d][0]) { - fprintf(f, "CaCaps = %d", d + 1); - for (int i = 0; i < MAXCACAPS && CaCaps[d][i]; i++) + int written = 0; + for (int i = 0; i < MAXCACAPS; i++) { + if (CaCaps[d][i]) { + if (!written++) + fprintf(f, "CaCaps = %d", d + 1); fprintf(f, " %d", CaCaps[d][i]); + } + } + if (written) fprintf(f, "\n"); - } } } @@ -1013,6 +1018,7 @@ bool cSetup::Parse(char *s) else if (!strcasecmp(Name, "LnbFrequHi")) LnbFrequHi = atoi(Value); else if (!strcasecmp(Name, "DiSEqC")) DiSEqC = atoi(Value); else if (!strcasecmp(Name, "SetSystemTime")) SetSystemTime = atoi(Value); + else if (!strcasecmp(Name, "TimeTransponder")) TimeTransponder = atoi(Value); else if (!strcasecmp(Name, "MarginStart")) MarginStart = atoi(Value); else if (!strcasecmp(Name, "MarginStop")) MarginStop = atoi(Value); else if (!strcasecmp(Name, "EPGScanTimeout")) EPGScanTimeout = atoi(Value); @@ -1094,6 +1100,7 @@ bool cSetup::Save(const char *FileName) fprintf(f, "LnbFrequHi = %d\n", LnbFrequHi); fprintf(f, "DiSEqC = %d\n", DiSEqC); fprintf(f, "SetSystemTime = %d\n", SetSystemTime); + fprintf(f, "TimeTransponder = %d\n", TimeTransponder); fprintf(f, "MarginStart = %d\n", MarginStart); fprintf(f, "MarginStop = %d\n", MarginStop); fprintf(f, "EPGScanTimeout = %d\n", EPGScanTimeout); |