Version 1.0.0pre3vdr-1.0.0pre3

- Fixed parsing 'E' records in epg2html.pl.
- Fixed a deadlock when switching channels via Schedule/Now|Next/Switch (reported
  by Martin Hammerschmid).
- Changed the meaning of the 'Ca' parameter in 'channels.conf'. Each channel can
  now define which decryption method it needs in order to be accessed. The new
  configuration file 'ca.conf' contains the defined values, and the default
  'channels.conf' has been modifed to contain the new values for 'Premiere World'
  and 'ORF'. If you use the default 'channels.conf' and have the conditional
  access hardware to receive encrypted channels, please make sure you copy the
  file 'ca.conf' into your /video directory (or wherever your configuration files
  are located) and go into the "Setup" menu and set the CICAM values according
  to your hardware setup. Currently there are two possible CICAM entries per
  DVB card, so any card can implement up to two different conditional access
  modes (besides the default "Free To Air" mode, which is always assumed to be
  available on any DVB card).
- Updated French language texts (thanks to Jean-Claude Repetto).

1 files changed, 23 insertions, 2 deletions

diff --git a/config.h b/config.h
index b5860d1..f5e8343 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.100 2002/02/25 16:29:09 kls Exp $
+ * $Id: config.h 1.102 2002/03/03 16:04:43 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.0.0pre2"
+#define VDRVERSION "1.0.0pre3"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -195,6 +195,18 @@ public:
   bool Accepts(in_addr_t Address);
   };
 
+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;
@@ -297,15 +309,23 @@ public:
   bool Acceptable(in_addr_t Address);
   };
 
+class cCaDefinitions : public cConfig<cCaDefinition> {
+public:
+  const cCaDefinition *Get(int Number);
+  };
+
 extern cChannels Channels;
 extern cTimers Timers;
 extern cKeys Keys;
 extern cCommands Commands;
 extern cSVDRPhosts SVDRPhosts;
+extern cCaDefinitions CaDefinitions;
 
 class cSetup {
 private:
   static char *fileName;
+  void PrintCaCaps(FILE *f, const char *Name);
+  bool ParseCaCaps(const char *Value);
   bool Parse(char *s);
 public:
   // Also adjust cMenuSetup (menu.c) when adding parameters here!
@@ -339,6 +359,7 @@ public:
   int MinEventTimeout, MinUserInactivity;
   int MultiSpeedMode;
   int ShowReplayMode;
+  int CaCaps[MAXDVBAPI][MAXCACAPS];
   int CurrentChannel;
   int CurrentVolume;
   cSetup(void);