bugfixes, small layout changes, channel updates

5 files changed, 43 insertions, 31 deletions

diff --git a/History b/History
index dcbf1b6..7644176 100644
--- a/History
+++ b/History
@@ -5,6 +5,9 @@ VDR 1.7.29
 
 0.20	Updated EPG filter
 	SearchTimers Submenu.
+	Channels updates
+	In guideview you can have updates for all channels in view, was changed because it was too slow on 1910/1960 but 1963/1903 can handle it.
+
 
 0.19	Added SleepTimer in menu 1 Settings. (Key is stopbutton)
 	Timer menu OK shows same info as BLUE
diff --git a/channels.js b/channels.js
index eb16e92..bc26713 100644
--- a/channels.js
+++ b/channels.js
@@ -220,7 +220,7 @@ channelsnames[107] = "Sky DramaRom (S)";
 channels[107] = "S28.2E-2-2007-5502";
 channelsnames[108] = "Sky ScFi/Horror (S)";
 channels[108] = "S28.2E-2-2007-4304";
-channelsnames[109] = "Sky Mdn Greats (S)";
+channelsnames[109] = "Sky Greats (S)";
 channels[109] = "S28.2E-2-2007-5650";
 channelsnames[110] = "Sky Classics (S)";
 channels[110] = "S28.2E-2-2007-4305";
@@ -228,12 +228,10 @@ channelsnames[111] = "TCM (S)";
 channels[111] = "S28.2E-2-2403-6038";
 channelsnames[112] = "TCM 2 (S)";
 channels[112] = "S28.2E-2-2021-5522";
-channelsnames[113] = "Christmas 24 (S)";
+channelsnames[113] = "Movies 24 (S)";
 channels[113] = "S28.2E-2-2303-52265";
-channelsnames[114] = "Christmas 24+ (S)";
+channelsnames[114] = "Movies 24+ (S)";
 channels[114] = "S28.2E-2-2303-52270";
-channelsnames[115] = "Cinémoi movies (S)";
-channels[115] = "S28.2E-2-2311-52014";
 
 channelsnames[150] = "RTL Crime (S)";
 channels[150] = "S19.2E-133-1-27";
@@ -1139,8 +1137,8 @@ channels[848] = "S19.2E-1-1059-7104";
 
 channelsnames[850] = "TV5MONDE EUROPE (S)";
 channels[850] = "S19.2E-1-1022-6915";
-channelsnames[851] = "M6 HD(S)";
-channels[851] = "S19.2E-1-1088-9310";
+channelsnames[851] = "Montagne TV (S)";
+channels[851] = "S19.2E-1-1020-7001";
 channelsnames[852] = "M6 (S)";
 channels[852] = "S19.2E-1-1074-8367";
 
diff --git a/channels1.js b/channels1.js
index 63c6421..dd233cf 100644
--- a/channels1.js
+++ b/channels1.js
@@ -362,6 +362,10 @@ channelsnames[1817] = "HBO HD (S)"
 channels[1817] = "S23.5E-0-112109-5047"
 channelsnames[1818] = "Travel Channel HD (S)"
 channels[1818] = "S23.5E-0-112109-5048"
+
+channelsnames[1852] = "M6 HD(S)";
+channels[1852] = "S19.2E-1-1088-9310";
+
 channelsnames[1900] = "Sky News HD (S)"
 channels[1900] = "S28.2E-2-2039-3850"
 channelsnames[1934] = "AXN CS (S)"
diff --git a/index.html b/index.html
index e3c5f3a..abe2494 100644
--- a/index.html
+++ b/index.html
@@ -23,7 +23,7 @@
 //
 //
 
