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

Writing and tolerating AUTO (=999) parameters for the moment

Browse Source
This commit is contained in:
Klaus Schmidinger
2002-10-06 11:53:45 +02:00
parent 34af5c0e05
commit 4447023205
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
channels.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: channels.c 1.1 2002/10/05 13:22:28 kls Exp $ * $Id: channels.c 1.2 2002/10/06 11:53:45 kls Exp $
*/ */
#include "channels.h" #include "channels.h"
@@ -200,7 +200,10 @@ cChannel::cChannel(const cChannel *Channel)
static int PrintParameter(char *p, char Name, int Value) static int PrintParameter(char *p, char Name, int Value)
{ {
return Value > 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0; //XXX return Value > 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0;
//XXX let's store 999 for the moment, until we generally switch to the NEWSTRUCT
//XXX driver (where the defaults will all be AUTO)
return Value > 0 && (Value != 999 || (Name != 'I' && Name != 'C')) ? sprintf(p, "%c%d", Name, Value) : 0;
} }
const char *cChannel::ParametersToString(void) const char *cChannel::ParametersToString(void)
@@ -229,8 +232,17 @@ static const char *ParseParameter(const char *s, int &Value, const tChannelParam
errno = 0; errno = 0;
int n = strtol(s, &p, 10); int n = strtol(s, &p, 10);
if (!errno && p != s) { if (!errno && p != s) {
Value = MapToDriver(n, Map); //XXX let's tolerate 999 for the moment, until we generally switch to the NEWSTRUCT
if (Value >= 0) //XXX driver (where the defaults will all be AUTO)
//XXX Value = MapToDriver(n, Map);
//XXX if (Value >= 0)
//XXX return p;
int v = MapToDriver(n, Map);
if (v >= 0) {
Value = v;
return p;
}
else if (v == 999)
return p; return p;
} }
} }