From 77ba23bf2a336961b8b2e17b0abacda3987742c4 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Thu, 4 Dec 2014 18:43:40 +0100 Subject: Added MAC address based config file. Renamed settings2 --- index.html | 2 +- javascript/guide_view.js | 148 +++++++++++++++++++++++++++++++++++++++++++++++ javascript/main.js | 4 ++ javascript/settings.js | 3 +- javascript/settings2.js | 148 ----------------------------------------------- 5 files changed, 155 insertions(+), 150 deletions(-) create mode 100644 javascript/guide_view.js delete mode 100644 javascript/settings2.js diff --git a/index.html b/index.html index 88e122c..62be34a 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ - + diff --git a/javascript/guide_view.js b/javascript/guide_view.js new file mode 100644 index 0000000..f20693f --- /dev/null +++ b/javascript/guide_view.js @@ -0,0 +1,148 @@ + +var fsList; var fsSchedList; var fsSched; + +var color_bg = "#fc5"; +var color_sched_head = "color:white"; +var color_sched_font = "color:black"; + +//var color_progress1 = ""; +//var color_progress2 = ""; + + +function setOSDscale() { + fsList = "34px"; //1080 = 34, 720 = 23, 576 = 18 + fsSchedList = "34px"; //1080 = 34, 720 = 23, 576 = 18 + fsSched = "49px"; //1080 = 49, 720 = 33, 576 = 26 +} + + +function GuideView_start() { + NowNext = 0; + videoplane.style.width = "44%"; + videoplane.style.height = "42%"; + videoplane.style.left = "53%"; + videoplane.style.top = "52%"; + isFullscreen = 0; + ClearScreen(); + channellist.style.opacity = 1; + colorkeys.innerHTML = "
" + " "
+				+  NN[3 + (1 - NowNext)] + "  " 
+				+ NN[1 - NowNext] + "  " + NN[2] + "  " 
+				+ NN[5] + "
"; + colorkeys.style.opacity = 1; + showChannelList(); + if(!SwitchGuide) { + preChan = currChan; + preGrp = ChanGroup; + } +} + +function GuideView_end() { + isSchedule = 0; + schedule.style.opacity = 0; + isFullscreen = 1; + FullScreen(); + if(!SwitchGuide) { + currChan = preChan; + ChanGroup = preGrp; + } +} + + + +function GetSchedule(schchan,tablelength){ + //Old style Schedule, used in Guide View. + SI = ""; + try { + StreamInfo(schchan); + + eitService = toi.statics.ToiDvbEitCacheServiceItem.create(SI[1],SI[2],SI[3]); + eitCache.addService(eitService); + event = eitCache.getPresentEvent(eitService); + events = eitCache.getEvents(eitService, (Math.round(new Date().getTime()/1000.0)), 2000000000); + + if (event.name) { + if (events.more) { + var t = eitCache.getEvents(eitService, (Math.round(new Date().getTime()/1000.0)), 2000000000); + events.infoSequence.concat(t.infoSequence); + events.more = t.more; + } + + var txt = ""; + var i = 0; + for (i = 0; i < events.infoSequence.length && i < tablelength; i++) { + + while ((i > 0) && (events.infoSequence[i].eventId == events.infoSequence[(i-1)].eventId)) { + i = i + 1; + } + + tijd = events.infoSequence[i].time; + 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); + + txt = txt + ""; + } + txt = txt + "
\uE003\uE003\uE003\uE003\uE003" + th + ":" + tm + " (" + (events.infoSequence[i].duration/60).toFixed(0) + ") " + Left(events.infoSequence[i].name,30) + "
"; + schedule.innerHTML = "

" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + txt + "

"; + } else { + schedule.innerHTML = "

" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "

"; + } + + } catch(e) { + alert("Get EPG problem: " + e); + schedule.innerHTML = "

" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "

" + Lang[6] + "

"; + } + +} + + +// Channelslist / EPG Guide +// +// show currchan - 5 +// highlite currchan +// show currchan + 5 +// +// check if chan is OK +// +function showChannelList() { + var liststyle = ""; + var htmlstring = ""; + listChan = currChan-5; + for(var i=currChan-5; i<=currChan+5; i++) { + do + { + listChan += 1; + if (listChanmaxChan[ChanGroup]) { + listChan=minChan[ChanGroup]; + } + } + + while (!channels[listChan] && (listChan\uE003\uE003" + listChan + "\uE003"; + } + htmlstring = htmlstring + "
" + Left(channelsnames[listChan],15) + "\uE003" + Left(EpgInfo[NowNext],64) + "
"; + channellist.innerHTML = htmlstring; + chanlistepg.innerHTML = "

" + EPG[NowNext][1][currChan] + "

" + Left(EPG[NowNext][4][currChan],250) + "

