Epg filter update

5 files changed, 61 insertions, 41 deletions

diff --git a/History b/History
index 6ad1aab..18738f2 100644
--- a/History
+++ b/History
@@ -2,6 +2,8 @@ Tested on
 Motorola Vip : 1960 (with and without HDD), 1910, 1903.
 VDR 1.7.29
 
+0.18	EPG filter 30W ZON, Digital 
+
 
 0.17	Show EPG from Server limited to X days ( 3 = default, set in settings.js)
 	Updated Mainmenu. For now Recordings = Server Recordings menu item.
diff --git a/channels.js b/channels.js
index 70b4d2b..ff3a391 100644
--- a/channels.js
+++ b/channels.js
@@ -109,11 +109,10 @@ channelsnames[35] = "Omroep Zeeland Televisie (S)";
 channels[35] = "S23.5E-3-3211-20818";
 
 
-
-channelsnames[40] = "een (S)";
-channels[40] = "S19.2E-53-1119-12775";
-channelsnames[41] = "Canvas (S)";
-channels[41] = "S19.2E-53-1119-12776";
+channelsnames[40] = "een (MPEG4) (S)";
+channels[40] = "S19.2E-53-1119-12801";
+channelsnames[41] = "Canvas (MPEG4) (S)";
+channels[41] = "S19.2E-53-1119-12802";
 channelsnames[42] = "VTM (MPEG4) (S)";
 channels[42] = "S19.2E-53-1119-12810";
 channelsnames[43] = "VIER (MPEG4) (S)";
@@ -122,12 +121,8 @@ channelsnames[44] = "2BE (MPEG4) (S)";
 channels[44] = "S19.2E-53-1119-12812";
 channelsnames[45] = "VIJF (MPEG4) (S)";
 channels[45] = "S19.2E-53-1119-12820";
-channelsnames[46] = "Vitaya (MPEG4) (S)";
-channels[46] = "S19.2E-53-1119-12818";
-channelsnames[47] = "KetOp12 (S)";
-channels[47] = "S19.2E-53-1119-12808";
-channelsnames[48] = "Acht (MPEG4) (S)";
-channels[48] = "S19.2E-53-1119-12822";
+channelsnames[46] = "KetOp12 (S)";
+channels[46] = "S19.2E-53-1119-12808";
 
 channelsnames[49] = "Informatiekanaal (S)";
 channels[49] = "S19.2E-53-1119-12826";
@@ -249,9 +244,9 @@ channels[152] = "S28.2E-2-2303-52255";
 channelsnames[153] = "Universal+1 (S)";
 channels[153] = "S28.2E-2-2303-52220";
 channelsnames[154] = "ComedyCentral (S)";
-channels[154] = "S28.2E-2-2404-50305";
+channels[154] = "S28.2E-2-2411-51084";
 channelsnames[155] = "ComedyCtrl+1 (S)";
-channels[155] = "S28.2E-2-2604-54340";
+channels[155] = "S28.2E-2-2411-51085";
 channelsnames[156] = "ComedyCtralX (S)";
 channels[156] = "S28.2E-2-2023-5431";
 channelsnames[157] = "ComedyCtlX+1 (S)";
@@ -478,10 +473,13 @@ channelsnames[317] = "JIM JAM (S)";
 channels[317] = "S23.5E-3-3219-13132";
 channelsnames[318] = "Boomerang (S)";
 channels[318] = "S19.2E-1-1068-28527";
-channelsnames[319] = "Nick Jr (S)";
-channels[319] = "S28.2E-2-2604-54355";
-channelsnames[320] = "Nick Jr. 2 (S)";
-channels[320] = "S28.2E-2-2313-53285";
+channelsnames[319] = "Nick Jr. (S)";
+channels[319] = "S28.2E-2-2052-5563";
+channelsnames[320] = "Nick Jr+1 (S)";
+channels[320] = "S28.2E-2-2411-51090";
+channelsnames[321] = "Nick Jr. 2 (S)";
+channels[321] = "S28.2E-2-2411-51089";
+
 channelsnames[322] = "Nick Jr France (S)";
 channels[322] = "S19.2E-1-1078-28677";
 channelsnames[323] = "Nick Jr. (S)";
diff --git a/channels1.js b/channels1.js
index c734b05..63c6421 100644
--- a/channels1.js
+++ b/channels1.js
@@ -1,10 +1,13 @@
 //
 // HD channels
 //
+
+// Note to self: acht & vitaya nu alleen nog op 23E
+
 minChan[1] = 1001;
 defChan[1] = 1001;
 baseChn[1] = 1000;
-protChn[1] = 1;
+protChn[1] = 0;
 ServerAdres[1] = server_ip + ":3000/";
 
 channelsnames[1001] = "NED1 HD (S)"
