diff options
Diffstat (limited to 'config.h')
| -rw-r--r-- | config.h | 30 |
1 files changed, 25 insertions, 5 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 2.34 2011/08/20 08:51:47 kls Exp $ + * $Id: config.h 2.36 2011/12/03 14:19:52 kls Exp $ */ #ifndef __CONFIG_H @@ -22,13 +22,13 @@ // VDR's own version number: -#define VDRVERSION "1.7.21" -#define VDRVERSNUM 10721 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.7.22" +#define VDRVERSNUM 10722 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: -#define APIVERSION "1.7.21" -#define APIVERSNUM 10721 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "1.7.22" +#define APIVERSNUM 10722 // 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 @@ -61,6 +61,25 @@ public: 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; @@ -292,6 +311,7 @@ public: int EmergencyExit; int __EndData__; cString InitialChannel; + cString DeviceBondings; cSetup(void); cSetup& operator= (const cSetup &s); bool Load(const char *FileName); |