Audio/Video info in Infobox when playing

channels updated
channels3 updated with some from 42E

5 files changed, 81 insertions, 140 deletions

diff --git a/History b/History
index 22029b5..e504ed1 100644
--- a/History
+++ b/History
@@ -6,6 +6,8 @@ VDR 1.7.29
 0.22	Updated EPG filter for 42E
 	Fix: Right month is now shown in recordings menu.
 	Added some channels for 42E to group 3
+	SmartwebTV timer handling added
+	Info about audio/video in Infobox when playing Recording
 
 
 0.21	Language in sepate file, link your lang_XXX.js to language.js to activate it.
diff --git a/channels.js b/channels.js
index e38878e..dd65bf0 100644
--- a/channels.js
+++ b/channels.js
@@ -1131,7 +1131,7 @@ channels[850] = "S19.2E-1-1022-6915";
 channelsnames[851] = "Montagne TV (S)";
 channels[851] = "S19.2E-1-1020-7001";
 channelsnames[852] = "M6 (S)";
-channels[852] = "S19.2E-1-1074-8367";
+channels[852] = "S19.2E-1-1100-8706";
 
 channelsnames[900] = "EuroNews (S)";
 channels[900] = "S19.2E-1-1091-31220";
diff --git a/channels3.js b/channels3.js
index 0248527..6f5892c 100644
--- a/channels3.js
+++ b/channels3.js
@@ -164,38 +164,48 @@ channelsnames[3201] = "NRK2 (S)";
 channels[3201] = "S5.0E-86-28-1502";
 channelsnames[3202] = "NRK Super / NRK3 (S)";
 channels[3202] = "S5.0E-86-28-3510";
+
+//TurkSat 42E scan
+//Channels with English soundtrack
+
 channelsnames[3500] = "DISCOVERY CHANNEL (S)";
 channels[3500] = "S42.0E-42-55000-3601";
-channelsnames[3501] = "CNN TÜRK (S)";
-channels[3501] = "S42.0E-66-3-1";
-channelsnames[3502] = "EURO D (S)";
-channels[3502] = "S42.0E-66-3-3";
-channelsnames[3503] = "ONE SUPER TV (S)";
-channels[3503] = "S42.0E-66-3-4";
-channelsnames[3504] = "DERMAN TV (S)";
-channels[3504] = "S42.0E-66-3-5";
-channelsnames[3505] = "KRAL POP (S)";
-channels[3505] = "S42.0E-66-3-6";
-channelsnames[3506] = "RETRO TV (S)";
-channels[3506] = "S42.0E-66-3-7";
-channelsnames[3507] = "BEATZ TV (S)";
-channels[3507] = "S42.0E-66-3-8";
-channelsnames[3508] = "BAL TV (S)";
-channels[3508] = "S42.0E-66-3-10";
-channelsnames[3509] = "CNN TÜRK RADYO (S)";
-channels[3509] = "S42.0E-66-3-11";
-channelsnames[3510] = "RADYO D (S)";
-channels[3510] = "S42.0E-66-3-12";
-channelsnames[3511] = "SLOW TÜRK (S)";
-channels[3511] = "S42.0E-66-3-13";
-channelsnames[3512] = "BEST FM (S)";
-channels[3512] = "S42.0E-66-3-14";
-channelsnames[3513] = "POP MUSIC TV (S)";
-channels[3513] = "S42.0E-66-3-32";
-channelsnames[3514] = "MUSICBOX TV (S)";
-channels[3514] = "S42.0E-66-3-33";
-channelsnames[3515] = "TV2 (S)";
-channels[3515] = "S42.0E-66-3-35";
+channelsnames[3501] = "TV2 (S)";
+channels[3501] = "S42.0E-66-3-35";
+channelsnames[3502] = "TRT BELGESEL (S)";
+channels[3502] = "S42.0E-1-1-18";
+channelsnames[3503] = "KIDZ/ANIMEZ (S)";
+channels[3503] = "S42.0E-42-55-100";
+channelsnames[3504] = "SPORTS TV (S)";
+channels[3504] = "S42.0E-42-502-14";
+channelsnames[3505] = "DUBLE TV (S)";
+channels[3505] = "S42.0E-42-55-2800";
+channelsnames[3506] = "World Travel Channel";
+channels[3506] = "S42.0E-42-1089-2";
+channelsnames[3507] = "CNN TÜRK (S)";
+channels[3507] = "S42.0E-66-3-1";
+channelsnames[3508] = "EURO D (S)";
+channels[3508] = "S42.0E-66-3-3";
+
+//TurkSat 42E scan
+//Unsorted
+
+channelsnames[3509] = "ONE SUPER TV (S)";
+channels[3508] = "S42.0E-66-3-4";
+channelsnames[3510] = "KRAL POP (S)";
+channels[3510] = "S42.0E-66-3-6";
+channelsnames[3511] = "RETRO TV (S)";
+channels[3511] = "S42.0E-66-3-7";
+channelsnames[3512] = "BEATZ TV (S)";
+channels[3512] = "S42.0E-66-3-8";
+channelsnames[3513] = "DERMAN TV (S)";
+channels[3513] = "S42.0E-66-3-5";
+
+channelsnames[3514] = "POP MUSIC TV (S)";
+channels[3514] = "S42.0E-66-3-32";
+channelsnames[3515] = "MUSICBOX TV (S)";
+channels[3515] = "S42.0E-66-3-33";
+
 channelsnames[3516] = "SILA TV (S)";
 channels[3516] = "S42.0E-66-3-37";
 channelsnames[3517] = "DHA FEED (S)";
