EPG filter update, channels update

5 files changed, 116 insertions, 94 deletions

diff --git a/History b/History
index 28def77..9dfc34c 100644
--- a/History
+++ b/History
@@ -3,7 +3,7 @@ Motorola Vip : 1960, 1910, 1903, 1963.
 
 VDR 1.7.29
 
-0.22	Updated EPG filter for 42E
+0.22	Updated EPG filter for 42E, canal sat (tid 1088), canal+ (tid 1060)
 	Fix: Right month is now shown in recordings menu.
 	Fix: multiple EPG languages on 1 transponder.
 	Added some channels for 42E to group 3
diff --git a/channels.js b/channels.js
index 21cbb39..096802d 100644
--- a/channels.js
+++ b/channels.js
@@ -51,7 +51,7 @@ channels[6] = "S19.2E-53-1105-4002";
 channelsnames[7] = "RTL7 (S)";
 channels[7] = "S19.2E-53-1105-4047";
 channelsnames[8] = "Veronica/DisneyXD (S)";
-channels[8] = "S19.2E-53-1097-2031";
+channels[8] = "S19.2E-1-1037-5251";
 channelsnames[9] = "NET5 (S)";
 channels[9] = "S19.2E-53-1105-4003";
 channelsnames[10] = "BVN (S)";
@@ -63,17 +63,19 @@ channels[12] = "S19.2E-1-1078-28679";
 channelsnames[13] = "ComedyCentral/Kindernet (S)";
 channels[13] = "S23.5E-3-3211-20826";
 channelsnames[14] = "Discovery (S)";
-channels[14] = "S19.2E-53-1097-2015";
-channelsnames[15] = "TLC Netherlands (S)";
-channels[15] = "S19.2E-53-1097-2020";
+channels[14] = "S19.2E-1-1037-5252";
+//channelsnames[15] = "TLC Netherlands (S)";
+//channels[15] = "S19.2E-53-1097-2020";
 channelsnames[18] = "NG Wild DUT (S)";
 channels[18] = "S23.5E-3-3210-5145";
 channelsnames[19] = "History channel DUT (S)";
 channels[19] = "S23.5E-3-3210-5140";
 channelsnames[20] = "Animax (S)";
-channels[20] = "S19.2E-53-1097-2047";
-channelsnames[21] = "EUROSPORT (S)";
-channels[21] = "S19.2E-53-1097-2025";
+channels[20] = "S19.2E-1-1037-5253";
+//channelsnames[21] = "EUROSPORT (S)";
+//channels[21] = "S19.2E-53-1097-2025";
+channelsnames[21] = "Eurosport Deutschland (S)";
+channels[21] = "S19.2E-1-1091-31200";
 channelsnames[22] = "Eurosport 2 Deutschland (S)";
 channels[22] = "S19.2E-133-15-55";
 channelsnames[23] = "ESPN America (S)";
diff --git a/channels6.js b/channels6.js
index 794e6d0..44dba6d 100644
--- a/channels6.js
+++ b/channels6.js
@@ -43,8 +43,8 @@ channelsnames[6018] = "Hot (S)";
 channels[6018]="S30.0W-54-37-1666";
 channelsnames[6019] = "Leo TV (S)";
 channels[6019]="S23.5E-3-3209-13119";
-channelsnames[6020] = "Private Spice (S)";
-channels[6020]="S5.0E-366-101-22";
+//channelsnames[6020] = "Private Spice (S)";
+//channels[6020]="S5.0E-366-101-22";
 channelsnames[6021] = "Daring TV (S)";
 channels[6021]="S5.0E-366-101-23";
 channelsnames[6022] = "DORCEL TV (S)";
@@ -69,8 +69,10 @@ channelsnames[6032] = "EROX (S)";
 channels[6032]="S23.5E-3-3212-14052";
 channelsnames[6034] = "EROXXX (S)";
 channels[6034]="S23.5E-3-3212-14055";
