From: jurrabi <jurrabi@gmail.com>
Date: Sat, 10 Aug 2013 10:43:59 +0000 (+0200)
Subject: Include correct charset selection for Canal + Spain Transponders
X-Git-Tag: v4.1~2400^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F290%2Fhead;p=thirdparty%2Ftvheadend.git

Include correct charset selection for Canal + Spain Transponders

Canal + uses it's own encoded guide. But info for Current-Next program is delivered using standard EPG DVB-S method. But it doesn't indicate correctly the encoding used (latin) so TVH shows information assuming UTF-8 and this doesn't show correctly latin chars (áéíóúñ and things like that).
This modification allows tvh to correctly identify charset for current (as of today 10Aug2013) Canal + Spain transponders.
---

diff --git a/data/conf/charset b/data/conf/charset
index b8a0cb00c..d15e0e5b1 100644
--- a/data/conf/charset
+++ b/data/conf/charset
@@ -1,4 +1,137 @@
 [
+	{
+		"tsid": 1050,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 10729.00 V"
+	},
+	{
+		"tsid": 1028,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 10758.50 V"
+	},
+	{
+		"tsid": 1054,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 10788.00 V"
+	},
+	{
+		"tsid": 1056,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 10817.50 V"
+	},
+	{
+		"tsid": 1058,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 10847.00 V"
+	},
+	{
+		"tsid": 1060,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 10876.50 V"
+	},
+	{
+		"tsid": 1064,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 10935.50 V"
+	},
+	{
+		"tsid": 1034,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 10979.00 V"
+	},
+	{
+		"tsid": 1038,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 11038.00 V"
+	},
+	{
+		"tsid": 1040,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 11068.00 V"
+	},
+	{
+		"tsid": 1042,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 11097.00 V"
+	},
+	{
+		"tsid": 1044,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 11126.50 V"
+	},
+	{
+		"tsid": 1046,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 11156.00 V"
+	},
+	{
+		"tsid": 1048,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 11185.50 V xx"
+	},
+	{
+		"tsid": 1004,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 11258.50 V"
+	},
+	{
+		"tsid": 1008,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 11317.50 V"
+	},
+	{
+		"tsid": 1016,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 11435.50 V"
+	},
+	{
+		"tsid": 1032,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 11685.50 V"
+	},
+	{
+		"tsid": 1066,
+		"onid": 1,
+		"charset": "ISO8859-15",
+		"sid": 0,
+		"description": "Astra 19.2E Canal + Spain 11739.00 V"
+	},
 	{
 		"tsid": 1,
 		"onid": 133,