diff --git a/channels5.js b/channels5.js
index 818932d..1fdc46c 100644
--- a/channels5.js
+++ b/channels5.js
@@ -3,32 +3,32 @@
 //
 
 // MultiCast
-minChan[5] = 5001;
-defChan[5] = 5008;
-baseChn[5] = 5000;
-protChn[5] = 1;
-ServerAdres[5] = "MultiCast";
+//minChan[5] = 5001;
+//defChan[5] = 5008;
+//baseChn[5] = 5000;
+//protChn[5] = 1;
+//ServerAdres[5] = "MultiCast";
 // MultiCast, channels[x] layout DVB(Satposition, C or T)-NID-TID-SID-multicast address
 
 
-channelsnames[5001] = "NED1 (S)";
-channels[5001] = "S19.2E-53-1105-4011-239.255.0.1:11111";
-channelsnames[5002] = "NED2 (S)";
-channels[5002] = "S19.2E-53-1105-4012-239.255.0.2:11111";
-channelsnames[5003] = "NED3 (S)";
-channels[5003] = "S19.2E-53-1105-4013-239.255.0.3:11111";
-channelsnames[5004] = "RTL4 (S)";
-channels[5004] = "S19.2E-53-1097-2004-239.255.0.4:11111";
-channelsnames[5005] = "RTL5 (S)";
-channels[5005] = "S19.2E-53-1097-2005-239.255.0.5:11111";
-channelsnames[5006] = "SBS6 (S)";
-channels[5006] = "S19.2E-53-1105-4002-239.255.0.6:11111";
-channelsnames[5007] = "RTL7 (S)";
-channels[5007] = "S19.2E-53-1097-2006-239.255.0.7:11111";
-channelsnames[5008] = "Veronica/DisneyXD (S)";
-channels[5008] = "S19.2E-53-1097-2031-239.255.0.8:11111";
-
-maxChan[5] = 5008; // set to max multicast channel else you see 'undefined' in guide view
+//channelsnames[5001] = "NED1 (S)";
+//channels[5001] = "S19.2E-53-1105-4011-239.255.0.1:11111";
+//channelsnames[5002] = "NED2 (S)";
+//channels[5002] = "S19.2E-53-1105-4012-239.255.0.2:11111";
+//channelsnames[5003] = "NED3 (S)";
+//channels[5003] = "S19.2E-53-1105-4013-239.255.0.3:11111";
+//channelsnames[5004] = "RTL4 (S)";
+//channels[5004] = "S19.2E-53-1097-2004-239.255.0.4:11111";
+//channelsnames[5005] = "RTL5 (S)";
+//channels[5005] = "S19.2E-53-1097-2005-239.255.0.5:11111";
+//channelsnames[5006] = "SBS6 (S)";
+//channels[5006] = "S19.2E-53-1105-4002-239.255.0.6:11111";
+//channelsnames[5007] = "RTL7 (S)";
+//channels[5007] = "S19.2E-53-1097-2006-239.255.0.7:11111";
+//channelsnames[5008] = "Veronica/DisneyXD (S)";
+//channels[5008] = "S19.2E-53-1097-2031-239.255.0.8:11111";
+
+//maxChan[5] = 5008; // set to max multicast channel else you see 'undefined' in guide view
 
 //
 // Full URL TEST
diff --git a/index.html b/index.html
index 349fdf6..c4d8c0c 100644
--- a/index.html
+++ b/index.html
@@ -1261,6 +1261,9 @@ function StreamInfo(si) {
  	SI=channels[si].split("-");
 	is = toi.informationService;
 
+	//default setting : English
+	is.setObject("cfg.locale.ui","eng",is.STORAGE_VOLATILE);
+
 	if(SI[0]=="C") {
 	// Default on Cable - Dutch // Ziggo.
 	is.setObject("cfg.locale.ui","dut",is.STORAGE_VOLATILE);
@@ -1297,6 +1300,20 @@ function StreamInfo(si) {
 	is.setObject("cfg.locale.ui","dut",is.STORAGE_VOLATILE);
 	}
 
+	if(SI[1]=="54") {
+	//ZON / 30W
+	is.setObject("cfg.locale.ui","eng",is.STORAGE_VOLATILE);
+	}
+
+	if(SI[1]=="83") {
+	//MEO / 30W
+	is.setObject("cfg.locale.ui","por",is.STORAGE_VOLATILE);
+	}
+
+	if(SI[1]=="49") {
+	//Digital 30W
+	is.setObject("cfg.locale.ui","spa",is.STORAGE_VOLATILE);
+	}
 
 	if(SI[1]=="3" && ( SI[2]=="3202" || SI[2]=="3208" || SI[2]=="3211" || SI[2]=="3222" || SI[2]=="3225") ) {
 	//Canal Digitaal/ TV Vlaanderen (NID:3 is used for more than only CDS/TVV on 23East)