diff options
Diffstat (limited to 'config.h')
| -rw-r--r-- | config.h | 27 |
1 files changed, 4 insertions, 23 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.235 2005/11/11 13:22:02 kls Exp $ + * $Id: config.h 1.238 2006/01/07 12:57:42 kls Exp $ */ #ifndef __CONFIG_H @@ -19,8 +19,8 @@ #include "i18n.h" #include "tools.h" -#define VDRVERSION "1.3.37" -#define VDRVERSNUM 10337 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.3.38" +#define VDRVERSNUM 10338 // Version * 10000 + Major * 100 + Minor #define MAXPRIORITY 99 #define MAXLIFETIME 99 @@ -61,20 +61,6 @@ public: bool Accepts(in_addr_t Address); }; -#define CACONFBASE 100 - -class cCaDefinition : public cListObject { -private: - int number; - char *description; -public: - cCaDefinition(void); - ~cCaDefinition(); - bool Parse(const char *s); - int Number(void) const { return number; } - const char *Description(void) const { return description; } - }; - template<class T> class cConfig : public cList<T> { private: char *fileName; @@ -166,15 +152,9 @@ public: bool Acceptable(in_addr_t Address); }; -class cCaDefinitions : public cConfig<cCaDefinition> { -public: - const cCaDefinition *Get(int Number); - }; - extern cCommands Commands; extern cCommands RecordingCommands; extern cSVDRPhosts SVDRPhosts; -extern cCaDefinitions CaDefinitions; class cSetupLine : public cListObject { private: @@ -210,6 +190,7 @@ public: char OSDTheme[MaxThemeName]; int PrimaryDVB; int ShowInfoOnChSwitch; + int TimeoutRequChInfo; int MenuScrollPage; int MenuScrollWrap; int MarkInstantRecord; |