Updated EPG filter for MTV Transponder (Nick JR france, Nick NL)

	Channel group 0 : removed channels 30W, updated channels 28.8E
	Show maps for first level submaps. <OK> to enter submap (Can be switched off in settings to keep old way of displaying)

4 files changed, 130 insertions, 64 deletions

diff --git a/History b/History
index a9514ab..4847559 100644
--- a/History
+++ b/History
@@ -4,6 +4,10 @@ Motorola Vip : 1960, 1910, 1903, 1963.
 VDR 1.7.29
 
 0.19	Added SleepTimer in menu 1 Settings. (Key is stopbutton)
+	Timer menu OK shows same info as BLUE
+	Updated EPG filter for MTV Transponder (Nick JR france, Nick NL)
+	Channel group 0 : removed channels 30W, updated channels 28.8E 
+	Show maps for first level submaps. <OK> to enter submap (Can be switched off in settings to keep old way of displaying)
 
 
 0.18	Updated EPG filter for
diff --git a/channels.js b/channels.js
index ff3a391..9e06736 100644
--- a/channels.js
+++ b/channels.js
@@ -59,7 +59,7 @@ channels[10] = "S19.2E-53-1105-4016";
 channelsnames[11] = "RTL8 (S)";
 channels[11] = "S19.2E-53-1097-2035";
 channelsnames[12] = "Nickelodeon (S)";
-channels[12] = "S19.2E-0-211973-28679";
+channels[12] = "S19.2E-1-1078-28679";
 channelsnames[13] = "Comedy Central/Kindernet (S)";
 channels[13] = "S19.2E-53-1097-2036";
 channelsnames[14] = "Discovery (S)";
@@ -139,10 +139,10 @@ channelsnames[54] = "Disc.History (S)";
 channels[54] = "S28.2E-2-2009-6207";
 channelsnames[55] = "Disc.History+1 (S)";
 channels[55] = "S28.2E-2-2315-52435";
-channelsnames[56] = "Disc.RealTime (S)";
-channels[56] = "S28.2E-2-2009-6203";
-channelsnames[57] = "Disc.RT+1 (S)";
-channels[57] = "S28.2E-2-2315-52445";
+channelsnames[56] = "TLC (S)";
+channels[56] = "S28.2E-2-2009-6233";
+channelsnames[57] = "TLC+1 (S)";
+channels[57] = "S28.2E-2-2315-52446";
 channelsnames[58] = "Disc.Science (S)";
 channels[58] = "S28.2E-2-2009-6206";
 channelsnames[59] = "Disc.Sci+1 (S)";
@@ -159,12 +159,12 @@ channelsnames[64] = "Home&Health+ (S)";
 channels[64] = "S28.2E-2-2315-52450";
 channelsnames[65] = "Investigation (S)";
 channels[65] = "S28.2E-2-2315-52400";
-channelsnames[66] = "DMAX (S)";
-channels[66] = "S28.2E-2-2315-52415";
-channelsnames[67] = "DMAX+1 (S)";
-channels[67] = "S28.2E-2-2315-52420";
-channelsnames[68] = "DMAX+2 (S)";
-channels[68] = "S28.2E-2-2315-52425";
+channelsnames[66] = "Investigation+1 (S)";
+channels[66] = "S28.2E-2-2315-52426";
+channelsnames[67] = "DMAX (S)";
+channels[67] = "S28.2E-2-2315-52415";
+channelsnames[68] = "DMAX+1 (S)";
+channels[68] = "S28.2E-2-2315-52420";
 channelsnames[69] = "QUEST (S)";
 channels[69] = "S28.2E-2-2009-6211";
 channelsnames[70] = "QUEST+1 (S)";
@@ -193,7 +193,7 @@ channelsnames[81] = "History (S)";
 channels[81] = "S28.2E-2-2408-4653";
 channelsnames[82] = "History +1 hour (S)";
 channels[82] = "S28.2E-2-2408-5003";
-channelsnames[83] = "Military (S)";
+channelsnames[83] = "H2 (S)";
 channels[83] = "S28.2E-2-2604-54305";
 channelsnames[84] = "Nat Geo (S)";
 channels[84] = "S28.2E-2-2408-4805";
