Revert "more standard conform handling for dvb-text encodings"

[vuplus_dvbapp] / data / encoding.conf

diff --git a/data/encoding.conf b/data/encoding.conf
index 691f002..c46951e 100644 (file)
--- a/data/encoding.conf
+++ b/data/encoding.conf
@@ -1,25 +1,28 @@
-# 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
+#Fallback encoding when in dvb-text no encoding table is given
+#Countycode ISO8859-X or ISO6397
 tur ISO8859-9
 gre ISO8859-7
 pol ISO8859-2
 rus ISO8859-5
 bul ISO8859-5
-
-# 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!
-
+#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
+0x447 0x1 #ASTRA 19.2° UPC Direct
+0x427 0x1
+0x44b 0x1
+0x4ff 0x1
+0x407 0x1
+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
+0xc89 0x3
+0xc8f 0x3
+0xbc7 0x3
 400 318 #Hotbird 13.0° Cyfra+
 1500 318
 11000 318
@@ -32,20 +35,20 @@ bul ISO8859-5
 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
-
+#Fallback encoding table for single transponders
+#ISO6397 also enables two byte char encoding
 #TSID ONID ISO8859-X
-50200 126 ISO8859-9 # Digiturk 7°E 11.492 V 30.000 3/4
-50300 126 ISO8859-9 # Digiturk 7°E 11.639 H 30.000 3/4
-50400 126 ISO8859-9 # Digiturk 7°E 11.534 V 30.000 3/4
-50600 126 ISO8859-9 # Digiturk 7°E 11.575 V and 42°E 11.729 V 15.555 5/6
-50700 126 ISO8859-9 # Digiturk 7°E 11.596 H 30.000 3/4
-50800 126 ISO8859-9 # Digiturk 7°E 11.678 H 30.000 3/4
-50900 126 ISO8859-9 # Skyturk  7°E 11.513 H 27.500 3/4
-51000 126 ISO8859-9 # Digiturk 7°E 11.617 V 30.000 3/4
+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
+50200 126 ISO8859-9 # Digital Platform 7°E 11.492 V 30.000 3/4
+50300 126 ISO8859-9 # Digital Platform 7°E 11.639 H 30.000 3/4
+50400 126 ISO8859-9 # Digital Platform 7°E 11.534 V 30.000 3/4
+50500 126 ISO8859-9 # Digital Platform 7°E 11.262 H 27.500 3/4
+50600 126 ISO8859-9 # Digital Platform 7°E 11.575 V and 42°E 11.729 V 15.555 5/6
+50700 126 ISO8859-9 # Digital Platform 7°E 11.596 H 30.000 3/4
+50800 126 ISO8859-9 # Digital Platform 7°E 11.678 H 30.000 3/4
+50900 126 ISO8859-9 # Digital Platform 7°E 11.513 H 27.500 3/4
+51000 126 ISO8859-9 # Digital Platform 7°E 11.617 V 30.000 3/4