@@ -214,62 +224,25 @@ channelsnames[3523] = "MEDYA TV (S)";
 channels[3523] = "S42.0E-66-3-48";
 channelsnames[3524] = "MÜJDE TV (S)";
 channels[3524] = "S42.0E-66-3-49";
-channelsnames[3525] = "SERVICE 1 (S)";
-channels[3525] = "S42.0E-66-3-81";
-channelsnames[3526] = "SERVICE 2 (S)";
-channels[3526] = "S42.0E-66-3-82";
-channelsnames[3527] = "SERVICE 3 (S)";
-channels[3527] = "S42.0E-66-3-83";
-channelsnames[3528] = "SERVICE 4 (S)";
-channels[3528] = "S42.0E-66-3-84";
+channelsnames[3525] = "BAL TV (S)";
+channels[3525] = "S42.0E-66-3-10";
+
+
 channelsnames[3529] = "TRT 1 (S)";
 channels[3529] = "S42.0E-1-1-1";
-channelsnames[3530] = "RADYO 1 (S)";
-channels[3530] = "S42.0E-1-1-2";
-channelsnames[3531] = "RADYO 3 (S)";
-channels[3531] = "S42.0E-1-1-3";
-channelsnames[3532] = "Radyo GAP (S)";
-channels[3532] = "S42.0E-1-1-4";
 channelsnames[3533] = "TRT HABER (S)";
 channels[3533] = "S42.0E-1-1-5";
-channelsnames[3534] = "RADYO 2 (TRT FM) (S)";
-channels[3534] = "S42.0E-1-1-6";
-channelsnames[3535] = "RADYO 4 (S)";
-channels[3535] = "S42.0E-1-1-7";
-channelsnames[3536] = "Radyo 6 (S)";
-channels[3536] = "S42.0E-1-1-8";
 channelsnames[3537] = "TRT TURK (S)";
 channels[3537] = "S42.0E-1-1-9";
-channelsnames[3538] = "VOT World (S)";
-channels[3538] = "S42.0E-1-1-10";
-channelsnames[3539] = "TSR Turkce (S)";
-channels[3539] = "S42.0E-1-1-11";
+
 channelsnames[3540] = "TRT 3 (S)";
 channels[3540] = "S42.0E-1-1-12";
