mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
771986b89f
- Re-implemented handling of DVB-S2, which first appeared in version 1.5.14, but was revoked in version 1.5.15 in favor of making a stable version 1.6.0. VDR now requires the "multiproto" DVB driver, e.g. from http://jusst.de/hg/multiproto. Note that the channels.conf file now supports additional parameters, so you may want to make sure you have a backup of this file in case you need to go back to the previous version of VDR! - Fixed displaying transponder data when it is modified (thanks to Reinhard Nissl). - Fixed handling the counter in detection of pre 1.3.19 PS data (thanks to Reinhard Nissl). - Improved logging system time changes to avoid problems on slow systems under heavy load (suggested by Helmut Auer). - Now setting the thread name, so that it can be seen in 'top -H' (thanks to Rolf Ahrenberg). - Fixed initializing the timer's flags in the cTimer copy constructor (thanks to Andreas Mair). - Fixed setting the OSD level in the 'osddemo' example (thanks to Wolfgang Rohdewald). - Increased the time between checking the CAM status to 500ms to avoid problems with some CAMs (reported by Arthur Konovalov).
116 lines
2.9 KiB
C
116 lines
2.9 KiB
C
/*
|
|
* sources.c: Source handling
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: sources.c 2.0 2008/02/10 14:07:26 kls Exp $
|
|
*/
|
|
|
|
#include "sources.h"
|
|
#include <ctype.h>
|
|
|
|
// --- cSource ---------------------------------------------------------------
|
|
|
|
cSource::cSource(void)
|
|
{
|
|
code = stNone;
|
|
description = NULL;
|
|
}
|
|
|
|
cSource::~cSource()
|
|
{
|
|
free(description);
|
|
}
|
|
|
|
bool cSource::Parse(const char *s)
|
|
{
|
|
char *codeBuf = NULL;
|
|
if (2 == sscanf(s, "%a[^ ] %a[^\n]", &codeBuf, &description))
|
|
code = FromString(codeBuf);
|
|
free(codeBuf);
|
|
return code != stNone && description && *description;
|
|
}
|
|
|
|
cString cSource::ToString(int Code)
|
|
{
|
|
char buffer[16];
|
|
char *q = buffer;
|
|
switch (Code & st_Mask) {
|
|
case stCable: *q++ = 'C'; break;
|
|
case stSat: *q++ = 'S';
|
|
{
|
|
int pos = Code & ~st_Mask;
|
|
q += snprintf(q, sizeof(buffer) - 2, "%u.%u", (pos & ~st_Neg) / 10, (pos & ~st_Neg) % 10); // can't simply use "%g" here since the silly 'locale' messes up the decimal point
|
|
*q++ = (Code & st_Neg) ? 'E' : 'W';
|
|
}
|
|
break;
|
|
case stTerr: *q++ = 'T'; break;
|
|
default: *q++ = Code + '0'; // backward compatibility
|
|
}
|
|
*q = 0;
|
|
return buffer;
|
|
}
|
|
|
|
int cSource::FromString(const char *s)
|
|
{
|
|
int type = stNone;
|
|
switch (toupper(*s)) {
|
|
case 'C': type = stCable; break;
|
|
case 'S': type = stSat; break;
|
|
case 'T': type = stTerr; break;
|
|
case '0' ... '9': type = *s - '0'; break; // backward compatibility
|
|
default: esyslog("ERROR: unknown source key '%c'", *s);
|
|
return stNone;
|
|
}
|
|
int code = type;
|
|
if (type == stSat) {
|
|
int pos = 0;
|
|
bool dot = false;
|
|
bool neg = false;
|
|
while (*++s) {
|
|
switch (toupper(*s)) {
|
|
case '0' ... '9': pos *= 10;
|
|
pos += *s - '0';
|
|
break;
|
|
case '.': dot = true;
|
|
break;
|
|
case 'E': neg = true; // fall through to 'W'
|
|
case 'W': if (!dot)
|
|
pos *= 10;
|
|
break;
|
|
default: esyslog("ERROR: unknown source character '%c'", *s);
|
|
return stNone;
|
|
}
|
|
}
|
|
if (neg)
|
|
pos |= st_Neg;
|
|
code |= pos;
|
|
}
|
|
return code;
|
|
}
|
|
|
|
int cSource::FromData(eSourceType SourceType, int Position, bool East)
|
|
{
|
|
int code = SourceType;
|
|
if (SourceType == stSat) {
|
|
if (East)
|
|
code |= st_Neg;
|
|
code |= (Position & st_Pos);;
|
|
}
|
|
return code;
|
|
}
|
|
|
|
// --- cSources --------------------------------------------------------------
|
|
|
|
cSources Sources;
|
|
|
|
cSource *cSources::Get(int Code)
|
|
{
|
|
for (cSource *p = First(); p; p = Next(p)) {
|
|
if (p->Code() == Code)
|
|
return p;
|
|
}
|
|
return NULL;
|
|
}
|