-channelsnames[6035] = "Penthouse HD (S)";
-channels[6035]="S23.5E-3-3236-5711";
+channelsnames[6035] = "Penthouse 3D HD (S)";
+channels[6035]="S23.5E-3-3204-5311";
+//channelsnames[6035] = "Penthouse HD (S)";
+//channels[6035]="S23.5E-3-3236-5711";
 channelsnames[6036] = "Penthouse HD1 (S)";
 channels[6036]="S23.5E-3-3236-5712";
 channelsnames[6037] = "Penthouse HD2 (S)";
@@ -93,9 +95,9 @@ channelsnames[6047]="PENTHOUSE HD (S)";
 channels[6047]="S19.2E-1-1088-9306";
 channelsnames[6048]="PLAYBOY TV (S)";
 channels[6048]="S19.2E-1-1060-30603";
-channelsnames[6049]="CONTO TV 1 (S)";
-channels[6049]="S13.0E-318-1400-8429";
-channelsnames[6050]="CONTO TV 2 (S)";
-channels[6050]="S13.0E-318-1400-8428";
+//channelsnames[6049]="CONTO TV 1 (S)";
+//channels[6049]="S13.0E-318-1400-8429";
+//channelsnames[6050]="CONTO TV 2 (S)";
+//channels[6050]="S13.0E-318-1400-8428";
 
-maxChan[6] = 6050; // set to max prt channel else you see 'undefined' in guide view
+maxChan[6] = 6048; // set to max prt channel else you see 'undefined' in guide view
diff --git a/channels9.js b/channels9.js
index 765a867..219fc7b 100644
--- a/channels9.js
+++ b/channels9.js
@@ -11,35 +11,35 @@ protChn[9] = 0;
 ServerAdres[9] = server_ip + ":3000/";
 
 channelsnames[9001] = "NL-Radio 1 (S)";
-channels[9001] = "S19.2E-53-1097-2055";
+channels[9001] = "S19.2E-1-1037-5281";
 channelsnames[9002] = "NL-Radio 2 (S)";
-channels[9002] = "S19.2E-53-1097-2056";
+channels[9002] = "S19.2E-1-1037-5282";
 channelsnames[9003] = "NL-3FM (S)";
-channels[9003] = "S19.2E-53-1097-2057";
+channels[9003] = "S19.2E-1-1037-5283";
 channelsnames[9004] = "NL-Radio 4 (S)";
-channels[9004] = "S19.2E-53-1097-2058";
-channelsnames[9005] = "NL-Radio 5 (S)";
-channels[9005] = "S19.2E-53-1097-2059";
-channelsnames[9006] = "NL-Radio 6 (S)";
-channels[9006] = "S19.2E-53-1097-2060";
+channels[9004] = "S19.2E-1-1037-5284";
+//channelsnames[9005] = "NL-Radio 5 (S)";
+//channels[9005] = "S19.2E-53-1097-2059";
+//channelsnames[9006] = "NL-Radio 6 (S)";
+//channels[9006] = "S19.2E-53-1097-2060";
 channelsnames[9007] = "Radio Oost (S)";
 channels[9007] = "S23.5E-3-3211-20844";
 channelsnames[9008] = "Radio Gelderland (S)";
 channels[9008] = "S23.5E-3-3211-20846";
 channelsnames[9009] = "BNR Nieuwsradio (S)";
 channels[9009] = "S19.2E-53-1105-4030";
