From 0fe985456a7748fedec2d918741463db58c31b72 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Tue, 12 Feb 2013 10:22:52 +0100 Subject: some bug fixes EPG updates --- History | 2 + index.html | 136 ++++++++++++++++++++++++++++++++---------------------------- settings.js | 2 +- 3 files changed, 76 insertions(+), 64 deletions(-) diff --git a/History b/History index 2a8cbbf..49841f2 100644 --- a/History +++ b/History @@ -3,6 +3,8 @@ Updated EPG-Schedule view, for every item a switch timer can be set. With up/down scrolling through Schedule is possible Guide view still uses the old Schedule View. View Timer menu now also shows day & date. + Set timer for local recording. + Fixed crash when no EPG and users presses up/down 0.16 EPG/schedule info remove on channel switch diff --git a/index.html b/index.html index 70ba5f1..47e1912 100644 --- a/index.html +++ b/index.html @@ -37,6 +37,20 @@ for (var x = 0; x < 10; x++) { window.onkeydown = onKeyDown; function onLoad() { +/* + //Searching for a way to get recordings ID. + var x = toi.assetManagerService.getDefinedProperties(); + alert(x.length); + for (var i=0; i"; - setOSDtimer(); - } else { - // - // No Switch timer so send timer info to Server - // + } else if(SwitchTimer == 2) { + try { + toi.schedulerService.setParameter(toi.schedulerService.schedule("RecLocal","record_hd_from_ip", ProgTime , ProgDura), "Channel", currChan.toString() ); + } + catch (e) { + alert(e); + } } + tijd = ProgTime; + date = new Date(tijd*1000); + tijd = date.toUTCString(); + tijd = new Date(tijd); + var tm = tijd.getMinutes(); + var th = tijd.getHours(); + th=addzero(th); + tm=addzero(tm); + switchtimer.innerHTML = "
  Name      : " + Left(ProgName,30) + "\n  channel   : " + channelsnames[currChan] +  "\n  Starttime : " + th + ":" + tm + "
"; + setOSDtimer(); + } @@ -1496,6 +1508,7 @@ function onKeyMenu(keyCode) { var x = toi.schedulerService.getBookingIds("*", 0, 0); if (x.length > 0) { toi.schedulerService.remove(timerID); + timer[timerID] = ""; LoadTimers(); if (timer.length !== 0) { do { timerID = timerID + 1; } while (!timer[timerID] && (timerID < timer.length)) } setOSDtimer(); @@ -1805,6 +1818,7 @@ if(menu == 5) { // Timers from Server } // end of initmenu function LoadTimers() { + timer.length = 0; var booking = ""; var x = toi.schedulerService.getBookingIds("*", 0, 0); for (var i=0;i Nederlands "; - setTimeout("osdlang.style.opacity = 0; ", 3000); - } else if(audio == 2) { - is.setObject("cfg.media.audio.languagepriority","ger,deu,eng",is.STORAGE_VOLATILE); - osdlang.style.opacity = 1; - osdlang.style.fontSize = fsAudio; - osdlang.style.color = "red"; - osdlang.innerHTML = " Deutsch "; - setTimeout("osdlang.style.opacity = 0; ", 3000); - } else if(audio == 3) { - is.setObject("cfg.media.audio.languagepriority","eng",is.STORAGE_VOLATILE); - osdlang.style.opacity = 1; - osdlang.style.fontSize = fsAudio; - osdlang.style.color = "black"; - osdlang.innerHTML = " English "; - setTimeout("osdlang.style.opacity = 0; ", 3000); - audio = 0; - } - } - break; case "Blue": + if (getRecOK !== 0) { ShowInfo(); osdepginfo.style.opacity = 1 - osdepginfo.style.opacity; + } break; case "VolumeMute": @@ -2100,6 +2095,17 @@ if (DelisOK) { showVolume(); break; + case KEY_REC: + case "MediaRecord": + if (getRecOK == 2) { //set timer + SwitchTimer = 2; + settimer(recStrt[currMed],recTitl[currMed],recDura[currMed]); + SwitchTimer = 1; + switchtimer.style.opacity = 1; + setTimeout("switchtimer.style.opacity = 0; ", 2000); + } + break; + default: break; } // end of switch @@ -2535,6 +2541,7 @@ try { function getSchedule(schchan){ SI = ""; recTitl.length = 0; + nrMedia = 0; try { StreamInfo(schchan); @@ -2572,8 +2579,11 @@ function getSchedule(schchan){ m=addzero(m); recList[i] = ' ' + days[day] + ' ' + d + ' ' + months[month] + ' ' + year + " " + h + ":" + m + " (" + (recDura[i]/60).toFixed(0) + ") " + Left(recTitl[i],30); } - } getRecOK = 2; + } else { + getRecOK = 0; + mediaList.innerHTML = "

EPG 
\n\n\nNO EPG on this channel!!!

"; + } } catch(e) { getRecOK = 0; mediaList.innerHTML = "

EPG 
\n\n\nERROR getting EPG !!!

"; @@ -2752,20 +2762,20 @@ function onScheduledStart(event) { currChan = Number(toi.schedulerService.getParameter(event.booking.id, "Channel")); ChanGroup = Number(Left((currChan / 1000),1)); play(channels[currChan]); - alert (ChanGroup); } } else { try { createNewAsset() - var recChannr = channels[toi.schedulerService.getParameter(event.booking.id, "Channel")]; + var recChannr = Number(toi.schedulerService.getParameter(event.booking.id, "Channel")); + var recGroup = Number(Left((recChannr / 1000),1)); var recChan = 0; - if (ServerAdres[Left(recChannr,1)] == "MultiCast" ) { + if (ServerAdres[recGroup] == "MultiCast" ) { SI=channels[recChannr].split("-"); recChan = SI[4]; - } else { - recChan = ServerAdres[Left(recChannr,1)] + channels[recChannr]; - } + } else { + recChan = ServerAdres[recGroup] + channels[recChannr]; + } mediaRecorder.open(recChan, assetId); diff --git a/settings.js b/settings.js index 8986b78..f2444f7 100644 --- a/settings.js +++ b/settings.js @@ -146,7 +146,7 @@ var preChan = 0; var timerChan = 10; var TimerActions = ""; var switchtimerID = 0; -var SwitchTimer = 1; // No other options yet +var SwitchTimer = 1; // 1 - switchonly, 2 - record local, 3 - record on server (only 1 & 2 are working) var initialDelayID = 0; var switchicon = "\uE003"; -- cgit v1.2.3