@@ -350,9 +350,9 @@ channelsnames[244] = "horror channel (S)";
 channels[244] = "S28.2E-2-2301-52105";
 channelsnames[245] = "horror ch+1 (S)";
 channels[245] = "S28.2E-2-2311-52002";
-channelsnames[246] = "men&movies (S)";
+channelsnames[246] = "more>movies (S)";
 channels[246] = "S28.2E-2-2602-54110";
-channelsnames[247] = "men&movs+1 (S)";
+channelsnames[247] = "m>movies+1 (S)";
 channels[247] = "S28.2E-2-2412-51120";
 channelsnames[248] = "movies4men (S)";
 channels[248] = "S28.2E-2-2412-51116";
@@ -415,25 +415,23 @@ channels[279] = "S28.2E-2-2313-53260";
 channelsnames[280] = "Food Netwrk+1 (S)";
 channels[280] = "S28.2E-2-2313-53270";
 channelsnames[281] = "wedding tv (S)";
-channels[281] = "S28.2E-2-2313-53280";
+channels[281] = "S28.2E-2-2402-55510";
 channelsnames[282] = "The Active Ch (S)";
-channels[282] = "S28.2E-2-2402-55510";
+channels[282] = "S28.2E-2-2614-55330";
 channelsnames[283] = "Fitness TV (S)";
 channels[283] = "S28.2E-2-2602-54165";
-channelsnames[284] = "Diva TV (S)";
-channels[284] = "S28.2E-2-2306-52530";
-channelsnames[285] = "BET:BlackEntTv (S)";
-channels[285] = "S28.2E-2-2313-53230";
-channelsnames[286] = "BET +1 (S)";
-channels[286] = "S28.2E-2-2311-52060";
-channelsnames[287] = "Information TV (S)";
-channels[287] = "S28.2E-2-2409-50880";
-channelsnames[288] = "Showcase (S)";
-channels[288] = "S28.2E-2-2302-52125";
-channelsnames[289] = "Showcase 2 (S)";
-channels[289] = "S28.2E-2-2601-54051";
-channelsnames[290] = "Horse & Country (S)";
-channels[290] = "S28.2E-2-2602-54140";
+channelsnames[284] = "BET:BlackEntTv (S)";
+channels[284] = "S28.2E-2-2411-51081";
+channelsnames[285] = "BET +1 (S)";
+channels[285] = "S28.2E-2-2411-51082";
+channelsnames[286] = "Information TV (S)";
+channels[286] = "S28.2E-2-2313-53230";
+channelsnames[287] = "Showcase (S)";
+channels[287] = "S28.2E-2-2302-52125";
+channelsnames[288] = "Showcase 2 (S)";
+channels[288] = "S28.2E-2-2313-53280";
+channelsnames[289] = "Horse & Country (S)";
+channels[289] = "S28.2E-2-2602-54140";
 
 channelsnames[300] = "CBBC Channel (S)";
 channels[300] = "S28.2E-2-2045-6317";
@@ -444,7 +442,7 @@ channels[302] = "S28.2E-2-2044-10071";
 channelsnames[303] = "KiKA (S)";
 channels[303] = "S19.2E-1-1079-28008";
 channelsnames[304] = "RIC (S)";
-channels[304] = "S19.2E-1-1003-13227";
+channels[304] = "S19.2E-1-1117-13019";
 channelsnames[305] = "NICK/COMEDY (S)";
 channels[305] = "S19.2E-1-1078-28680";
 channelsnames[306] = "jazeerachildren (S)";
@@ -479,7 +477,6 @@ 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)";
@@ -491,7 +488,7 @@ channels[326] = "S28.2E-2-2051-9004";
 channelsnames[327] = "Disney Junior+ (S)";
 channels[327] = "S28.2E-2-2051-9010";
 channelsnames[328] = "BabyTV (S)";
-channels[328] = "S28.2E-2-2409-51145";
+channels[328] = "S28.2E-2-2052-5564";
 channelsnames[329] = "Boomerang (S)";
 channels[329] = "S28.2E-2-2018-7102";
 channelsnames[330] = "Boomerang +1 (S)";