-channelsnames[9010] = "Sky Radio (S)";
-channels[9010] = "S19.2E-53-1097-2064";
-channelsnames[9011] = "Radio538 (S)";
-channels[9011] = "S19.2E-53-1097-2066";
-channelsnames[9012] = "Radio10Gold (S)";
-channels[9012] = "S19.2E-53-1097-2067";
-channelsnames[9013] = "Radio Veronica (S)";
-channels[9013] = "S19.2E-53-1097-2068";
-channelsnames[9014] = "Classic FM (S)";
-channels[9014] = "S19.2E-53-1097-2069";
-channelsnames[9015] = "Slam FM (S)";
-channels[9015] = "S19.2E-53-1097-2071";
+//channelsnames[9010] = "Sky Radio (S)";
+//channels[9010] = "S19.2E-53-1097-2064";
+//channelsnames[9011] = "Radio538 (S)";
+//channels[9011] = "S19.2E-53-1097-2066";
+//channelsnames[9012] = "Radio10Gold (S)";
+//channels[9012] = "S19.2E-53-1097-2067";
+//channelsnames[9013] = "Radio Veronica (S)";
+//channels[9013] = "S19.2E-53-1097-2068";
+//channelsnames[9014] = "Classic FM (S)";
+//channels[9014] = "S19.2E-53-1097-2069";
+//channelsnames[9015] = "Slam FM (S)";
+//channels[9015] = "S19.2E-53-1097-2071";
 channelsnames[9016] = "Studio Brussel (S)";
 channels[9016] = "S19.2E-53-1119-12781";
 channelsnames[9017] = "Klara (S)";
@@ -52,32 +52,32 @@ channelsnames[9020] = "Nostalgie (S)";
 channels[9020] = "S19.2E-53-1119-12789";
 channelsnames[9021] = "100% NL (S)";
 channels[9021] = "S23.5E-3-3211-20890";
-channelsnames[9022] = "Arrow Jazz (S)";
-channels[9022] = "S19.2E-53-1097-2062";
-channelsnames[9023] = "Mint (S)";
-channels[9023] = "S19.2E-53-1097-2080";
-channelsnames[9024] = "Bel RTL (S)";
-channels[9024] = "S19.2E-53-1097-2081";
-channelsnames[9025] = "Radio Contact (S)";
-channels[9025] = "S19.2E-53-1097-2082";
-channelsnames[9026] = "Pure FM (S)";
-channels[9026] = "S19.2E-53-1097-2085";
-channelsnames[9027] = "Classic21 (S)";
-channels[9027] = "S19.2E-53-1097-2086";
-channelsnames[9028] = "VivaCite (S)";
-channels[9028] = "S19.2E-53-1097-2087";
-channelsnames[9029] = "Musiq 3 (S)";
-channels[9029] = "S19.2E-53-1097-2088";
-channelsnames[9030] = "La Premiere (S)";
-channels[9030] = "S19.2E-53-1097-2089";
+//channelsnames[9022] = "Arrow Jazz (S)";
+//channels[9022] = "S19.2E-53-1097-2062";
+//channelsnames[9023] = "Mint (S)";
+//channels[9023] = "S19.2E-53-1097-2080";
+//channelsnames[9024] = "Bel RTL (S)";
+//channels[9024] = "S19.2E-53-1097-2081";
+//channelsnames[9025] = "Radio Contact (S)";
+//channels[9025] = "S19.2E-53-1097-2082";
+//channelsnames[9026] = "Pure FM (S)";
+//channels[9026] = "S19.2E-53-1097-2085";
+//channelsnames[9027] = "Classic21 (S)";
+//channels[9027] = "S19.2E-53-1097-2086";
+//channelsnames[9028] = "VivaCite (S)";
+//channels[9028] = "S19.2E-53-1097-2087";
+//channelsnames[9029] = "Musiq 3 (S)";
+//channels[9029] = "S19.2E-53-1097-2088";
+//channelsnames[9030] = "La Premiere (S)";
+//channels[9030] = "S19.2E-53-1097-2089";
 channelsnames[9031] = "FunX (S)";
 channels[9031] = "S19.2E-53-1105-4035";