" ; + +} + + +// END of Channelslist / EPG Guide + diff --git a/javascript/main.js b/javascript/main.js index a6f241c..fa68151 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -159,6 +159,9 @@ function GetSettings() { lang_nr = Number(is.getObject("vip.OSDlanguage")); loadjs(langfile[lang_nr]); + MACaddress = is.getObject("const.ip.eth0.mac"); + loadjs(conf_dir + MACaddress + ".js"); + experimental = Number(is.getObject("vip.testing"));// Use some experimental code testing2 = Number(is.getObject("vip.testing2"));// Use some experimental code ShowSubs = Number(is.getObject("vip.showsubs")); @@ -2791,6 +2794,7 @@ if(menu == 4) { // INFO Menu htmltext += "\n Product name: " + is.getObject("config.productdisplayname"); htmltext += "\n Build date : " + is.getObject("config.build.date"); htmltext += "\n\n IP address : " + is.getObject("config.ipaddress"); + htmltext += "\n MACaddress : " + MACaddress; var x = is.getObject("cfg.ip.eth0.mode"); if (x == "DHCP") { htmltext += "\n \uE003\uE017 "; } else { htmltext += "\n \uE003\uE016 "; } diff --git a/javascript/settings.js b/javascript/settings.js index b2b5787..ef91256 100644 --- a/javascript/settings.js +++ b/javascript/settings.js @@ -2,7 +2,7 @@ // Default settings // -var Version = "0.26.8"; +var Version = "0.26.9"; server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://192.168.178.56","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21","http://192.168.2.100","http://192.168.178.52"); @@ -12,6 +12,7 @@ var currChan = 10; // default channel OSDLang = new Array ("English", "Nederlands", "Deutsch"); langfile = new Array ("languages/lang_eng.js", "languages/lang_dut.js","languages/lang_ger.js"); +var conf_dir = "config/"; lang_prio = new Array("dut,eng,und","ger,deu,eng","eng,und","fre,fra,eng"); cssfile = new Array ("blue","black"); diff --git a/javascript/settings2.js b/javascript/settings2.js deleted file mode 100644 index f20693f..0000000 --- a/javascript/settings2.js +++ /dev/null @@ -1,148 +0,0 @@ - -var fsList; var fsSchedList; var fsSched; - -var color_bg = "#fc5"; -var color_sched_head = "color:white"; -var color_sched_font = "color:black"; - -//var color_progress1 = ""; -//var color_progress2 = ""; - - -function setOSDscale() { - fsList = "34px"; //1080 = 34, 720 = 23, 576 = 18 - fsSchedList = "34px"; //1080 = 34, 720 = 23, 576 = 18 - fsSched = "49px"; //1080 = 49, 720 = 33, 576 = 26 -} - - -function GuideView_start() { - NowNext = 0; - videoplane.style.width = "44%"; - videoplane.style.height = "42%"; - videoplane.style.left = "53%"; - videoplane.style.top = "52%"; - isFullscreen = 0; - ClearScreen(); - channellist.style.opacity = 1; - colorkeys.innerHTML = "
" + " "
-				+  NN[3 + (1 - NowNext)] + "  " 
-				+ NN[1 - NowNext] + "  " + NN[2] + "  " 
-				+ NN[5] + "
"; - colorkeys.style.opacity = 1; - showChannelList(); - if(!SwitchGuide) { - preChan = currChan; - preGrp = ChanGroup; - } -} - -function GuideView_end() { - isSchedule = 0; - schedule.style.opacity = 0; - isFullscreen = 1; - FullScreen(); - if(!SwitchGuide) { - currChan = preChan; - ChanGroup = preGrp; - } -} - - - -function GetSchedule(schchan,tablelength){ - //Old style Schedule, used in Guide View. - SI = ""; - try { - StreamInfo(schchan); - - eitService = toi.statics.ToiDvbEitCacheServiceItem.create(SI[1],SI[2],SI[3]); - eitCache.addService(eitService); - event = eitCache.getPresentEvent(eitService); - events = eitCache.getEvents(eitService, (Math.round(new Date().getTime()/1000.0)), 2000000000); - - if (event.name) { - if (events.more) { - var t = eitCache.getEvents(eitService, (Math.round(new Date().getTime()/1000.0)), 2000000000); - events.infoSequence.concat(t.infoSequence); - events.more = t.more; - } - - var txt = ""; - var i = 0; - for (i = 0; i < events.infoSequence.length && i < tablelength; i++) { - - while ((i > 0) && (events.infoSequence[i].eventId == events.infoSequence[(i-1)].eventId)) { - i = i + 1; - } - - tijd = events.infoSequence[i].time; - 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); - - txt = txt + ""; - } - txt = txt + "
\uE003\uE003\uE003\uE003\uE003" + th + ":" + tm + " (" + (events.infoSequence[i].duration/60).toFixed(0) + ") " + Left(events.infoSequence[i].name,30) + "
"; - schedule.innerHTML = "

" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + txt + "

"; - } else { - schedule.innerHTML = "

" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "

"; - } - - } catch(e) { - alert("Get EPG problem: " + e); - schedule.innerHTML = "

" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "

" + Lang[6] + "

"; - } - -} - - -// Channelslist / EPG Guide -// -// show currchan - 5 -// highlite currchan -// show currchan + 5 -// -// check if chan is OK -// -function showChannelList() { - var liststyle = ""; - var htmlstring = ""; - listChan = currChan-5; - for(var i=currChan-5; i<=currChan+5; i++) { - do - { - listChan += 1; - if (listChanmaxChan[ChanGroup]) { - listChan=minChan[ChanGroup]; - } - } - - while (!channels[listChan] && (listChan\uE003\uE003" + listChan + "\uE003"; - } - htmlstring = htmlstring + "
" + Left(channelsnames[listChan],15) + "\uE003" + Left(EpgInfo[NowNext],64) + "
"; - channellist.innerHTML = htmlstring; - chanlistepg.innerHTML = "

" + EPG[NowNext][1][currChan] + "

" + Left(EPG[NowNext][4][currChan],250) + "

" ; - -} - - -// END of Channelslist / EPG Guide - -- cgit v1.2.3