@@ -914,24 +911,6 @@ channelsnames[645] = "VH1 (S)";
 channels[645] = "S28.2E-2-2010-7002";
 channelsnames[646] = "VIVA (S)";
 channels[646] = "S28.2E-2-2010-7009";
-channelsnames[647] = "VH1 (S)";
-channels[647] = "S30.0W-54-37-2003";
-channelsnames[648] = "VH1 Classic (S)";
-channels[648] = "S30.0W-54-41-612";
-channelsnames[649] = "MTV Music (S)";
-channels[649] = "S30.0W-54-40-782";
-channelsnames[650] = "MTV Dance (S)";
-channels[650] = "S30.0W-54-40-783";
-channelsnames[651] = "MTV Portugal (S)";
-channels[651] = "S30.0W-54-40-504";
-channelsnames[652] = "MTV ESPAÑA (S)";
-channels[652] = "S30.0W-49-5-85";
-channelsnames[653] = "MTV Rocks (S)";
-channels[653] = "S30.0W-54-37-967";
-channelsnames[654] = "MTV ROCKS (S)";
-channels[654] = "S30.0W-54-37-2004";
-channelsnames[655] = "MTV ESPAÑA (S)";
-channels[655] = "S30.0W-49-5-98";
 channelsnames[656] = "VIVA AUT (S)";
 channels[656] = "S19.2E-133-7-60";
 channelsnames[657] = "MTV Live (S)";
@@ -946,8 +925,6 @@ channelsnames[661] = "MTV Music (S)";
 channels[661] = "S13.0E-64511-800-1428";
 channelsnames[662] = "MTV Dance (S)";
 channels[662] = "S13.0E-64511-800-1429";
-channelsnames[663] = "VH1 (S)";
-channels[663] = "S30.0W-54-37-785";
 channelsnames[700] = "NHK World (S)";
 channels[700] = "S13.0E-318-13100-7327";
 channelsnames[701] = "VTV4 (S)";
diff --git a/index.html b/index.html
index 967f2ec..aecc16d 100644
--- a/index.html
+++ b/index.html
@@ -23,7 +23,7 @@
 //
 //
 
