summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-11-12 16:55:36 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2002-11-12 16:55:36 +0100
commit5198be318702316b1bb516f20cc9f6b20d311d9a (patch)
treef6f7d3eedcbc75b40b8a29d08d7f5092da9d2ad1
parentc05b788debf46d018aa3383c3017f89ba4165e63 (diff)
downloadvdr-5198be318702316b1bb516f20cc9f6b20d311d9a.tar.gz
vdr-5198be318702316b1bb516f20cc9f6b20d311d9a.tar.bz2
Added new entries to 'ca.conf'
-rw-r--r--HISTORY4
-rw-r--r--ca.conf72
-rw-r--r--config.h4
3 files changed, 78 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index e0a5f119..a9da2339 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1767,3 +1767,7 @@ Video Disk Recorder Revision History
data for NVOD channels.
- Fixed a compiler warning regarding cMenuChannels::Del() and MenuTimers::Del() hiding
the base class virtual functions.
+
+2002-11-11: Version 1.1.17
+
+- Added new entries to 'ca.conf'.
diff --git a/ca.conf b/ca.conf
index ee2c9c53..61f11890 100644
--- a/ca.conf
+++ b/ca.conf
@@ -13,11 +13,83 @@
101 Premiere World
102 ORF
+103 DIGI-Kabel
# Cryptoworks
201 GOD-DIGITAL
+# Videoguard
+
+301 Sky Digital
+
+# Viaccess 1
+
+401 SRG Swiss
+402 NTV Plus
+403 Viasat
+404 Parabole Reunion
+
+# Viaccess 2
+
+501 Alpha Digital Greece
+
+# Cryptoworks
+
+601 UPC Direct
+602 DigiTurk
+
+# Mediaguard
+
+701 CanalSatellite Reunion
+
+# Mediaguard 2
+
+801 Orbit Network
+
+# Nagravision
+
+901 PolSat Cyfrowy
+
+# Irdeto 2
+
+1001 ADD
+1002 Nova Greece
+1003 Multichoice Africa
+
+# Conax
+
+1101 Canal Digital Scandinavia
+
+# Mediaguard, Viaccess 1, Viaccess 2
+
+10001 AB Sat France
+10002 TPS France
+
+# Videoguard, Mediaguard 2, Irdeto 1
+
+11001 Stream TV Italy
+
+# Videoguard, Mediaguard 2, Cryptoworks
+
+12001 Tele+ Digitale
+
+# Mediaguard 1, Irdeto 1
+
+13001 Canal Digitaal Satelliet NL
+
+# Mediaguard 1, Mediaguard 2, Viaccess 1
+
+14001 Canal Satellite France
+
+# Mediaguard 1, Mediaguard 2, Viaccess 1, Cryptoworks
+
+15001 Canal Satelite Digital Espana
+
+# Mediaguard 2, Cryptoworks
+
+16001 Cyfra+ Polska
+
# Special values to "hard code" a channel to a specific DVB card:
1 DVB 1
diff --git a/config.h b/config.h
index af8d92b9..04a7c829 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.139 2002/11/08 13:16:12 kls Exp $
+ * $Id: config.h 1.140 2002/11/11 16:59:04 kls Exp $
*/
#ifndef __CONFIG_H
@@ -20,7 +20,7 @@
#include "eit.h"
#include "tools.h"
-#define VDRVERSION "1.1.16"
+#define VDRVERSION "1.1.17"
#define MAXPRIORITY 99
#define MAXLIFETIME 99