Merge branch 'bug_202_networkconfig_cleanup'

[enigma2.git] / data / encoding.conf

diff --git a/data/encoding.conf b/data/encoding.conf
index aad79f886694b4419c396ac8018663f800e5bb13..9383317e8513d1d49ef157966cb97fc87524facd 100644 (file)
--- a/data/encoding.conf
+++ b/data/encoding.conf
@@ -1,46 +1,48 @@
-# Fallback encoding when in dvb-text no encoding table is given. In normal
-# case this then is Latin1/ISO6397 with enabled two char byte mapping.
-# But here we override this for all EIT entries with given country code
-
-#Countycode ISO8859-X
-pol ISO8859-2 # this is needed by all known polish providers
-tur ISO8859-9 # is this realy needed .. please recheck and report
-gre ISO8859-7 # is this realy needed .. please recheck and report
-rus ISO8859-5 # is this realy needed .. please recheck and report
-bul ISO8859-5 # is this realy needed .. please recheck and report
-
-# Table of transponder using two byte char mappings
-# in normal case two char byte mapping is only used when in dvb-text no
-# encoding is given... but some providers use two-char byte mapping in 
-# combination with other ISO8859-X tables.. so here it can be enabled
-# for some TSID/ONID combinations
-# a special case is when in dvb-text ISO8859-5 is selected... then
-# we also change the char table to ISO6397 this is used by 
-# Cyfra+ and Cyfrowy Polsat and other polish providers
-# please report when you have an idea how to auto detect this!
-
+#Fallback encoding when in dvb-text no encoding table is given
+#Countycode ISO8859-X or ISO6397
+ara ISO8859-6
+tur ISO8859-9
+gre ISO8859-7
+pol ISO8859-2
+rus ISO8859-5
+bul ISO8859-5
+#Sorry for that.. in DVB Spec this is the default behavior 
+#when no other encoding is given in dvb-texts..
+#but this breaks too much providers yet.. 
+#so our default is ISO8859-1 without two char byte encoding
+#So all transponders which needs this must be listed here
 #TSID ONID
-400 318 #Hotbird 13.0° Cyfra+
-1500 318
-11000 318
-11400 318
-11900 318
-7400 113 #Hotbird 13.0° Cyfrowy Polsat
-7800 113
-7900 113
-13200 113
-1000 318 #Grupa ITI
-1600 318 #Filmbox Polska and other
-12200 318 #Disney Channel Polska and other
-12800 318 #Viacom ... MTV / VH1 Polska
-13000 318 #BBC Polska and other
-
-# Fallback encoding when in dvb-text no encoding table is given. In normal
-# case this then is Latin1/ISO6397 with enabled two char byte mapping.
-# But here we override this for all EIT entries on transponders with given
-# TSID/ONID combination
-
+0x447 0x1 #ASTRA 19.2 UPC Direct
+0x427 0x1 #ASTRA 19.2 UPC Direct
+0x44b 0x1 #ASTRA 19.2 UPC Direct
+0x4ff 0x1 #ASTRA 19.2 UPC Direct
+0x407 0x1 #ASTRA 19.2 UPC Direct
+0x436 0x1 #ASTRA 19.2 MTV Euro - MTV Networks
+0x42a 0x1 #ASTRA 19.2 VH1 Classic - MTV Networks
+0xbc6 0x3 #ASTRA 23.5 Cslink, Skylink
+0xc85 0x3 #ASTRA 23.5 Cslink, Skylink
+0xc89 0x3 #ASTRA 23.5 Cslink, Skylink
+0xc8f 0x3 #ASTRA 23.5 Cslink, Skylink
+0xbc7 0x3 #ASTRA 23.5 Cslink, Skylink
+400 318 #Hotbird 13.0 Cyfra+
+1000 318 #Hotbird 13.0 Grupa ITI
+1500 318 #Hotbird 13.0 Cyfra+
+1600 318 #Hotbird 13.0 Cyfra+
+7400 113 #Hotbird 13.0 Cyfrowy Polsat
+7800 113 #Hotbird 13.0 Cyfrowy Polsat
+7900 113 #Hotbird 13.0 Cyfrowy Polsat
+8100 113 #Hotbird 13.0 Universal (Cyfra+)
+11000 318 #Hotbird 13.0 Cyfra+
+11400 318 #Hotbird 13.0 Cyfra+
+11900 318 #Hotbird 13.0 Cyfra+
+12200 318 #Hotbird 13.0 Disney Channel Polska and other
+12800 318 #Hotbird 13.0 Viacom ... MTV / VH1 Polska
+13000 318 #Hotbird 13.0 BBC Polska and other
+13200 113 #Hotbird 13.0 Cyfrowy Polsat
+#Fallback encoding table for single transponders
+#ISO6397 also enables two byte char encoding
 #TSID ONID ISO8859-X
+12800 318 ISO6397 #Viacom ... MTV / VH1 Polska
 21100 126 ISO8859-9 # Digital Platform 7°E 10.928 H 30.000 2/3 8PSK
 41200 126 ISO8859-9 # Digital Platform 7°E 11.451 V 25.066 2/3
 50100 126 ISO8859-9 # Digital Platform 7°E 11.471 H 30.000 3/4