-var Version = "0.19.1"
+var Version = "0.19.2"
 
 for (var x = 0;  x < 10; x++) { 
 	if (minChan[x]) {
@@ -1342,7 +1342,7 @@ function StreamInfo(si) {
 
 
 
-	if(SI[1]=="3" && ( SI[2]=="3205" || SI[2]=="3209" || SI[2]=="3210" || SI[2]=="3221" || ( SI[2]=="3219" && SI[3]!=="13135") )) {
+	if(SI[1]=="3" && ( SI[2]=="3205" || SI[2]=="3209" || SI[2]=="3210" || SI[2]=="3221" || SI[2]=="3219" )) {
 	//Canal Digitaal/ TV Vlaanderen use CZE channels on 23East
 	// Strangly set filter to cze but epg is in Dutch. (But not for JimJam)
 	is.setObject("cfg.locale.ui","cze",is.STORAGE_VOLATILE);
@@ -1378,11 +1378,24 @@ function StreamInfo(si) {
 		is.setObject("cfg.locale.ui","pol",is.STORAGE_VOLATILE);
 	}
 
-	if(SI[0]=="S19.2E" && (SI[2]=="1074") || (SI[2]=="1018") || (SI[2]=="1024") || (SI[2]=="1068") || (SI[2]=="1070") || (SI[2]=="1072") || (SI[2]=="1076") || (SI[2]=="1080") || (SI[2]=="1084") || (SI[2]=="1086") || (SI[2]=="1090") || (SI[2]=="1092") || (SI[2]=="1094") || (SI[2]=="1096") || (SI[2]=="1100") || (SI[2]=="1102") || (SI[2]=="1106") || (SI[2]=="1110") || (SI[2]=="1112") || (SI[2]=="1114") || (SI[2]=="1116") || (SI[2]=="1118") || (SI[2]=="1120")) {
+	if(SI[0]=="S19.2E" && ((SI[2]=="1074") || (SI[2]=="1018") || (SI[2]=="1024") || (SI[2]=="1068") || (SI[2]=="1070") || (SI[2]=="1072") || (SI[2]=="1076") || (SI[2]=="1080") || (SI[2]=="1084") || (SI[2]=="1086") || (SI[2]=="1090") || (SI[2]=="1092") || (SI[2]=="1094") || (SI[2]=="1096") || (SI[2]=="1100") || (SI[2]=="1102") || (SI[2]=="1106") || (SI[2]=="1110") || (SI[2]=="1112") || (SI[2]=="1114") || (SI[2]=="1116") || (SI[2]=="1118") || (SI[2]=="1120"))) {
 	//CanalSat S19.2
 		is.setObject("cfg.locale.ui","fra",is.STORAGE_VOLATILE);
 	}
 
+
+	// MTV transponder
+	if(SI[0]=="S19.2E" && SI[2]=="1078" && ( SI[3]=="28674" || SI[3]=="28675" || SI[3]=="28677")) {
+	//Nick JR France
+		is.setObject("cfg.locale.ui","fra",is.STORAGE_VOLATILE);
+	}
+
+	if(SI[0]=="S19.2E" && SI[2]=="1078" && SI[3]=="28679") {
+	//Nick NL
+		is.setObject("cfg.locale.ui","dut",is.STORAGE_VOLATILE);
+	}
+
+
 }
 
 
@@ -1597,6 +1610,11 @@ function onKeyMenu(keyCode) {
 		InitMenu(menu);
     break;
     case "Accept":
+	if (menu == 5) {
+		// Show EPG info Timer
+		ShowTimerInfo();
+		osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
+	}
     break;
     case "Red":
     	if (menu == 2) {
@@ -2159,6 +2177,12 @@ if (DelisOK) {
 } else if (mediaList.style.opacity != 0) { 
   switch(keyCode) {
     case "BrowserBack":
+	if (subgroup) { 	
+		mediaList.innerHTML = "<h1><center style='font-size:" + fsRec + ";color:white;'> Please WAIT </center></h1>";
+		setTimeout("getRecList(); showMediaList();",100)
+		subgroup = 0;
+		break;
+	}
 	if (osdepginfo.style.opacity == 1) { osdepginfo.style.opacity = 0; break; }
     case "TV":
 	UnloadMediaSettings();
@@ -2171,7 +2195,8 @@ if (DelisOK) {
 		{
 		        incMed(1);
 		}
-		while (!recTitl[currMed]);
+	//	while (!recTitl[currMed]);
+		while (!recList[currMed]);
 	   }	
 	showMediaList();
 	}
@@ -2183,7 +2208,8 @@ if (DelisOK) {
 		{
 		        decMed(1);
 		}
-		while (!recTitl[currMed]);
+	//	while (!recTitl[currMed]);
+		while (!recList[currMed]);
 	   }
 	showMediaList();
 	}
@@ -2194,7 +2220,8 @@ if (DelisOK) {
 	{
 	        incMed(1);
 	}
-	while (!recTitl[currMed]);
+	//	while (!recTitl[currMed]);
+		while (!recList[currMed]);
 	showMediaList();
 	}
         break;
@@ -2204,7 +2231,8 @@ if (DelisOK) {
 	{
 	        decMed(1);
 	}
-	while (!recTitl[currMed]);
+	//	while (!recTitl[currMed]);
+		while (!recList[currMed]);
 	showMediaList();
 	}
 	break;
@@ -2215,8 +2243,13 @@ if (DelisOK) {
 		osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
 	}
 	if (getRecOK == 1) {
-		mediaList.style.opacity = 0;
-		setTimeout("GetMarks(); getResume(); playRec(recLink[currMed]+ '?time=' + position);",100);
+		if (recGroup[currMed] !== 0 && subgroup == 0 && ShowSubDir) {
+			setTimeout("MakeRecList3(recGroup[currMed]); showMediaList();",100)
+			subgroup = 1;
+		} else {
+			mediaList.style.opacity = 0;
+			setTimeout("GetMarks(); getResume(); playRec(recLink[currMed]+ '?time=' + position);",100);
+		}
 	}
         break;
     case "Red":
@@ -2476,6 +2509,7 @@ if (DelisOK) {
 
 function getRecList() {
 	getVDRstatus();
+	MaxInGroup = 14;
 try {
    xmlhttp=new XMLHttpRequest();
    xmlhttp.open("GET",(recServ + recPath + "?" + new Date().getTime()),false);
@@ -2504,7 +2538,11 @@ try {
 	  recChan[i] = "Media File";
 	}
 	  }
+	if (recPath == "/recordings.xml" && ShowSubDir) {
+	MakeRecList2();
+	} else {
 	MakeRecList();
+	}
  	getRecOK = 1;
   } catch(e) {
     alert("Get Recordings problem: " + e);
@@ -2640,17 +2678,60 @@ function MakeRecList() {
 	}
 }
 
+function MakeRecList2() {
+   var x = "";
+   var xx = 0;
+   for (var i=0;i<recTitl.length;i++)
+	{
+	 if (recTitl[i][1]) { 
+					if (recTitl[i][0] != x) {
+						recList[i] = "\uE002 " + recTitl[i][0];
+						xx = xx + 1;
+					} else {
+						recList[i] = "" ; 
+					}
+					recGroup[i] = xx;
+				} else { 
+					recGroup[i] = 0;
+					recList[i] = "\uE003 " + recTitl[i];
+						if (rec_New[i] == "true" ) { recList[i] = "\uE010\uE003" + recList[i]; 
+							} else { recList[i] = "\uE003\uE003" + recList[i]; }
+				}
+	x = recTitl[i][0];
+	}
+}
+
+function MakeRecList3(GroupID) {
+   MaxInGroup = 0;
+   for (var i=0;i<recTitl.length;i++)
+	{
+		if (recGroup[i] == GroupID) {
+			if (rec_New[i] == "true" ) { recList[i] = "\uE010\uE003" + recTitl[i]; 
+			} else { recList[i] = "\uE003\uE003" + recTitl[i]; }
+			MaxInGroup = MaxInGroup + 1;
+		} else {
+			recList[i] = "" ; 
+		}
+	}
+}
+
+
+
+
 function showMediaList() {
 	if (osdepginfo.style.opacity == 1) {osdepginfo.style.opacity = 0;}
 	osdmedia.style.opacity = 0;
 	var liststyle = "";
+	listMed = currMed - 1;
+	if (nrMedia < 14) {var MaxMed = nrMedia; } else { var MaxMed = 14; }
+
 	if (getRecOK == 1) {
 	var htmlstring = "<h1><center style='font-size:" + fsRec + ";color:white;'> RECORDINGS (free " + (100 - perc_space) + "%, " + (free_space/1024).toFixed(0) + " GB) </center></h1><table border='0'><tr>";
+	if (MaxInGroup < 14) {var MaxMed = MaxInGroup - 1; }
 	} else {
 	var htmlstring = "<h1><center style='font-size:" + fsRec + ";color:white;'> EPG " + channelsnames[currChan] + " </center></h1><table border='0'><tr>";
 	}
-	listMed = currMed - 1;
-	if (nrMedia < 14) {var MaxMed = nrMedia; } else { var MaxMed = 14; }
+
 	for(var i=currMed; i<=currMed + MaxMed; i++) {
 		if (listMed<0) {
 			listMed=nrMedia;
diff --git a/settings.js b/settings.js
index 79843c7..9985974 100644
--- a/settings.js
+++ b/settings.js
@@ -20,6 +20,7 @@ var currChan = 10; // default channel
 //
 //
 
+var ShowSubDir = 1 ; // 0 = no, 1 = yes (default) // show seperate maps for subdirs in menu recordings
 var showClock = 0;   // 0 = no, 1 = yes
 var SwitchGuide = 0; // 0 = no, 1 = yes
 var TimeShift = 0;   // 0 = no, 1 = yes timeshift
@@ -194,6 +195,9 @@ var rec_New = new Array(); // Flag if recording is new (unseen)
 var recGUID = new Array(); // GUID of recording
 var recChan = new Array(); // Channel ID
 var recDummy= new Array(); //
+var recGroup= new Array(); // group index
+var subgroup= 0 ; // Used for subdirs in recording view
+var MaxInGroup=14; // Used for subdirs in recording view
 
 var posMark = 0;
 var recMap = 0;