mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
VDR developer version 1.7.33 is now available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.33.tar.bz2 A 'diff' against the previous version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.32-1.7.33.diff MD5 checksums: 7c21451360ac7959d0d95e533d34451c vdr-1.7.33.tar.bz2 c79257198f8569bc02f43dc470ee3076 vdr-1.7.32-1.7.33.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. IMPORTANT: ========== This version of VDR no longer sets LC_NUMERIC to "C" in order to make sure any floating point numbers written to configuration files use a proper decimal point. It rather explicitly converts such numbers using the new functions atod() and dtoa(). IF YOU USE PLUGINS THAT STORE FLOATING POINT NUMBERS IN THEIR OWN CONFIGURATION FILES, YOU SHOULD SET export LC_NUMERIC=C BEFORE RUNNING VDR, UNTIL THESE PLUGINS HAVE BEEN PROPERLY UPDATED. From the HISTORY file: - In order to be able to play TS recordings from other sources, in which there is more than one PMT PID in the PAT, 'int cPatPmtParser::PatPmt(void)' has been changed to 'bool cPatPmtParser::IsPatPmt(int Pid)'. - Fixed learning remote control keys with the LCARS skin. - Updated the Macedonian OSD texts (thanks to Dimitar Petrovski). - Fixed getting only non-video packets in cCuttingThread::GetPendingPackets() (reported by Sören Moch). - Changed all occurrences of MPEG4 to H264 (pointed out by Sören Moch). - Fixed getting the number of editing sequences in case the last sequence has no actual end mark. - The cutter now only increments the TS continuity counter for packets that have a payload (pointed out by Sören Moch). - Fixed adjusting the DTS values in the cutter, to compensate for dropped B-frames (pointed out by Sören Moch). - Fixed a typo in skins.h (thanks to Lars Hanisch). - Simplified calculating the PTS offset in cPtsFixer::Fix() and fixed the overflow handling of PCR values (thanks to Sören Moch). - Fixed calling iconv_close() only with a valid iconv_t value (thanks to Juergen Lock). - Fixed faulty opening of the Recordings menu when pressing the Play key during normal live viewing mode in case there is a "last viewed" recording. - Fixed some #include statements in plugins to use <vdr/...> instead of "vdr/..." (thanks to Lars Hanisch). - Fixed some spellings in osd.h and svdrp.c (thanks to Ville Skyttä). - Fixed handling lowercase polarization characters in channel definitions if no DiSEqC is used (reported by Mike Hay, actual bug pointed out by Stefan Huelswitt). - Synchronizing system time to the transponder time is now done using adjtime() in order to avoid discontinuities (suggested by Manuel Reimer). If the time difference is more than 10 seconds, stime() is still used to do the initial sync. - The '7' and '9' keys now jump to the very beginning or end, respectively, of the recording, even if there is no mark set at that point (following a request from Andre Weidemann). - Now always setting the TDT EIT filter, because otherwise when turning on using the transponder time in the Setup menu, it would only be used after the next restart of VDR (thanks to Sundararaj Reel). - The new functions cDevice::CanScaleVideo() and cDevice::ScaleVideo() can be used by derived output devices to implement scaling the video to a given size and location (based on a suggestion by Lucian Muresan). - The SVDRP command HITK now discards any keys if the remote control is currently turned off (thanks to Alexander Hans). - The new remote control key "Play/Pause" can be used with remote controls that don't have separate keys for "Play" and "Pause", but rather have a single key for both functions (thanks to Stefan Hofmann for suggesting to implement support for such remote controls). - The new option "Setup/Replay/Pause on mark set" can be used to activate automatically going into Pause mode if an editing mark is set during replay (suggested by Andre Weidemann). - When regenerating the index of a recording, the frame rate stored in the info file is now automatically fixed if it differs from the value detected by the frame detector. - Fixed creating the edited version directory if a relative file name is given in the call to 'vdr --edit' (the '/video' part was stripped from the given file name even if it wasn't there). - The new option "Setup/Replay/Progress display time" can be used to activate automatically displaying the progress display whenever replay of a recording is started (suggested by Stefan Blochberger). - Changed reading and writing of floating point numbers into configuration files to make it independent of the decimal point used in the current locale. All calls to atof() have been replaced with the new function atod(), which makes sure the string representation of a floating point number using a '.' as decimal point will be handled correctly, even if the locale in use expects a ',' as the decimal point. Plugins that read floating point numbers from their own configuration files will also need to use atod() for this, or use a method of their own (this is not necessary if values are stored in VDR's setup.conf file, because VDR takes care of this). The reason for these changes is that floating point numbers presented to the user shall be displayed in the way defined by the current locale (suggested by Stefan Blochberger). If you use plugins that store floating point values in configuration files of their own and have not yet been adapted to this change, you should set export LC_NUMERIC=C before running VDR. Otherwise your plugin's configuration data may not be read or written correctly. - The new functions SetItemEvent(), SetItemTimer(), SetItemChannel() and SetItemRecording() of the cSkinDisplayMenu class can be reimplemented by skin plugins to display these items in a more elaborate way than just a simple line of text.
344 lines
9.6 KiB
C++
344 lines
9.6 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 2.57 2012/12/05 11:33:20 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 "1.7.33"
|
|
#define VDRVERSNUM 10733 // Version * 10000 + Major * 100 + Minor
|
|
|
|
// The plugin API's version number:
|
|
|
|
#define APIVERSION "1.7.33"
|
|
#define APIVERSNUM 10733 // 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 MINOSDWIDTH 480
|
|
#define MAXOSDWIDTH 1920
|
|
#define MINOSDHEIGHT 324
|
|
#define MAXOSDHEIGHT 1200
|
|
|
|
#define MaxFileName 256
|
|
#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
|
|
|
|
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(void) { 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)
|
|
{
|
|
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[MaxFileName];
|
|
int InstantRecordTime;
|
|
int LnbSLOF;
|
|
int LnbFrequLo;
|
|
int LnbFrequHi;
|
|
int DiSEqC;
|
|
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 ZapTimeout;
|
|
int ChannelEntryTimeout;
|
|
int DefaultPriority, DefaultLifetime;
|
|
int PausePriority, PauseLifetime;
|
|
int PauseKeyHandling;
|
|
int UseSubtitle;
|
|
int UseVps;
|
|
int VpsMargin;
|
|
int RecordingDirs;
|
|
int FoldersInTimerMenu;
|
|
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 ResumeID;
|
|
int CurrentChannel;
|
|
int CurrentVolume;
|
|
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
|