-channelsnames[3541] = "Meteorolojinin Sesi (S)";
-channels[3541] = "S42.0E-1-1-13";
-channelsnames[3542] = "VOT West (S)";
-channels[3542] = "S42.0E-1-1-14";
-channelsnames[3543] = "VOT East (S)";
-channels[3543] = "S42.0E-1-1-15";
 channelsnames[3544] = "TRT 4-COCUK (S)";
 channels[3544] = "S42.0E-1-1-16";
-channelsnames[3545] = "TRT NAGME (S)";
-channels[3545] = "S42.0E-1-1-17";
-channelsnames[3546] = "TRT BELGESEL (S)";
-channels[3546] = "S42.0E-1-1-18";
-channelsnames[3547] = "TRT AVRUPA FM (S)";
-channels[3547] = "S42.0E-1-1-19";
-channelsnames[3548] = "TRT TURKU (S)";
-channels[3548] = "S42.0E-1-1-20";
-channelsnames[3549] = "TRT Intercom (S)";
-channels[3549] = "S42.0E-1-1-21";
+
 channelsnames[3550] = "TRT OKUL (S)";
 channels[3550] = "S42.0E-1-1-22";
-channelsnames[3551] = "RDS (S)";
-channels[3551] = "S42.0E-1-1-23";
-channelsnames[3552] = "KIDZ/ANIMEZ (S)";
-channels[3552] = "S42.0E-42-55-100";
+
 channelsnames[3553] = "Sci Tech TV (S)";
 channels[3553] = "S42.0E-42-55-300";
 channelsnames[3554] = "SINEMA TV (S)";
@@ -300,8 +273,7 @@ channelsnames[3566] = "DEPOMEPO TV (S)";
 channels[3566] = "S42.0E-42-55-2600";
 channelsnames[3567] = "LAGUN TV (S)";
 channels[3567] = "S42.0E-42-55-2700";
-channelsnames[3568] = "DUBLE TV (S)";
-channels[3568] = "S42.0E-42-55-2800";
+
 channelsnames[3569] = "KON TV (S)";
 channels[3569] = "S42.0E-42-3-1";
 channelsnames[3570] = "HALK TV (S)";
@@ -328,24 +300,7 @@ channelsnames[3580] = "TATLISES TV (S)";
 channels[3580] = "S42.0E-42-3-13";
 channelsnames[3581] = "REHBER TV (S)";
 channels[3581] = "S42.0E-42-3-14";
-channelsnames[3582] = "YON RADYO (S)";
-channels[3582] = "S42.0E-42-3-18";
-channelsnames[3583] = "RIBAT FM (S)";
-channels[3583] = "S42.0E-42-3-19";
-channelsnames[3584] = "RADYO MEGA (S)";
-channels[3584] = "S42.0E-42-3-20";
-channelsnames[3585] = "MUJDE AKDENIZ (S)";
-channels[3585] = "S42.0E-42-3-21";
-channelsnames[3586] = "KONYA FM (S)";
-channels[3586] = "S42.0E-42-3-26";
-channelsnames[3587] = "VIZYON TURK (S)";
-channels[3587] = "S42.0E-42-3-27";
-channelsnames[3588] = "CAGRI FM (S)";
-channels[3588] = "S42.0E-42-3-29";
-channelsnames[3589] = "T KACKAR (S)";
-channels[3589] = "S42.0E-42-3-30";
-channelsnames[3590] = "ANC RADYO (S)";
-channels[3590] = "S42.0E-42-3-31";
+
 channelsnames[3591] = "EM TV (S)";
 channels[3591] = "S42.0E-42-502-1";
 channelsnames[3592] = "UZAY TV (S)";
