mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
a76a03c0d8
- Fixed a lockup in the EPG scanner when no non-primary device was available (thanks to Martin Holst for reporting this one). - Fixed a compiler warning about virtual cConfig::Load() functions (thanks to Lauri Tischler for reporting this one). - Fixed a warning about character comparison in libsi/si.c (thanks to Lauri Tischler for reporting this one). - The new parameter "Update channels" in the "Setup/DVB" menu can be used to control if and how channels will be automatically updated (see MANUAL). This has already been part of the 'autopid' patch by Andreas Schultz and has now been adopted. - Fixed a crash in case there is no DVB hardware present (thanks to Sascha Volkenandt for reporting this one). - Changed calculation of channel ids to make it work for tv stations that use the undefined NID value 0 (thanks to Teemu Rantanen for reporting this one). - Enhanced the SDT filter to handle multi part sections. - Added support for selecting preferred EPG languages (based upon a patch by Teemu Rantanen). - Fixed a 'const' in libsi/si.h (thanks to Marcel Wiesweg). - Fixed the 'su' call in 'runvdr' to make it work on systems that require the user name to appear before the command option (thanks to Robert Huitl). - Fixed testing for matching section filters in case they are turned off (thanks to Marcel Wiesweg). - In case of incomplete sections an error message is now logged only every 10 seconds. - Fixed a possible NULL pointer access in cEITScanner::Process() (thanks to Andreas Kool). - The actual transponder data is now taken from the NIT and existing channels are adjusted if necessary. If the NIT contains new transponders, they are scanned for channels during the next EPG scan. Note that only the satellite branches are tested, cable and terrestrial need to be tested by somebody who actually has such equipment.
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 1.2 2004/01/11 10:36:57 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;
|
|
}
|
|
|
|
const char *cSource::ToString(int Code)
|
|
{
|
|
static 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;
|
|
}
|