-var Version = "0.20.1"
+var Version = "0.20.2"
 
 for (var x = 0;  x < 10; x++) { 
 	if (minChan[x]) {
@@ -55,8 +55,10 @@ function onLoad() {
 	mediaPlayer.addEventListener(mediaPlayer.ON_DATA_AVAILABLE,onDataAvailableEvent);
 	mediaPlayer.addEventListener(mediaPlayer.ON_STATE_CHANGED, MPD); 
 
-	if (toi.informationService.getObject("var.capabilities.dvr") == "FALSE") { mediaRecorder = 0;}
-	// No harddisk, no recorder functions possible
+	if (toi.informationService.getObject("var.capabilities.dvr") == "FALSE") { 
+		mediaRecorder = 0;
+		// No harddisk, no recorder functions possible
+	}
 
 	if (mediaRecorder) {
 		createRecorder();
@@ -66,11 +68,10 @@ function onLoad() {
 	    toi.informationService.addEventListener(toi.informationService.ON_OBJECTS_CHANGED, onEvent);
 	    toi.informationService.subscribeObject(onEvent, "var.io.state", true);
 
-	var ss = toi.schedulerService;
-	    ss.addEventListener(ss.ON_SCHEDULED_START, onScheduledStart);
-	    ss.addEventListener(ss.ON_SCHEDULED_STOP, onScheduledStop);
-	    ss.setCategorySubscription(onScheduledStart, "*");
-	    ss.setCategorySubscription(onScheduledStop, "*");
+	    toi.schedulerService.addEventListener(toi.schedulerService.ON_SCHEDULED_START, onScheduledStart);
+	    toi.schedulerService.addEventListener(toi.schedulerService.ON_SCHEDULED_STOP, onScheduledStop);
+	    toi.schedulerService.setCategorySubscription(onScheduledStart, "*");
+	    toi.schedulerService.setCategorySubscription(onScheduledStop, "*");
 	setOSDtimer();
 
 	showOSD();
@@ -2034,8 +2035,8 @@ if(menu == 5) { // Timers from Server
 		if (timers.length !== 0) { do { x = x + 1; } while (!timers[x] && (x < timers.length)) }
 		if (timers.length > x) { booking = booking + timers[x]; } else { booking = booking +"\n"; }
 		if (i == 0) { booking = booking + "</font>"; } 
-	mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> Timers </center></h1><pre style='color:black;font-size:" + fsMenu + ";'>\n" + booking + "</pre>";
 	}
+	mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> Timers </center></h1><pre style='color:black;font-size:" + fsMenu + ";'>\n" + booking + "</pre>";
 
 	}
 }
@@ -2051,8 +2052,8 @@ if(menu == 7) { // SearchTimers from Server
 		if (searchtimers.length !== 0) { do { x = x + 1; } while (!searchtimers[x] && (x < searchtimers.length)) }
 		if (searchtimers.length > x) { booking = booking + searchtimers[x]; } else { booking = booking +"\n"; }
 		if (i == 0) { booking = booking + "</font>"; } 
-	mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> SearchTimers </center></h1><pre style='color:black;font-size:" + fsMenu + ";'>\n" + booking + "</pre>";
 	}
+	mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> SearchTimers </center></h1><pre style='color:black;font-size:" + fsMenu + ";'>\n" + booking + "</pre>";
 
 	}
 }
@@ -2277,7 +2278,6 @@ function ShowSearchTimerInfo() {
 
 			info2 = x[i].getElementsByTagName("param")[6].childNodes[0].nodeValue; // Time
 			        date = new Date(Number(info2)*1000);
-			        year = date.getFullYear();
 	        		month = date.getMonth();
 			        d = date.getDate();
 		        	day = date.getDay();
@@ -2285,10 +2285,11 @@ function ShowSearchTimerInfo() {
 			        m = date.getMinutes();
 				h=addzero(h);
 				m=addzero(m);
-			info2 = days[day] + "\uE003" + d + "\uE003" + months[month] + "\uE003" + year + "\uE003" + h + ':' + m;
+			info2 = Left(days[day],3) + "\uE003" + d + "\uE003" + Left(months[month],3) + "\uE003" + h + ':' + m;
 			info1 = info1 + info2;
-			info2 = x[i].getElementsByTagName("param")[7].childNodes[0].nodeValue/60 + "\uE003\uE003\uE003"; // Duration
-			info1 = info1 + "\uE003" + Left(info2,4) + x[i].getElementsByTagName("param")[5].childNodes[0].nodeValue + "\uE003"; // Channel
+			info2 = "\uE003\uE003" + x[i].getElementsByTagName("param")[7].childNodes[0].nodeValue/60 + "\uE003"; // Duration
+			info1 = info1 + "\uE003" + Right(info2,3) + x[i].getElementsByTagName("param")[5].childNodes[0].nodeValue + "\uE003"; // Channel
+			info1 = info1 + "\uE003" + Left(x[i].getElementsByTagName("param")[1].childNodes[0].nodeValue,25) + "\uE003"; // Programm Title
 			info1 = info1 + "\n";
 			
 		}
@@ -2917,13 +2918,13 @@ function MakeRecList() {
 						}
 	} else if (recTitl[i][recMap + 1]) { 
 					if (recTitl[i][recMap] != x) {
-						recList[i] = "\uE002 " + recTitl[i];
+						recList[i] = "\uE002" + recTitl[i];
 					} else {
 						var y = recTitl[i][recMap].length + 4;
 						recList[i] = new Array(y).join("\uE003") + String(recTitl[i]).substring(y - 3);
 					}
 				} else { 
-					recList[i] = "\uE003 " + recTitl[i];
+					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][recMap];
@@ -2938,7 +2939,7 @@ function MakeRecList2() {
 	{
 	 if (recTitl[i][1]) { 
 					if (recTitl[i][0] != x) {
-						recList[i] = "\uE002" + recTitl[i][0];
+						recList[i] = "\uE002\uE003" + recTitl[i][0];
 						xx = xx + 1;
 					} else {
 						recList[i] = "" ; 
@@ -2946,9 +2947,8 @@ function MakeRecList2() {
 					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]; }
+						if (rec_New[i] == "true" ) { recList[i] = "\uE003\uE010\uE003" + recTitl[i]; 
+							} else { recList[i] = "\uE003\uE003\uE003" + recTitl[i]; }
 				}
 	x = recTitl[i][0];
 	}
@@ -3016,7 +3016,7 @@ function showMediaList() {
 		}  else {
 			liststyle = " style='";
 		}
-		htmlstring = htmlstring + "<td" + liststyle + "font-size:" + fsReclist + ";'>\uE003" + Left(recList[listMed],60) + "</td></tr>";
+		htmlstring = htmlstring + "<td" + liststyle + "font-size:" + fsReclist + ";'>\uE003" + Left(recList[listMed],60) + "\uE003\uE003</td></tr>";
 	}
 	mediaList.innerHTML = htmlstring + "</table>";
 	//ShowInfo();
@@ -3361,9 +3361,14 @@ function ShowInfo() {
 	h=addzero(h);
 	m=addzero(m);
         result = ''+days[day]+' '+d+' '+months[month]+' '+year+' '+h+':'+m;
-
-       	osdepginfo.innerHTML = "<center><pre style='color:white;'>" + Left(recTitl[currMed],60) + "\n " + result + "\n " + (recDura[currMed] / 60).toFixed(0) + " Minutes \n " + recChan[currMed] + "\n </pre><p>" + Left(recDesc[currMed],750) + "</p></center>";
-
+	if (year!==1970) { 	
+       		osdepginfo.innerHTML = "<center><pre style='color:white;'>" + Left(recTitl[currMed],60) + "\n " + result + "\n " 
+					+ (recDura[currMed] / 60).toFixed(0) + " Minutes \n " + recChan[currMed] + "  " 
+					+ channelsnames[(recChan[currMed])] + "\n </pre><p>" + Left(recDesc[currMed],750) + "</p></center>";
+	} else {
+		//info for non-vdr recordings
+	       	osdepginfo.innerHTML = "<center><pre style='color:white;'>" + Left(recTitl[currMed],60) + "\n \n </pre></center>";
+	}
 }
 
 function onScheduledStart(event) {
diff --git a/settings.js b/settings.js
index 8c962a1..312c76a 100644
--- a/settings.js
+++ b/settings.js
@@ -248,3 +248,5 @@ var free_space = 0;
 var used_space = 0;
 var perc_space = 0;
 
+
+