-channelsnames[9032] = "RNW1 (S)";
-channels[9032] = "S19.2E-53-1105-4050";
-channelsnames[9033] = "RNW2 (S)";
-channels[9033] = "S19.2E-53-1105-4055";
-channelsnames[9034] = "RNW3 (S)";
-channels[9034] = "S19.2E-53-1105-4060";
+//channelsnames[9032] = "RNW1 (S)";
+//channels[9032] = "S19.2E-53-1105-4050";
+//channelsnames[9033] = "RNW2 (S)";
+//channels[9033] = "S19.2E-53-1105-4055";
+//channelsnames[9034] = "RNW3 (S)";
+//channels[9034] = "S19.2E-53-1105-4060";
 channelsnames[9035] = "VRT Radio1 (S)";
 channels[9035] = "S19.2E-53-1119-12778";
 channelsnames[9036] = "VRT Radio2 (S)";
@@ -88,20 +88,20 @@ channelsnames[9038] = "COUNTRY RADIO (S)";
 channels[9038] = "S23.5E-3-3219-13150";
 channelsnames[9039] = "Arrow Jazz (S)";
 channels[9039] = "S23.5E-3-3211-20894";
-channelsnames[9040] = "Bel RTL (S)";
-channels[9040] = "S19.2E-1-1037-5272";
-channelsnames[9041] = "Radio Contact (S)";
-channels[9041] = "S19.2E-1-1037-5273";
-channelsnames[9042] = "Pure FM (S)";
-channels[9042] = "S19.2E-1-1037-5285";
-channelsnames[9043] = "Classic21 (S)";
-channels[9043] = "S19.2E-1-1037-5286";
-channelsnames[9044] = "VivaCite (S)";
-channels[9044] = "S19.2E-1-1037-5287";
-channelsnames[9045] = "Musiq 3 (S)";
-channels[9045] = "S19.2E-1-1037-5288";
-channelsnames[9046] = "La Premiere (S)";
-channels[9046] = "S19.2E-1-1037-5289";
+//channelsnames[9040] = "Bel RTL (S)";
+//channels[9040] = "S19.2E-1-1037-5272";
+//channelsnames[9041] = "Radio Contact (S)";
+//channels[9041] = "S19.2E-1-1037-5273";
+//channelsnames[9042] = "Pure FM (S)";
+//channels[9042] = "S19.2E-1-1037-5285";
+//channelsnames[9043] = "Classic21 (S)";
+//channels[9043] = "S19.2E-1-1037-5286";
+//channelsnames[9044] = "VivaCite (S)";
+//channels[9044] = "S19.2E-1-1037-5287";
+//channelsnames[9045] = "Musiq 3 (S)";
+//channels[9045] = "S19.2E-1-1037-5288";
+//channelsnames[9046] = "La Premiere (S)";
+//channels[9046] = "S19.2E-1-1037-5289";
 channelsnames[9050] = "Arrow Classic Rock (S)";
 channels[9050] = "S23.5E-3-3211-20892";
 channelsnames[9051] = "ROCK ANTENNE (S)";
@@ -120,21 +120,9 @@ channelsnames[9057] = "ANTENNE BAYERN (S)";
 channels[9057] = "S19.2E-133-7-170";
 channelsnames[9058] = "radio top40 (S)";
 channels[9058] = "S19.2E-1-1113-12653";
-channelsnames[9059] = "RTL 1440 (S)";
-channels[9059] = "S19.2E-53-1097-2052";
-channelsnames[9060] = "RTL RADIO (S)";
-channels[9060] = "S19.2E-53-1097-2051";
-channelsnames[9061] = "Musicam 1 (S)";
-channels[9061] = "S30.0W-2-15-15";
-channelsnames[9062] = "Musicam 2 (S)";
-channels[9062] = "S30.0W-2-15-16";
-channelsnames[9063] = "Musicam 3 (S)";
-channels[9063] = "S30.0W-2-15-17";
-channelsnames[9064] = "Musicam 4 (S)";
-channels[9064] = "S30.0W-2-15-18";
-channelsnames[9065] = "Musicam 5 (S)";
-channels[9065] = "S30.0W-2-15-19";
-channelsnames[9066] = "Musicam 6 (S)";
-channels[9066] = "S30.0W-2-15-20";
+//channelsnames[9059] = "RTL 1440 (S)";
+//channels[9059] = "S19.2E-53-1097-2052";
+//channelsnames[9060] = "RTL RADIO (S)";
+//channels[9060] = "S19.2E-53-1097-2051";
 
