From 926551df881a80b8a8e18e35405bc8de1c515b11 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Thu, 22 May 2014 12:04:36 +0200 Subject: Clean up & EPG Mode selector added --- index.html | 104 ++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 43 deletions(-) (limited to 'index.html') diff --git a/index.html b/index.html index 77d4578..552cc75 100644 --- a/index.html +++ b/index.html @@ -19,8 +19,15 @@ window.onkeydown = onKeyDown; function onLoad() { is = toi.informationService; + ss = toi.schedulerService; + aos = toi.audioOutputService; + vos = toi.videoOutputService; + fps = toi.frontPanelService; + ams = toi.assetManagerService; + GetSettings(); createPlayer(); + createEitCache(); if(pipPlayer){ addPipVideoplane(); @@ -31,13 +38,16 @@ function onLoad() { } embedTeletextPlugin(); - toi.audioOutputService.setVolume(AudioOut, StartVolume); - toi.audioOutputService.setMuteState(AudioOut, false); + aos.setVolume(AudioOut, StartVolume); + aos.setMuteState(AudioOut, false); showDisplay(Right(currChan.toString(),4), false, 100, 0 ); play(channels[currChan]); - eitCache = toi.dvbEitService.createInstance(); - eitCache.setFilterMode(eitCache.FILTER_MODE_PF_AND_SCHEDULE); -// eitCache.setFilterMode(eitCache.FILTER_MODE_PF_ONLY); + + if (EPGMode) { + eitCache.setFilterMode(eitCache.FILTER_MODE_PF_AND_SCHEDULE); + } else { + eitCache.setFilterMode(eitCache.FILTER_MODE_PF_ONLY); + } eitCache.addEventListener(eitCache.ON_CACHE_UPDATED, onCacheUpdated); mediaPlayer.addEventListener(mediaPlayer.ON_DATA_AVAILABLE,onDataAvailableEvent); mediaPlayer.addEventListener(mediaPlayer.ON_STATE_CHANGED, MPD); @@ -60,10 +70,10 @@ function onLoad() { is.addEventListener(is.ON_OBJECTS_CHANGED, onEvent); is.subscribeObject(onEvent, "var.io.state", true); - 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, "*"); + ss.addEventListener(ss.ON_SCHEDULED_START, onScheduledStart); + ss.addEventListener(ss.ON_SCHEDULED_STOP, onScheduledStop); + ss.setCategorySubscription(onScheduledStart, "*"); + ss.setCategorySubscription(onScheduledStop, "*"); setOSDscale(); SetupFonts(); @@ -337,7 +347,7 @@ function VolumeUp() { if (Volume > 100) { Volume = 100; } - toi.audioOutputService.setVolume(AudioOut, Volume); + aos.setVolume(AudioOut, Volume); showVolume(); } @@ -352,18 +362,26 @@ function VolumeDown() { if (Volume < 0) { Volume = 0; } - toi.audioOutputService.setVolume(AudioOut, Volume); + aos.setVolume(AudioOut, Volume); showVolume(); } function VolumeMute() { - state = toi.audioOutputService.getMuteState(AudioOut); - toi.audioOutputService.setMuteState(AudioOut, !state); + state = aos.getMuteState(AudioOut); + aos.setMuteState(AudioOut, !state); mute = 1 - state; osdmute.style.opacity = mute; } +function createEitCache() { + try { + eitCache = toi.dvbEitService.createInstance(); + } catch(e) { + alert("Failed getting eitCache: " + e); + } +} + function createPlayer() { try { mediaPlayer = toi.mediaService.createPlayerInstance(); @@ -578,7 +596,7 @@ for(x=0; x x[x.length-1] ) { timerID = x[x.length-1]; } } else if (menu == 5 || menu == 7 || menu == 10) { timerID += 1; @@ -2259,7 +2276,7 @@ function onKeyMenu(keyCode) { break; case "Accept": if (menu == 2 && isMediaMenu !== 1) { - var x = toi.schedulerService.getParameter(timerID, "assetURI"); + var x = ss.getParameter(timerID, "assetURI"); getRecOK = 0; LoadMediaSettings(); isSetupMenu = 0; @@ -2299,10 +2316,10 @@ function onKeyMenu(keyCode) { InitMenu(menu); break; } else if (menu == 2) { - var x = toi.schedulerService.getBookingIds("*", 0, 0); + var x = ss.getBookingIds("*", 0, 0); if (x.length > 0) { alert(timerID); //Show timerID for debug, some times it won't delete. - toi.schedulerService.remove(timerID); + ss.remove(timerID); timer[timerID] = ""; LoadTimers(); if (timer.length !== 0) { do { timerID = timerID + 1; } while (!timer[timerID] && (timerID < timer.length)) } @@ -2409,13 +2426,13 @@ function onKeyMenu(keyCode) { case "MediaRewind": if (menu == 1) { if (experimental) { // mute output 0 (analog out), keep output 3 'decoder output' unmuted - toi.audioOutputService.setVolume(0, 0); + aos.setVolume(0, 0); } } break; case "MediaForward": if (menu == 1) { - if (experimental) { toi.audioOutputService.setVolume(0, 100); } + if (experimental) { aos.setVolume(0, 100); } } break; @@ -2721,7 +2738,7 @@ if(menu == 1) { // settings menu if(menu == 2) { // Timers menu booking = ""; var x = timerID - 1; - var y = toi.schedulerService.getBookingIds("*", 0, 0); + var y = ss.getBookingIds("*", 0, 0); if (y.length !== 0) { for (var i=0;i<10;i++) { if (timer.length !== 0) { do { x += 1; } while (!timer[x] && (x < timer.length)) } @@ -2834,7 +2851,8 @@ if(menu == 9) { // INFO2 Menu htmltext += "Experimental 2"; htmltext += "\n getmarks from"; if (Number(is.getObject("vip.getmarks"))) { htmltext += " smarttvweb "; } else { htmltext += " restfulapi "; } - + htmltext += "\n EPGMode : " + if (EPGMode) { htmltext += "Full EPG"; } else { htmltext += "Now/Next Only"; } } catch(e) { alert("Error : " + e); } @@ -2872,12 +2890,12 @@ function SetGroup(isgroup) { function LoadTimers() { timer.length = 0; var booking = ""; - var x = toi.schedulerService.getBookingIds("*", 0, 0); + var x = ss.getBookingIds("*", 0, 0); for (var i=0;i