mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
- 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.
185 lines
5.8 KiB
C++
185 lines
5.8 KiB
C++
/*
|
|
* tools.h: Various tools
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: tools.h 1.55 2004/01/11 15:42:15 kls Exp $
|
|
*/
|
|
|
|
#ifndef __TOOLS_H
|
|
#define __TOOLS_H
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <poll.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <syslog.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
|
|
typedef unsigned char uchar;
|
|
typedef unsigned long long int uint64;
|
|
|
|
extern int SysLogLevel;
|
|
|
|
#define esyslog(a...) void( (SysLogLevel > 0) ? syslog(LOG_ERR, a) : void() )
|
|
#define isyslog(a...) void( (SysLogLevel > 1) ? syslog(LOG_INFO, a) : void() )
|
|
#define dsyslog(a...) void( (SysLogLevel > 2) ? syslog(LOG_DEBUG, a) : void() )
|
|
|
|
#define LOG_ERROR esyslog("ERROR (%s,%d): %m", __FILE__, __LINE__)
|
|
#define LOG_ERROR_STR(s) esyslog("ERROR: %s: %m", s)
|
|
|
|
#define SECSINDAY 86400
|
|
|
|
#define KILOBYTE(n) ((n) * 1024)
|
|
#define MEGABYTE(n) ((n) * 1024 * 1024)
|
|
|
|
#define MAXPARSEBUFFER KILOBYTE(10)
|
|
|
|
#define MALLOC(type, size) (type *)malloc(sizeof(type) * (size))
|
|
|
|
#define DELETENULL(p) (delete (p), p = NULL)
|
|
|
|
#define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
|
|
#define FATALERRNO (errno != EAGAIN && errno != EINTR)
|
|
|
|
#ifndef __STL_CONFIG_H // in case some plugin needs to use the STL
|
|
template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
|
|
template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
|
|
template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
|
|
template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
|
|
#endif
|
|
|
|
#define BCDCHARTOINT(x) (10 * ((x & 0xF0) >> 4) + (x & 0xF))
|
|
int BCD2INT(int x);
|
|
|
|
ssize_t safe_read(int filedes, void *buffer, size_t size);
|
|
ssize_t safe_write(int filedes, const void *buffer, size_t size);
|
|
void writechar(int filedes, char c);
|
|
char *readline(FILE *f);
|
|
char *strcpyrealloc(char *dest, const char *src);
|
|
char *strn0cpy(char *dest, const char *src, size_t n);
|
|
char *strreplace(char *s, char c1, char c2);
|
|
char *strreplace(char *s, const char *s1, const char *s2); ///< re-allocates 's' and deletes the original string if necessary!
|
|
char *skipspace(const char *s);
|
|
char *stripspace(char *s);
|
|
char *compactspace(char *s);
|
|
const char *strescape(const char *s, const char *chars); ///< \warning returns a statically allocated string!
|
|
bool startswith(const char *s, const char *p);
|
|
bool endswith(const char *s, const char *p);
|
|
bool isempty(const char *s);
|
|
int numdigits(int n);
|
|
int time_ms(void);
|
|
void delay_ms(int ms);
|
|
bool isnumber(const char *s);
|
|
const char *itoa(int n); ///< \warning returns a statically allocated string!
|
|
const char *AddDirectory(const char *DirName, const char *FileName); ///< \warning returns a statically allocated string!
|
|
int FreeDiskSpaceMB(const char *Directory, int *UsedMB = NULL);
|
|
bool DirectoryOk(const char *DirName, bool LogErrors = false);
|
|
bool MakeDirs(const char *FileName, bool IsDirectory = false);
|
|
bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
|
|
bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
|
|
char *ReadLink(const char *FileName);
|
|
bool SpinUpDisk(const char *FileName);
|
|
const char *WeekDayName(int WeekDay); ///< \warning returns a statically allocated string!
|
|
const char *DayDateTime(time_t t = 0); ///< \warning returns a statically allocated string!
|
|
|
|
class cPoller {
|
|
private:
|
|
enum { MaxPollFiles = 16 };
|
|
pollfd pfd[MaxPollFiles];
|
|
int numFileHandles;
|
|
public:
|
|
cPoller(int FileHandle = -1, bool Out = false);
|
|
bool Add(int FileHandle, bool Out);
|
|
bool Poll(int TimeoutMs = 0);
|
|
};
|
|
|
|
class cFile {
|
|
private:
|
|
static bool files[];
|
|
static int maxFiles;
|
|
int f;
|
|
public:
|
|
cFile(void);
|
|
~cFile();
|
|
operator int () { return f; }
|
|
bool Open(const char *FileName, int Flags, mode_t Mode = S_IRUSR | S_IWUSR | S_IRGRP);
|
|
bool Open(int FileDes);
|
|
void Close(void);
|
|
bool IsOpen(void) { return f >= 0; }
|
|
bool Ready(bool Wait = true);
|
|
static bool AnyFileReady(int FileDes = -1, int TimeoutMs = 1000);
|
|
static bool FileReady(int FileDes, int TimeoutMs = 1000);
|
|
static bool FileReadyForWriting(int FileDes, int TimeoutMs = 1000);
|
|
};
|
|
|
|
class cSafeFile {
|
|
private:
|
|
FILE *f;
|
|
char *fileName;
|
|
char *tempName;
|
|
public:
|
|
cSafeFile(const char *FileName);
|
|
~cSafeFile();
|
|
operator FILE* () { return f; }
|
|
bool Open(void);
|
|
bool Close(void);
|
|
};
|
|
|
|
class cLockFile {
|
|
private:
|
|
char *fileName;
|
|
int f;
|
|
public:
|
|
cLockFile(const char *Directory);
|
|
~cLockFile();
|
|
bool Lock(int WaitSeconds = 0);
|
|
void Unlock(void);
|
|
};
|
|
|
|
class cListObject {
|
|
private:
|
|
cListObject *prev, *next;
|
|
public:
|
|
cListObject(void);
|
|
virtual ~cListObject();
|
|
virtual bool operator< (const cListObject &ListObject) { return false; }
|
|
void Append(cListObject *Object);
|
|
void Insert(cListObject *Object);
|
|
void Unlink(void);
|
|
int Index(void);
|
|
cListObject *Prev(void) const { return prev; }
|
|
cListObject *Next(void) const { return next; }
|
|
};
|
|
|
|
class cListBase {
|
|
protected:
|
|
cListObject *objects, *lastObject;
|
|
cListBase(void);
|
|
public:
|
|
virtual ~cListBase();
|
|
void Add(cListObject *Object, cListObject *After = NULL);
|
|
void Ins(cListObject *Object, cListObject *Before = NULL);
|
|
void Del(cListObject *Object, bool DeleteObject = true);
|
|
virtual void Move(int From, int To);
|
|
void Move(cListObject *From, cListObject *To);
|
|
virtual void Clear(void);
|
|
cListObject *Get(int Index) const;
|
|
int Count(void) const;
|
|
void Sort(void);
|
|
};
|
|
|
|
template<class T> class cList : public cListBase {
|
|
public:
|
|
T *Get(int Index) const { return (T *)cListBase::Get(Index); }
|
|
T *First(void) const { return (T *)objects; }
|
|
T *Last(void) const { return (T *)lastObject; }
|
|
T *Prev(const T *object) const { return (T *)object->cListObject::Prev(); } // need to call cListObject's members to
|
|
T *Next(const T *object) const { return (T *)object->cListObject::Next(); } // avoid ambiguities in case of a "list of lists"
|
|
};
|
|
|
|
#endif //__TOOLS_H
|