@@ -370,16 +325,9 @@ channelsnames[3601] = "TURKIYEM TV (S)";
 channels[3601] = "S42.0E-42-502-11";
 channelsnames[3602] = "MCJ MEDIASA (S)";
 channels[3602] = "S42.0E-42-502-12";
-channelsnames[3603] = "DOLUNAY FM (S)";
-channels[3603] = "S42.0E-42-502-13";
-channelsnames[3604] = "SPORTS TV (S)";
-channels[3604] = "S42.0E-42-502-14";
-channelsnames[3605] = "BAYRAM FM (S)";
-channels[3605] = "S42.0E-42-502-15";
 channelsnames[3606] = "SUN TV (S)";
 channels[3606] = "S42.0E-42-502-16";
-channelsnames[3607] = "SILA RADYO (S)";
-channels[3607] = "S42.0E-42-502-17";
+
 
 
 maxChan[3] = 3607; // set to max channel else you see 'undefined' in guide view
diff --git a/index.html b/index.html
index 060aa0a..b995155 100644
--- a/index.html
+++ b/index.html
@@ -20,7 +20,7 @@
 //
 //
 
-var Version = "0.22.2"
+var Version = "0.22.3"
 
 for (var x = 0;  x < 10; x++) { 
 	searchtimers[x] = "" ; // To solve displaying undefined
@@ -272,12 +272,12 @@ function onDataAvailableEvent(event) {
 	dataAvailable = event.status;
 	//alert("onDataAvailableEvent : " + event.status);
 	if(event.status==true) {
-		updateStreamInfo();
+		updateStreamInfo(currChan);
 	} 
 }
 
 
-function updateStreamInfo() {
+function updateStreamInfo(currStream) {
 
 //alert("What can this stream do : " + mediaPlayer.getCapabilities());
 	var mpCap = "";
@@ -315,16 +315,16 @@ var streamInfo = mediaPlayer.getStreamInfo();
 var cList = streamInfo.availableComponents;
 var x;
 xx = 0;
-AudioInfo[currChan] = "";
+AvInfo[currStream] = "";
 for(x=0; x<cList.length;x++) {
 	if(cList[x].type == 0) {
 	xx = xx + 1;
-	AudioInfo[currChan] = AudioInfo[currChan] + " Audio " + xx + " " + mediaPlayer.getAudioStreamInfo(cList[x]).encoding + " - " + mediaPlayer.getAudioStreamInfo(cList[x]).language + " , ";
+	AvInfo[currStream] = AvInfo[currStream] + " Audio " + xx + " " + mediaPlayer.getAudioStreamInfo(cList[x]).encoding + " - " + mediaPlayer.getAudioStreamInfo(cList[x]).language + " , ";
 	}
 	if(cList[x].type == 1) {
-	AudioInfo[currChan] = AudioInfo[currChan] + " Video " + mediaPlayer.getVideoStreamInfo(cList[x]).encoding + " size : " + mediaPlayer.getVideoStreamInfo(cList[x]).resolutionX + " x " + mediaPlayer.getVideoStreamInfo(cList[x]).resolutionY;
-	if (mediaPlayer.getVideoStreamInfo(cList[x]).aspectRatio == "1") { AudioInfo[currChan] = AudioInfo[currChan] + " (4:3)"; }
-	if (mediaPlayer.getVideoStreamInfo(cList[x]).aspectRatio == "2") { AudioInfo[currChan] = AudioInfo[currChan] + " (16:9)"; }
+	AvInfo[currStream] = AvInfo[currStream] + " Video " + mediaPlayer.getVideoStreamInfo(cList[x]).encoding + " size : " + mediaPlayer.getVideoStreamInfo(cList[x]).resolutionX + " x " + mediaPlayer.getVideoStreamInfo(cList[x]).resolutionY;
+	if (mediaPlayer.getVideoStreamInfo(cList[x]).aspectRatio == "1") { AvInfo[currStream] = AvInfo[currStream] + " (4:3)"; }
+	if (mediaPlayer.getVideoStreamInfo(cList[x]).aspectRatio == "2") { AvInfo[currStream] = AvInfo[currStream] + " (16:9)"; }
 	}
 
 	}
@@ -1026,7 +1026,7 @@ function OSDhtml(){
 	    osdname.innerHTML = Left(channelsnames[currChan],30);
 	}
     osdepg.innerHTML = "<p>" + EPG[0][7][currChan] + "</p>\n<p>" + EPG[1][7][currChan] + "</p>";
-    osdepginfo.innerHTML =  "<center><p style='color:white;' >" + currChan + "\uE003" + channelsnames[currChan] + "</p>" + AudioInfo[currChan] + "<p style='color:white;'>" + EPG[0][7][currChan] + EPG[0][9][currChan] + EPG[0][8][currChan] + "</p>\n<p style='color:yellow;'>" + EPG[0][4][currChan] + "</p>\n<p>" + Left(EPG[0][5][currChan],750) + "</p></center>";
+    osdepginfo.innerHTML =  "<center><p style='color:white;' >" + currChan + "\uE003" + channelsnames[currChan] + "</p>" + AvInfo[currChan] + "<p style='color:white;'>" + EPG[0][7][currChan] + EPG[0][9][currChan] + EPG[0][8][currChan] + "</p>\n<p style='color:yellow;'>" + EPG[0][4][currChan] + "</p>\n<p>" + Left(EPG[0][5][currChan],750) + "</p></center>";
     osdepginfonext.innerHTML =  "<center><p style='color:white;'>"  + currChan + "\uE003" + channelsnames[currChan] + "</p><p style='color:white;'>" +  EPG[1][7][currChan] + EPG[1][9][currChan] + EPG[1][8][currChan] + "</p>\n<p style='color:yellow;'>" + EPG[1][4][currChan] + "</p>\n<p>" + Left(EPG[1][5][currChan],750) + "</p></center>";
 }
 
@@ -2225,7 +2225,7 @@ function LoadTimers() {
 }
 
 
-function LoadTimersServer_1() {
+function LoadTimersServer() {
 //Get timers from SmartTVweb
 try {
    xmlhttp=new XMLHttpRequest();
@@ -2242,8 +2242,9 @@ try {
 	  timersStrt[i] = Right("000" + x[i].getElementsByTagName("start")[0].childNodes[0].nodeValue,4);
 	  timersStop[i] = Right("000" + x[i].getElementsByTagName("stop")[0].childNodes[0].nodeValue,4);
 
-	  timersEvnt[i] = 0; // x[i].getElementsByTagName("eventid")[0].childNodes[0].nodeValue; // event_id
-	  timersID[i] = x[i].getElementsByTagName("channelid")[0].childNodes[0].nodeValue; // channel_id
+	  timersEvnt[i] = x[i].getElementsByTagName("eventid")[0].childNodes[0].nodeValue; // event_id
+//	  timersID[i] = x[i].getElementsByTagName("channelid")[0].childNodes[0].nodeValue; // channel_id
+	  timersChan[i]  = x[i].getElementsByTagName("channelid")[0].childNodes[0].nodeValue; // channel_id
 	  timersName[i] = x[i].getElementsByTagName("channelname")[0].childNodes[0].nodeValue + fill;
 	  timersDay[i] = x[i].getElementsByTagName("day")[0].childNodes[0].nodeValue;
 	  timersDays[i] = new Date(timersDay[i]*1000);
@@ -2264,9 +2265,6 @@ try {
 	  timerOK = 1;
 	  }
 
-//	timers.sort(); // sorts only timers, (so all others are way off timers[0] <> timersflag[0] etc)
-
-
   } catch(e) {
     timerOK = 0;
     alert("Get Timers problem: " + e);
@@ -2280,11 +2278,11 @@ try {
 	xmlhttp=new XMLHttpRequest();
 //
 // SmartTVWeb
-//	xmlhttp.open("GET",(recServ + "/deleteTimer?guid=" + timersID[timerID] + "&dy=" + timersDay[timerID] 
-//								+ "&st=" + timersStrt[timerID] + "&sp=" + timersStop[timerID]),false);
+	xmlhttp.open("GET",(recServ + "/deleteTimer?guid=" + timersChan[timerID] + "&dy=" + timersDay[timerID] 
+			+ "&st=" + timersStrt[timerID] + "&sp=" + timersStop[timerID] + "&" + new Date().getTime()),false);
 // smarttvweb delete & restful reading
-	var x = timersID[timerID].split(":");
-	xmlhttp.open("GET",(recServ + "/deleteTimer?guid=" + x[0] + "&dy=" + x[2] + "&st=" + x[3] + "&sp=" + x[4] + "&" + new Date().getTime()),false);
+//	var x = timersID[timerID].split(":");
+//	xmlhttp.open("GET",(recServ + "/deleteTimer?guid=" + x[0] + "&dy=" + x[2] + "&st=" + x[3] + "&sp=" + x[4] + "&" + new Date().getTime()),false);
 //
 //
 	xmlhttp.send();
@@ -2295,20 +2293,7 @@ try {
 }
 
 
-function DeleteTimers_old() {
-try {
-	xmlhttp=new XMLHttpRequest();
-	xmlhttp.open("POST",(RestFulAPI + "/timers/" + timersID[timerID]),false);
-	xmlhttp.send();
-
-  } catch(e) {
-    alert("Deleting Timers problem: " + e);
-  }
-}
-
-
-
-function LoadTimersServer() {
+function LoadTimersServer_1() {
 //Get timers from RestFulApi
 try {
    xmlhttp=new XMLHttpRequest();
@@ -3637,6 +3622,7 @@ function BackToTV() {
 	    	mediaList.style.opacity = 0.9;
 	    	showDisplay("STOP", false, 100, 0 );
 	    	showMediaList();
+		AvInfo.length = 0;
 	    }
 }
 
@@ -3705,13 +3691,18 @@ function ShowInfo() {
 	h=addzero(h);
 	m=addzero(m);
         result = ''+days[day]+' '+d+' '+months[month]+' '+year+' '+h+':'+m;
+	if ( mediaList.style.opacity == 0 ) { updateStreamInfo(currMed);} else { AvInfo[currMed] = "";}
+
 	if (year!==1970) { 	
-       		osdepginfo.innerHTML = "<center><pre style='color:white;'>" + Left(recTitl[currMed],60) + "\n " + result + "\n " 
-					+ (recDura[currMed] / 60).toFixed(0) + Lang[54] + "\n " + recChan[currMed] + "  " 
+       		osdepginfo.innerHTML = "<center><pre style='color:white;'>" + Left(recTitl[currMed],60) 
+					+ "</pre> " + AvInfo[currMed] + "<pre style='color:white;'> " 
+					+ result + "\n " 
+					+ (recDura[currMed] / 60).toFixed(0) + Lang[54] + "\n " + 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>";
+	       	osdepginfo.innerHTML = "<center><pre style='color:white;'>" + Left(recTitl[currMed],60) 
+					+ "\n </pre><p>" + AvInfo[currMed] + " " + "\n \n </pre></center>";
 	}
 }
 
diff --git a/settings.js b/settings.js
index d8c568f..bc7e487 100644
--- a/settings.js
+++ b/settings.js
@@ -199,7 +199,7 @@ var fsReclist = (19*Yfactor) + "px";
 var fsMedia = (27*Yfactor) + "px";
 var fsKeys = (19*Yfactor) + "px";
 
-var AudioInfo = new Array();
+var AvInfo = new Array();
 var xx = 0;
 
 var isRecording = 0; // set by recording subroutine