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, 17 insertions, 2 deletions

diff --git a/FORMATS b/FORMATS
index 0da2939..9190338 100644
--- a/FORMATS
+++ b/FORMATS
@@ -29,8 +29,9 @@ Video Disk Recorder File Formats
     If this channel also carries Dolby Digital sound, the Dolby PIDs follow
     the audio PIDs, separated by a semicolon, as in "...:101,102;103,104:..."
   - Teletext PID
-  - Conditional Access (0 = Free To Air, 1 = can be decrypted by the first
-    DVB card, 2 = can be decrypted by the second DVB card)
+  - Conditional Access (0 = Free To Air, 1..4 = explicitly requires the DVB card
+    with the given number, >=100 = requires a specific decryption method defined
+    in 'ca.conf').
   - Program Number
 
   Fields marked with ** are only meaningful for DVB-S receivers.
@@ -38,6 +39,20 @@ Video Disk Recorder File Formats
   Fields marked with *** are only meaningful for DVB-S and DVB-C receivers.
   DVB-T receivers simply ignore these.
 
+* ca.conf
+
+  This file contains the definitions of the various conditional access code
+  numbers. Anything after (and including) a '#' character is comment.
+  Value lines consist of an integer number, followed by a text describing
+  this decryption method (typically the name of the pay tv service using this
+  decryption method).
+  The special value 0 means "Free To Air", i.e. can be used for channels that
+  don't require additional decryption hardware.
+  The values 1..4 can be used for channels that for some reason explicitly
+  need a given DVB card (for backward compatibility).
+  The values defined in this file are the ones used in the 'Ca' parameter of
+  'channels.conf'.
+
 * timers.conf
 
   This file contains the timer setup.