From 0a1d5a21449281d2ec6355a1924b2c32ad16cb67 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Fri, 11 Oct 2013 20:52:28 +0200 Subject: Some experimental parts added --- index.html | 40 +++++++++++++++++++++++++++++++--------- settings.js | 2 +- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/index.html b/index.html index 1931292..5dc77c4 100644 --- a/index.html +++ b/index.html @@ -152,6 +152,19 @@ function GetSettings() { toi.informationService.setObject("vip.OSDlanguage","0",toi.informationService.STORAGE_PERMANENT) } + try { + if (!toi.informationService.getObject("vip.testing")) {} + } catch(e) { + toi.informationService.setObject("vip.testing","0",toi.informationService.STORAGE_PERMANENT) + } + + + try { + if (!toi.informationService.getObject("vip.resolution")) {} + } catch(e) { + toi.informationService.setObject("vip.resolution","2",toi.informationService.STORAGE_PERMANENT) + } + var sel_group; for (var i=0;i<10;i++) { @@ -176,14 +189,11 @@ function GetSettings() { audio = Number(toi.informationService.getObject("vip.languagepriority")); server_ip = server_ip_array[Number(toi.informationService.getObject("vip.serveraddress"))]; for (var i=0;i<10;i++) { if (ServerAdres[i] !== "FullURL" && ServerAdres[i] !== "MultiCast") {ServerAdres[i] = server_ip + StreamPort;} } + lang_nr = Number(toi.informationService.getObject("vip.OSDlanguage")); loadjs(langfile[lang_nr]); - try { - if (!toi.informationService.getObject("vip.resolution")) {} - } catch(e) { - toi.informationService.setObject("vip.resolution","2",toi.informationService.STORAGE_PERMANENT) - } + experimental = Number(toi.informationService.getObject("vip.testing"));// Use some experimental code Set_Res = Number(toi.informationService.getObject("vip.resolution")); VideoOutput(); @@ -709,6 +719,7 @@ function onKeyDown(event) { } } break; + case "Info": case "Blue": // if(isFullscreen) { // RestartPortal(); @@ -1160,7 +1171,7 @@ function OSDchannr(channr) { osdnr.innerHTML = "
" + Right(channr,3) + "
"; // Show logo's -// if (experimental == "yes" ) { +// if (experimental) { // osdnr.innerHTML = ""; // } @@ -2126,12 +2137,19 @@ function onKeyMenu(keyCode) { osdepginfo.innerHTML = SearchTimer[timerID] ; osdepginfo.style.opacity = 1 - osdepginfo.style.opacity; } - - break; case "MediaRewind": + if (menu == 1) { + if (experimental) { // mute output 0 (analog out), keep output 3 'decoder output' unmuted + toi.audioOutputService.setVolume(0, 0); + } + } break; case "MediaForward": + if (menu == 1) { + if (experimental) { toi.audioOutputService.setVolume(0, 100); } + } + break; case "MediaStop": if (menu == 1) { @@ -2475,6 +2493,10 @@ if(menu == 4) { // INFO Menu if (fullupdate !== 0) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; } htmltext += "Full EPG Update "; + experimental = Number(is.getObject("vip.testing")); + if (experimental) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; } + htmltext += "Experimental"; + } catch(e) { alert("Error : " + e); } @@ -3738,7 +3760,7 @@ function getSchedule(schchan){ mediaList.innerHTML = "

" + Lang[11] + "
\n\n\n" + Lang[52] + "

"; - if (experimental == "yes" ) { + if (experimental) { mediaList.innerHTML += ""; } diff --git a/settings.js b/settings.js index 9af8786..6d87eab 100644 --- a/settings.js +++ b/settings.js @@ -8,7 +8,7 @@ var server_ip = server_ip_array[0]; // default server var StartVolume = 15; // Volume on (re)start of the portal. var currChan = 10; // default channel -var experimental = "yes" ;// Use some experimental code +var experimental;// Use some experimental code var lang_nr; OSDLang = new Array ("English", "Nederlands"); -- cgit v1.2.3