-maxChan[9] = 9066; // set to max rd channel else you see 'undefined' in guide view
+maxChan[9] = 9058; // set to max rd channel else you see 'undefined' in guide view
diff --git a/index.html b/index.html
index e45dcb6..1495a7c 100644
--- a/index.html
+++ b/index.html
@@ -1411,7 +1411,7 @@ function StreamInfo(si) {
 	}
 
 	if(SI[1]=="8720") {
-	// KPN DVB-T
+	// KPN DVB-T (might also be used for some german)
 	is.setObject("cfg.locale.ui","dut",is.STORAGE_VOLATILE);
 	}
 
@@ -1440,6 +1440,12 @@ function StreamInfo(si) {
 	is.setObject("cfg.locale.ui","GER",is.STORAGE_VOLATILE);
 	}
 
+	if(SI[2]=="1057" && SI[3]=="61204") {
+	//Sport1 HD (daytime only?)
+	is.setObject("cfg.locale.ui","DEU",is.STORAGE_VOLATILE);
+	}
+
+
 	if(SI[2]=="1055" || SI[2]=="1053" || SI[2]=="1041" || SI[2]=="1017" || SI[2]=="1109") {
 	//HD+ transponder
 	is.setObject("cfg.locale.ui","DEU",is.STORAGE_VOLATILE);
@@ -1467,11 +1473,21 @@ function StreamInfo(si) {
 	is.setObject("cfg.locale.ui","eng",is.STORAGE_VOLATILE);
 	}
 
+	if(SI[1]=="53" && SI[3]=="12883" ) {
+	//Canal Digitaal/ TV Vlaanderen 
+	is.setObject("cfg.locale.ui","eng",is.STORAGE_VOLATILE);
+	}
+
+
 	if(SI[1]=="53" && (SI[3]=="2045") ) {
 	//Canal Digitaal/ TV Vlaanderen 
 	is.setObject("cfg.locale.ui","fra",is.STORAGE_VOLATILE);
 	}
 
+	if(SI[1]=="53" && SI[3]=="12882" ) {
+	//Canal Digitaal/ TV Vlaanderen 
+	is.setObject("cfg.locale.ui","fra",is.STORAGE_VOLATILE);
+	}
 
 
 	if(SI[1]=="54") {
@@ -1515,7 +1531,7 @@ function StreamInfo(si) {
 	}
 
 	if(SI[1]=="3" && SI[2]=="3212" && ( SI[3]=="14052" || SI[3]=="14055" ) ) {
-	is.setObject("cfg.locale.ui","CZE",is.STORAGE_VOLATILE);
+	is.setObject("cfg.locale.ui","eng",is.STORAGE_VOLATILE);
 	}
 
 
@@ -1583,6 +1599,20 @@ function StreamInfo(si) {
 		is.setObject("cfg.locale.ui","fra",is.STORAGE_VOLATILE);
 	}
 
+	//Canal Sat 
+	if(SI[0]=="S19.2E" && SI[1]=="1" && SI[2]=="1088" ) {
+	is.setObject("cfg.locale.ui","fre",is.STORAGE_VOLATILE);
+	}
+
+	if(SI[0]=="S13.0E" && SI[1]=="319") {
+	is.setObject("cfg.locale.ui","fre",is.STORAGE_VOLATILE);
+	}
+
+	//Canal+
+	if(SI[0]=="S19.2E" && SI[1]=="1" && SI[2]=="1060" ) {
+	is.setObject("cfg.locale.ui","spa",is.STORAGE_VOLATILE);
+	}
+
 }