mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
Merry Christmas to all VDR users! It's been a very busy year for me, in which I was unable to spend as much time on VDR as I would have liked to. But now things are settled again and I managed to prepare a new developer version with the most important fixes and improvements. Please feel free to tell me if I missed something important - some things may well have slipped under my radar ;-). So here's my Christmas gift for you! VDR developer version 2.3.2 is now available at ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.2.tar.bz2 A 'diff' against the previous version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.1-2.3.2.diff MD5 checksums: 6dbb208ea3d59658a18912b49af175b3 vdr-2.3.2.tar.bz2 68a0ed9f01048026333939d30e0a6474 vdr-2.3.1-2.3.2.diff WARNING: ======== This is a *developer* version. Even though *I* use it in my productive environment, I strongly recommend that you only use it under controlled conditions and for testing and debugging. From the HISTORY file: - Fixed a crash when deleting a recording (reported by Oliver Endriss). - Fixed an overflow of PIDs in a receiver (thanks to Robert Hannebauer). - Updated the Italian OSD texts (thanks to Diego Pierotto). - Fixed initializing device specific parameters in cDvbTransponderParameters. - The function SetCurrentChannel(const cChannel *Channel) is now deprecated and may be removed in a future version. Use SetCurrentChannel(int ChannelNumber) instead. - The SVDRP command DELC now refuses to delete the very last channel in the list, to avoid ending up with an empty channel list. - The cRwLock class now allows nested read locks within a write lock from the same thread. This fixes possible crashes when moving or deleting channels in the menu or through SVDRP (as well as other operations that try to acquire a read lock within a write lock). - Fixed a crash when trying to delete a channel that is being used by a timer. - Fixed setting the current item and counter values in the Recordings menu after deleting the last recording in a subfolder. - Fixed a crash when deleting a recording that is currently being replayed. - Fixed a crash when moving a recording to a folder on a different volume. The cRecordingsHandler now performs its actual operations in a separate thread, thus avoiding locking problems and reducing the time between subsequent operations. - Added a note to the description of cFont::Size(), regarding possible differences between it and cFont::Height() (suggested to Thomas Reufer). - Made the cPlayer member functions FramesPerSecond, GetIndex and GetReplayMode 'const' (thanks to Thomas Reufer). - Fixed resuming replay at a given position, which was off by one frame (thanks to Thomas Reufer). - Improved handling frame numbers to have a smoother progress display during replay of recordings with B-frames (thanks to Thomas Reufer). - Fixed replaying recordings to their very end, if they don't end with an I-frame (thanks to Thomas Reufer). - Implemented a frame parser for H.265 (HEVC) recordings (thanks to Thomas Reufer). - Added cFont::Width(void) to get the default character width and allow stretched font drawing in high level OSDs (thanks to Thomas Reufer). - Fixed regenerating the index of audio recordings (thanks to Thomas Reufer). - Fixed building VDR with systemd >= 230 (thanks to Ville Skyttä). - Sorted sources.conf by continous azimuth (thanks to Lucian Muresan). - Added 'S58.5E Kazsat 3' to sources.conf (thanks to Aitugan Sarbassov). - Fixed truncated date/time strings in the skins on multi-byte UTF-8 systems (reported by Sergey Chernyavskiy). - Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Added a 'const' version of cTimers::GetTimer() (thanks to Lars Hanisch). - Fixed a typo in the description of cTimers::GetTimersRead() (thanks to Lars Hanisch). - Fixed a possible buffer overflow in handling CA descriptors (suggested by Lars Hanisch). - Avoiding some duplicate code and unnecessary work in nit.c (thanks to Ville Skyttä). - Added support for the systemd watchdog (thanks to Marc Perrudin), - Added a short sleep to cTSBuffer::Action() to avoid high CPU usage (thanks to Sergey Chernyavskiy).
373 lines
10 KiB
C++
373 lines
10 KiB
C++
/*
|
|
* config.h: Configuration file handling
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: config.h 4.6 2015/09/16 11:11:42 kls Exp $
|
|
*/
|
|
|
|
#ifndef __CONFIG_H
|
|
#define __CONFIG_H
|
|
|
|
#include <arpa/inet.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
#include "i18n.h"
|
|
#include "font.h"
|
|
#include "tools.h"
|
|
|
|
// VDR's own version number:
|
|
|
|
#define VDRVERSION "2.3.2"
|
|
#define VDRVERSNUM 20302 // Version * 10000 + Major * 100 + Minor
|
|
|
|
// The plugin API's version number:
|
|
|
|
#define APIVERSION "2.3.2"
|
|
#define APIVERSNUM 20302 // Version * 10000 + Major * 100 + Minor
|
|
|
|
// When loading plugins, VDR searches them by their APIVERSION, which
|
|
// may be smaller than VDRVERSION in case there have been no changes to
|
|
// VDR header files since the last APIVERSION. This allows compiled
|
|
// plugins to work with newer versions of the core VDR as long as no
|
|
// VDR header files have changed.
|
|
|
|
#define MAXPRIORITY 99
|
|
#define MINPRIORITY (-MAXPRIORITY)
|
|
#define LIVEPRIORITY 0 // priority used when selecting a device for live viewing
|
|
#define TRANSFERPRIORITY (LIVEPRIORITY - 1) // priority used for actual local Transfer Mode
|
|
#define IDLEPRIORITY (MINPRIORITY - 1) // priority of an idle device
|
|
#define MAXLIFETIME 99
|
|
#define DEFINSTRECTIME 180 // default instant recording time (minutes)
|
|
|
|
#define TIMERMACRO_TITLE "TITLE"
|
|
#define TIMERMACRO_EPISODE "EPISODE"
|
|
|
|
#define MINOSDWIDTH 480
|
|
#define MAXOSDWIDTH 1920
|
|
#define MINOSDHEIGHT 324
|
|
#define MAXOSDHEIGHT 1200
|
|
|
|
#define MaxFileName NAME_MAX // obsolete - use NAME_MAX directly instead!
|
|
#define MaxSkinName 16
|
|
#define MaxThemeName 16
|
|
|
|
// Basically VDR works according to the DVB standard, but there are countries/providers
|
|
// that use other standards, which in some details deviate from the DVB standard.
|
|
// This makes it necessary to handle things differently in some areas, depending on
|
|
// which standard is actually used. The following macros are used to distinguish
|
|
// these cases (make sure to adjust cMenuSetupDVB::standardComplianceTexts accordingly
|
|
// when adding a new standard):
|
|
|
|
#define STANDARD_DVB 0
|
|
#define STANDARD_ANSISCTE 1
|
|
#define STANDARD_NORDIG 2
|
|
|
|
typedef uint32_t in_addr_t; //XXX from /usr/include/netinet/in.h (apparently this is not defined on systems with glibc < 2.2)
|
|
|
|
class cSVDRPhost : public cListObject {
|
|
private:
|
|
struct in_addr addr;
|
|
in_addr_t mask;
|
|
public:
|
|
cSVDRPhost(void);
|
|
bool Parse(const char *s);
|
|
bool IsLocalhost(void);
|
|
bool Accepts(in_addr_t Address);
|
|
};
|
|
|
|
class cSatCableNumbers {
|
|
private:
|
|
int size;
|
|
int *array;
|
|
public:
|
|
cSatCableNumbers(int Size, const char *s = NULL);
|
|
~cSatCableNumbers();
|
|
int Size(void) const { return size; }
|
|
int *Array(void) { return array; }
|
|
bool FromString(const char *s);
|
|
cString ToString(void);
|
|
int FirstDeviceIndex(int DeviceIndex) const;
|
|
///< Returns the first device index (starting at 0) that uses the same
|
|
///< sat cable number as the device with the given DeviceIndex.
|
|
///< If the given device does not use the same sat cable as any other device,
|
|
///< or if the resulting value would be the same as DeviceIndex,
|
|
///< or if DeviceIndex is out of range, -1 is returned.
|
|
};
|
|
|
|
template<class T> class cConfig : public cList<T> {
|
|
private:
|
|
char *fileName;
|
|
bool allowComments;
|
|
void Clear(void)
|
|
{
|
|
free(fileName);
|
|
fileName = NULL;
|
|
cList<T>::Clear();
|
|
}
|
|
public:
|
|
cConfig(const char *NeedsLocking = NULL): cList<T>(NeedsLocking) { fileName = NULL; }
|
|
virtual ~cConfig() { free(fileName); }
|
|
const char *FileName(void) { return fileName; }
|
|
bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
|
|
{
|
|
cConfig<T>::Clear();
|
|
if (FileName) {
|
|
free(fileName);
|
|
fileName = strdup(FileName);
|
|
allowComments = AllowComments;
|
|
}
|
|
bool result = !MustExist;
|
|
if (fileName && access(fileName, F_OK) == 0) {
|
|
isyslog("loading %s", fileName);
|
|
FILE *f = fopen(fileName, "r");
|
|
if (f) {
|
|
char *s;
|
|
int line = 0;
|
|
cReadLine ReadLine;
|
|
result = true;
|
|
while ((s = ReadLine.Read(f)) != NULL) {
|
|
line++;
|
|
if (allowComments) {
|
|
char *p = strchr(s, '#');
|
|
if (p)
|
|
*p = 0;
|
|
}
|
|
stripspace(s);
|
|
if (!isempty(s)) {
|
|
T *l = new T;
|
|
if (l->Parse(s))
|
|
this->Add(l);
|
|
else {
|
|
esyslog("ERROR: error in %s, line %d", fileName, line);
|
|
delete l;
|
|
result = false;
|
|
}
|
|
}
|
|
}
|
|
fclose(f);
|
|
}
|
|
else {
|
|
LOG_ERROR_STR(fileName);
|
|
result = false;
|
|
}
|
|
}
|
|
if (!result)
|
|
fprintf(stderr, "vdr: error while reading '%s'\n", fileName);
|
|
return result;
|
|
}
|
|
bool Save(void) const
|
|
{
|
|
bool result = true;
|
|
T *l = (T *)this->First();
|
|
cSafeFile f(fileName);
|
|
if (f.Open()) {
|
|
while (l) {
|
|
if (!l->Save(f)) {
|
|
result = false;
|
|
break;
|
|
}
|
|
l = (T *)l->Next();
|
|
}
|
|
if (!f.Close())
|
|
result = false;
|
|
}
|
|
else
|
|
result = false;
|
|
return result;
|
|
}
|
|
};
|
|
|
|
class cNestedItem : public cListObject {
|
|
private:
|
|
char *text;
|
|
cList<cNestedItem> *subItems;
|
|
public:
|
|
cNestedItem(const char *Text, bool WithSubItems = false);
|
|
virtual ~cNestedItem();
|
|
virtual int Compare(const cListObject &ListObject) const;
|
|
const char *Text(void) const { return text; }
|
|
cList<cNestedItem> *SubItems(void) { return subItems; }
|
|
void AddSubItem(cNestedItem *Item);
|
|
void SetText(const char *Text);
|
|
void SetSubItems(bool On);
|
|
};
|
|
|
|
class cNestedItemList : public cList<cNestedItem> {
|
|
private:
|
|
char *fileName;
|
|
bool Parse(FILE *f, cList<cNestedItem> *List, int &Line);
|
|
bool Write(FILE *f, cList<cNestedItem> *List, int Indent = 0);
|
|
public:
|
|
cNestedItemList(void);
|
|
virtual ~cNestedItemList();
|
|
void Clear(void);
|
|
bool Load(const char *FileName);
|
|
bool Save(void);
|
|
};
|
|
|
|
class cSVDRPhosts : public cConfig<cSVDRPhost> {
|
|
public:
|
|
bool LocalhostOnly(void);
|
|
bool Acceptable(in_addr_t Address);
|
|
};
|
|
|
|
extern cNestedItemList Folders;
|
|
extern cNestedItemList Commands;
|
|
extern cNestedItemList RecordingCommands;
|
|
extern cSVDRPhosts SVDRPhosts;
|
|
|
|
class cSetupLine : public cListObject {
|
|
private:
|
|
char *plugin;
|
|
char *name;
|
|
char *value;
|
|
public:
|
|
cSetupLine(void);
|
|
cSetupLine(const char *Name, const char *Value, const char *Plugin = NULL);
|
|
virtual ~cSetupLine();
|
|
virtual int Compare(const cListObject &ListObject) const;
|
|
const char *Plugin(void) { return plugin; }
|
|
const char *Name(void) { return name; }
|
|
const char *Value(void) { return value; }
|
|
bool Parse(char *s);
|
|
bool Save(FILE *f);
|
|
};
|
|
|
|
class cSetup : public cConfig<cSetupLine> {
|
|
friend class cPlugin; // needs to be able to call Store()
|
|
private:
|
|
void StoreLanguages(const char *Name, int *Values);
|
|
bool ParseLanguages(const char *Value, int *Values);
|
|
bool Parse(const char *Name, const char *Value);
|
|
cSetupLine *Get(const char *Name, const char *Plugin = NULL);
|
|
void Store(const char *Name, const char *Value, const char *Plugin = NULL, bool AllowMultiple = false);
|
|
void Store(const char *Name, int Value, const char *Plugin = NULL);
|
|
void Store(const char *Name, double &Value, const char *Plugin = NULL);
|
|
public:
|
|
// Also adjust cMenuSetup (menu.c) when adding parameters here!
|
|
int __BeginData__;
|
|
char OSDLanguage[I18N_MAX_LOCALE_LEN];
|
|
char OSDSkin[MaxSkinName];
|
|
char OSDTheme[MaxThemeName];
|
|
int PrimaryDVB;
|
|
int ShowInfoOnChSwitch;
|
|
int TimeoutRequChInfo;
|
|
int MenuScrollPage;
|
|
int MenuScrollWrap;
|
|
int MenuKeyCloses;
|
|
int MarkInstantRecord;
|
|
char NameInstantRecord[NAME_MAX + 1];
|
|
int InstantRecordTime;
|
|
int LnbSLOF;
|
|
int LnbFrequLo;
|
|
int LnbFrequHi;
|
|
int DiSEqC;
|
|
int UsePositioner;
|
|
int SiteLat;
|
|
int SiteLon;
|
|
int PositionerSpeed;
|
|
int PositionerSwing;
|
|
int PositionerLastLon;
|
|
int SetSystemTime;
|
|
int TimeSource;
|
|
int TimeTransponder;
|
|
int StandardCompliance;
|
|
int MarginStart, MarginStop;
|
|
int AudioLanguages[I18N_MAX_LANGUAGES + 1];
|
|
int DisplaySubtitles;
|
|
int SubtitleLanguages[I18N_MAX_LANGUAGES + 1];
|
|
int SubtitleOffset;
|
|
int SubtitleFgTransparency, SubtitleBgTransparency;
|
|
int EPGLanguages[I18N_MAX_LANGUAGES + 1];
|
|
int EPGScanTimeout;
|
|
int EPGBugfixLevel;
|
|
int EPGLinger;
|
|
int SVDRPTimeout;
|
|
int SVDRPPeering;
|
|
char SVDRPHostName[HOST_NAME_MAX];
|
|
char SVDRPDefaultHost[HOST_NAME_MAX];
|
|
int ZapTimeout;
|
|
int ChannelEntryTimeout;
|
|
int RcRepeatDelay;
|
|
int RcRepeatDelta;
|
|
int DefaultPriority, DefaultLifetime;
|
|
int RecordKeyHandling;
|
|
int PauseKeyHandling;
|
|
int PausePriority, PauseLifetime;
|
|
int UseSubtitle;
|
|
int UseVps;
|
|
int VpsMargin;
|
|
int RecordingDirs;
|
|
int FoldersInTimerMenu;
|
|
int AlwaysSortFoldersFirst;
|
|
int DefaultSortModeRec;
|
|
int NumberKeysForChars;
|
|
int ColorKey0, ColorKey1, ColorKey2, ColorKey3;
|
|
int VideoDisplayFormat;
|
|
int VideoFormat;
|
|
int UpdateChannels;
|
|
int UseDolbyDigital;
|
|
int ChannelInfoPos;
|
|
int ChannelInfoTime;
|
|
double OSDLeftP, OSDTopP, OSDWidthP, OSDHeightP;
|
|
int OSDLeft, OSDTop, OSDWidth, OSDHeight;
|
|
double OSDAspect;
|
|
int OSDMessageTime;
|
|
int UseSmallFont;
|
|
int AntiAlias;
|
|
char FontOsd[MAXFONTNAME];
|
|
char FontSml[MAXFONTNAME];
|
|
char FontFix[MAXFONTNAME];
|
|
double FontOsdSizeP;
|
|
double FontSmlSizeP;
|
|
double FontFixSizeP;
|
|
int FontOsdSize;
|
|
int FontSmlSize;
|
|
int FontFixSize;
|
|
int MaxVideoFileSize;
|
|
int SplitEditedFiles;
|
|
int DelTimeshiftRec;
|
|
int MinEventTimeout, MinUserInactivity;
|
|
time_t NextWakeupTime;
|
|
int MultiSpeedMode;
|
|
int ShowReplayMode;
|
|
int ShowRemainingTime;
|
|
int ProgressDisplayTime;
|
|
int PauseOnMarkSet;
|
|
int PauseOnMarkJump;
|
|
int SkipEdited;
|
|
int PauseAtLastMark;
|
|
int AdaptiveSkipInitial;
|
|
int AdaptiveSkipTimeout;
|
|
int AdaptiveSkipAlternate;
|
|
int AdaptiveSkipPrevNext;
|
|
int SkipSeconds;
|
|
int SkipSecondsRepeat;
|
|
int ResumeID;
|
|
int CurrentChannel;
|
|
int CurrentVolume;
|
|
int VolumeSteps;
|
|
int VolumeLinearize;
|
|
int CurrentDolby;
|
|
int InitialVolume;
|
|
int ChannelsWrap;
|
|
int ShowChannelNamesWithSource;
|
|
int EmergencyExit;
|
|
int __EndData__;
|
|
cString InitialChannel;
|
|
cString DeviceBondings;
|
|
cSetup(void);
|
|
cSetup& operator= (const cSetup &s);
|
|
bool Load(const char *FileName);
|
|
bool Save(void);
|
|
};
|
|
|
|
extern cSetup Setup;
|
|
|
|
#endif //__CONFIG_H
|