summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--History6
-rw-r--r--channels-mc.js25
-rw-r--r--channels.js11
-rw-r--r--channels5.js23
-rw-r--r--channels6.js (renamed from channels-prt.js)0
-rw-r--r--channels9.js (renamed from channels-rd.js)0
-rw-r--r--index.html81
-rw-r--r--settings.js27
8 files changed, 101 insertions, 72 deletions
diff --git a/History b/History
index df5cb63..cdd5c57 100644
--- a/History
+++ b/History
@@ -1,5 +1,6 @@
-0.10 Added Radio list / Protected List / SD/HD list etc
- (Use for Multicast Channels keyword Multicast in Serveradres)
+0.10 Added sub Listinges for use as Radio list / Protected List / SD/HD list etc
+ (Use for Multicast Channels keyword MultiCast in Serveradres)
+ (Multicast & streamdev is limited to 255 channels?)
Left/ Right select list
Switch to Radiolist with key 'TV' or 'RADIO' (give same keycode)
Small fixes, guideview, epg setup, timeshift.
@@ -9,6 +10,7 @@
Direct recording with record button, next push stops recording. (Only for HDD models)
Changed the Main Menu.
TimeShift is possible for multicast channels.
+ Changed the style to round corners
0.06 More options in Main Menu:
diff --git a/channels-mc.js b/channels-mc.js
deleted file mode 100644
index d42316a..0000000
--- a/channels-mc.js
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// MultiCast Channels.
-//
-
-channelsnames[5001] = "NED1 (S)";
-channels[5001] = "S19.2E-53-1105-4011";
-channelsnames[5002] = "NED2 (S)";
-channels[5002] = "239.255.0.2:11111";
-channelsnames[5003] = "NED3 (S)";
-channels[5003] = "239.255.0.3:11111";
-channelsnames[5004] = "RTL4 (S)";
-channels[5004] = "239.255.0.4:11111";
-channelsnames[5005] = "RTL5 (S)";
-channels[5005] = "239.255.0.5:11111";
-channelsnames[5006] = "SBS6 (S)";
-channels[5006] = "239.255.0.6:11111";
-channelsnames[5007] = "RTL7 (S)";
-channels[5007] = "239.255.0.7:11111";
-channelsnames[5008] = "Veronica/DisneyXD (S)";
-channels[5008] = "239.255.0.8:11111";
-channelsnames[5009] = "NET5 (S)";
-channels[5009] = "239.255.0.9:11111";
-channelsnames[5010] = "Scuzz (S)";
-channels[5010] = "239.255.2.128:11111";
-
diff --git a/channels.js b/channels.js
index 6f49d77..8eb3828 100644
--- a/channels.js
+++ b/channels.js
@@ -101,8 +101,6 @@ channels[33] = "S23.5E-3-3211-20802";
channelsnames[34] = "Omroep Brabant Televisie (S)"
channels[34] = "S23.5E-3-3211-20820";
-channelsnames[39] = "Informatiekanaal (S)";
-channels[39] = "S19.2E-53-1119-12826";
channelsnames[40] = "een (S)";
channels[40] = "S19.2E-53-1119-12775";
channelsnames[41] = "Canvas (S)";
@@ -119,10 +117,11 @@ channelsnames[46] = "Vitaya (MPEG4) (S)";
channels[46] = "S19.2E-53-1119-12818";
channelsnames[47] = "KetOp12 (S)";
channels[47] = "S19.2E-53-1119-12808";
-channelsnames[48] = "vtmKazoom/Kanaal Z (MPEG4) (S)";
-channels[48] = "S19.2E-53-1119-12816";
-channelsnames[49] = "Acht (MPEG4) (S)";
-channels[49] = "S19.2E-53-1119-12822";
+channelsnames[48] = "Acht (MPEG4) (S)";
+channels[48] = "S19.2E-53-1119-12822";
+
+channelsnames[49] = "Informatiekanaal (S)";
+channels[49] = "S19.2E-53-1119-12826";
channelsnames[50] = "DMAX (S)";
channels[50] = "S19.2E-133-33-63";
diff --git a/channels5.js b/channels5.js
new file mode 100644
index 0000000..8360e23
--- /dev/null
+++ b/channels5.js
@@ -0,0 +1,23 @@
+//
+// MultiCast Channels.
+//
+
+channelsnames[5001] = "NED1 (S)";
+channels[5001] = "S19.2E-53-1105-4011-0.1";
+channelsnames[5002] = "NED2 (S)";
+channels[5002] = "S19.2E-53-1105-4012-0.2";
+channelsnames[5003] = "NED3 (S)";
+channels[5003] = "S19.2E-53-1105-4013-0.3";
+channelsnames[5004] = "RTL4 (S)";
+channels[5004] = "S19.2E-53-1097-2004-0.4";
+channelsnames[5005] = "RTL5 (S)";
+channels[5005] = "S19.2E-53-1097-2005-0.5";
+channelsnames[5006] = "SBS6 (S)";
+channels[5006] = "S19.2E-53-1105-4002-0.6";
+channelsnames[5007] = "RTL7 (S)";
+channels[5007] = "S19.2E-53-1097-2006-0.7";
+channelsnames[5008] = "Veronica/DisneyXD (S)";
+channels[5008] = "S19.2E-53-1097-2031-0.8";
+channelsnames[5009] = "NET5 (S)";
+channels[5009] = "S19.2E-53-1105-4003-0.9";
+
diff --git a/channels-prt.js b/channels6.js
index 2f0e90c..2f0e90c 100644
--- a/channels-prt.js
+++ b/channels6.js
diff --git a/channels-rd.js b/channels9.js
index b7d3c30..b7d3c30 100644
--- a/channels-rd.js
+++ b/channels9.js
diff --git a/index.html b/index.html
index 57c087c..f9840bd 100644
--- a/index.html
+++ b/index.html
@@ -1,11 +1,10 @@
<html>
<head>
<script type="text/javascript" src="settings.js" />
- <script type="text/javascript" src="settings2.js" />
<script type="text/javascript" src="channels.js" />
- <script type="text/javascript" src="channels-rd.js" />
- <script type="text/javascript" src="channels-mc.js" />
- <script type="text/javascript" src="channels-prt.js" />
+ <script type="text/javascript" src="channels5.js" />
+ <script type="text/javascript" src="channels6.js" />
+ <script type="text/javascript" src="channels9.js" />
<script type="text/javascript" src="recordings.js" />
</head>
<script language="Javascript">
@@ -138,8 +137,9 @@ function play(uri) {
mediaPlayer.close();
}
- if (ChanGroup == 5) {
- uri = "239.255.0." + (currChan - baseChn[5]).toString() + ":11111";
+ if (ServerAdres[ChanGroup] == "MultiCast" ) {
+ SI=channels[currChan].split("-");
+ uri = "239.255." + SI[4] + ":11111";
} else {
uri = ServerAdres + uri;
}
@@ -341,12 +341,12 @@ function onKeyDown(event) {
do
{
ChanGroup = ChanGroup - 1;
+ if (protChn[ChanGroup] == 1 && ShowProtectedChannels == 1) {
+ ChanGroup = ChanGroup - 1;
+ }
if (ChanGroup < 0) {
ChanGroup = 9;
}
- if (ChanGroup == 6 && ShowProtectedChannels == 1) {
- ChanGroup = ChanGroup + 1;
- }
}
while (!minChan[ChanGroup]);
currChan = defChan[ChanGroup];
@@ -373,12 +373,12 @@ function onKeyDown(event) {
do
{
ChanGroup = ChanGroup + 1;
+ if (protChn[ChanGroup] == 1 && ShowProtectedChannels == 1) {
+ ChanGroup = ChanGroup + 1;
+ }
if (ChanGroup > 9) {
ChanGroup = 0;
}
- if (ChanGroup == 6 && ShowProtectedChannels == 1) {
- ChanGroup = ChanGroup + 1;
- }
}
while (!minChan[ChanGroup]);
currChan = defChan[ChanGroup];
@@ -464,13 +464,17 @@ function onKeyDown(event) {
if(!epgactive) {
if(!isSchedule) {
schedule.style.opacity = 1;
+ schedule.style.width = "50%";
schedule.style.height = "75%";
+ schedule.style.left = "25%";
GetSchedule(currChan,15);
isSchedule = 1;
} else {
isSchedule = 0;
schedule.style.opacity = 0;
schedule.style.height = "48%";
+ schedule.style.width = "100%";
+ schedule.style.left = "5%";
}
}
} else {
@@ -1160,17 +1164,17 @@ function GetSchedule(schchan,tablelength){
tm = "0"+tm;
}
- txt = txt + "<td style='font-size:" + fsSchedList + ";'>\uE003\uE003\uE003\uE003\uE003" + th + ":" + tm + " (" + (events.infoSequence[i].duration/60).toFixed(0) + ") " + events.infoSequence[i].name + "</td></tr>";
+ txt = txt + "<td style='font-size:" + fsSchedList + ";'>\uE003\uE003\uE003\uE003\uE003" + th + ":" + tm + " (" + (events.infoSequence[i].duration/60).toFixed(0) + ") " + Left(events.infoSequence[i].name,30) + "</td></tr>";
}
txt = txt + "</table>";
schedule.innerHTML = "<p style='color:white;font-size:" + fsSched + ";'>" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + txt + "</p>";
} else {
- schedule.innerHTML = "<p style='font-size:" + fsSched + ";'>" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "</p>";
+ schedule.innerHTML = "<p style='color:white;font-size:" + fsSched + ";'>" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "</p>";
}
} catch(e) {
alert("Get EPG problem: " + e);
- schedule.innerHTML = "<p style='font-size:" + fsSched + ";'>" + channelsnames[schchan] + "</p><p> NO EPG </p>";
+ schedule.innerHTML = "<p style='color:white;font-size:" + fsSched + ";'>" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "</p><p> NO EPG </p>";
}
}
@@ -1485,7 +1489,15 @@ function onKeyMenu(keyCode) {
} else if (menu == 1) {
ShowSubs = 1 - ShowSubs;
videoplane.subtitles = Boolean(ShowSubs); // Enable subtitles or Disable subtitles
+ } else if (menu == 2) {
+ clearTimeout(switchtimerID);
+ switchtimerID = 0;
+ osdtimer.innerHTML = "";
+ switchicon = "\uE003";
+ osdca.innerHTML = CAicon + switchicon;
+ SetLed(0,0,0);
}
+
InitMenu(menu);
break;
case KEY_2:
@@ -1507,7 +1519,9 @@ function onKeyMenu(keyCode) {
InitMenu(menu);
break;
case KEY_3:
- if (menu == 1) {
+ if (menu == 0) {
+ menu = 2;
+ } else if (menu == 1) {
is = toi.informationService;
if(subsmode == 0 ) {
is.setObject("cfg.media.subtitling.modepriority","Teletext,DVB",is.STORAGE_VOLATILE);
@@ -1516,15 +1530,7 @@ function onKeyMenu(keyCode) {
is.setObject("cfg.media.subtitling.modepriority","DVB,Teletext",is.STORAGE_VOLATILE);
subsmode = 0;
}
- }
- if (menu == 0) {
- clearTimeout(switchtimerID);
- switchtimerID = 0;
- osdtimer.innerHTML = "";
- switchicon = "\uE003";
- osdca.innerHTML = CAicon + switchicon;
- SetLed(0,0,0);
- }
+ }
InitMenu(menu);
break;
case KEY_4:
@@ -1575,12 +1581,17 @@ function InitMenu(menu) {
if(menu == 0) {
// Main Menu
- mainmenu.innerHTML = "<pre><center style='font-size:" + fsMenuMain + ";color:white;'> MainMenu \n ( " + Version + " )</center></pre><pre style='color:black;font-size:" + fsMenu + ";'> 1 - SettingsMenu \n 2 - Recordings \n 3 - Switch timer : " + Boolean(switchtimerID) + "\n 4 -\n 5 -\n 6 -\n 7 -\n 8 -\n 9 -\n 0 - Restart Portal </pre>";
+ mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> MainMenu \n ( " + Version + " )</center></h1><pre style='color:black;font-size:" + fsMenu + ";'> 1 - SettingsMenu \n 2 - Recordings \n 3 - TimersMenu\n 4 -\n 5 -\n 6 -\n 7 -\n 8 -\n 9 -\n 0 - Restart Portal </pre>";
}
if(menu == 1) {
// settings menu
- mainmenu.innerHTML = "<pre><center style='font-size:" + fsMenuMain + ";color:white;'> Settings </center></pre><pre style='color:black;font-size:" + fsMenu + ";'><font style='color:red;font-size:" + fsMenu + ";'> Frontdisplay Clock : " + Boolean(showClock) + "</font><font style='color:green;font-size:" + fsMenu + ";'>\n Prio audio track : " + (toi.informationService.getObject("cfg.media.audio.languagepriority")) + "</font><font style='color:blue;font-size:" + fsMenu + ";'>\n Preview guide : " + Boolean(SwitchGuide) + "</font>\n 1 - Show Subs : " + Boolean(ShowSubs) + "\n 2 - Subs Type Prio : " + (toi.informationService.getObject("cfg.media.subtitling.typepriority")) + "\n 3 - Subs Mode Prio : " + (toi.informationService.getObject("cfg.media.subtitling.modepriority")) + "\n 4 - Audio Type Prio : " + (toi.informationService.getObject("cfg.media.audio.typepriority")) + "\n 5 - Protection : " + Boolean(ShowProtectedChannels) + "\n\n\n\n 0 - MainMenu </pre>";
+ mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> Settings </center></h1><pre style='color:black;font-size:" + fsMenu + ";'><font style='color:red;font-size:" + fsMenu + ";'> Frontdisplay Clock : " + Boolean(showClock) + "</font><font style='color:green;font-size:" + fsMenu + ";'>\n Prio audio track : " + (toi.informationService.getObject("cfg.media.audio.languagepriority")) + "</font><font style='color:blue;font-size:" + fsMenu + ";'>\n Preview guide : " + Boolean(SwitchGuide) + "</font>\n 1 - Show Subs : " + Boolean(ShowSubs) + "\n 2 - Subs Type Prio : " + (toi.informationService.getObject("cfg.media.subtitling.typepriority")) + "\n 3 - Subs Mode Prio : " + (toi.informationService.getObject("cfg.media.subtitling.modepriority")) + "\n 4 - Audio Type Prio : " + (toi.informationService.getObject("cfg.media.audio.typepriority")) + "\n 5 - Protection : " + Boolean(ShowProtectedChannels) + "\n\n\n\n 0 - MainMenu </pre>";
+}
+
+if(menu == 2) {
+// Timers menu
+ mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> Timers </center></h1><pre style='color:black;font-size:" + fsMenu + ";'>\n 1 - Switch timer : " + Boolean(switchtimerID) + "" + "\n\n\n\n 0 - MainMenu </pre>";
}
@@ -1862,27 +1873,27 @@ function ShowMediaOSD() {
<videoplane id='videoplane' style='position:absolute; left:0px; top:0px; height: 100%; width: 100%; z-index:500;'></videoplane>
- <div id="osdvolume" style="width:63%; position:absolute; left:21%; top:87%;z-index:501;fontFamily:VDRSymbolsSans;opacity:0;">Volume : </div>
+ <div id="osdvolume" style="width:63%; position:absolute; left:10%; top:80%;z-index:501;fontFamily:VDRSymbolsSans;opacity:0;">Volume : </div>
<div id="osdmedia" style="width:63%; position:absolute; left:21%; top:69%;z-index:505;fontFamily:VDRSymbolsSans;opacity:0;"></div>
- <div id="osdmain" style="background:#3366ff;width:76%; position:absolute; left:10%; top:60%; bottom:9%;z-index:505;"></div>
+ <div id="osdmain" style="background:#3366ff;width:76%; position:absolute; left:10%; top:60%; bottom:9%;z-index:505;-webkit-border-radius:25px;"></div>
<div id="osdtime" style="width:42%; position:absolute; left:52%; top:63%;z-index:505;"></div>
<div id="osdname" style="width:69%;height:4%; position:absolute; left:12%; top:65%;z-index:505;"></div>
<div id="osdepg" style="width:63%; position:absolute; left:21%; top:69%;z-index:505;"></div>
<div id="osdtimer" style="width:7%; position:absolute; left:12%; top:69%;z-index:505;"></div>
<div id="osdca" style="width:3%; position:absolute; left:80%; top:67%;z-index:505;fontFamily:VDRSymbolsSans;"></div>
- <div id="osdnr" style="background:red;width:10%;height:9%; position:absolute; left:12%; top:56%;z-index:505;opacity:0;"></div>
+ <div id="osdnr" style="background:red;width:10%;height:9%; position:absolute; left:12%; top:56%;z-index:505;opacity:0;-webkit-border-radius:25px;"></div>
- <div id="osdepginfo" style="background:#3366ff;width:80%; position:absolute; left:10%; top:10%;z-index:510;opacity:0;"></div>
- <div id="osdepginfonext" style="background:#3366ff;width:80%; position:absolute; left:10%; top:10%;z-index:510;opacity:0;"></div>
- <div id="schedule" style="background:#3366ff; width:100%; height:48%; position:absolute; left:7%; top:4%;opacity:0;z-index:510;"></div>
+ <div id="osdepginfo" style="background:#3366ff;width:80%; position:absolute; left:10%; top:10%;z-index:510;opacity:0;-webkit-border-radius:25px;"></div>
+ <div id="osdepginfonext" style="background:#3366ff;width:80%; position:absolute; left:10%; top:10%;z-index:510;opacity:0;-webkit-border-radius:25px;"></div>
+ <div id="schedule" style="background:#3366ff; width:50%; height:48%; position:absolute; left:25%; top:4%;opacity:0;z-index:510;-webkit-border-radius:25px;"></div>
<div id="osdmute" style="width:7%; position:absolute; left:76%; top:9%;z-index:515;opacity:0;"><img src="mute.png"></div>
<div id="osdlang" style="width:7%; position:absolute; left:76%; top:9%;z-index:515;opacity:0;"></div>
- <div id="mainmenu" style="background:#3366ff;width:76%; position:absolute; left:10%; top:9%; bottom:9%;z-index:520;opacity:0;"></div>
- <div id="mediaList" style="background:#bbb; width:80%; height:75%; position:absolute; left:10%; top:10%;z-index:520;opacity:0;"></div>
+ <div id="mainmenu" style="background:#3366ff;width:76%; position:absolute; left:10%; top:9%; bottom:9%;z-index:520;opacity:0;-webkit-border-radius:25px;"></div>
+ <div id="mediaList" style="background:#bbb; width:80%; height:75%; position:absolute; left:10%; top:10%;z-index:520;opacity:0;-webkit-border-radius:25px;"></div>
</body>
</html>
diff --git a/settings.js b/settings.js
index 842e247..0d85ffc 100644
--- a/settings.js
+++ b/settings.js
@@ -15,6 +15,13 @@ var channelsnames = new Array();
var channelsepglang = new Array();
var recording = new Array();
+var showClock = 0;
+var SwitchGuide = 0;
+var TimeShift = 0; // 0 = no, 1 = yes timeshift
+var ShowSubs = 1; // 0 no, 1 = yes (default)
+months = new Array('January', 'February', 'March', 'April', 'May', 'June', 'Jully', 'August', 'September', 'October', 'November', 'December');
+days = new Array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
+
var isFullscreen = 1; // start TV(1) or guide(0)
var StartVolume = 50;
var Volume = StartVolume;
@@ -37,37 +44,49 @@ var minChan = new Array();
var maxChan = new Array();
var defChan = new Array();
var baseChn = new Array();
+var protChn = new Array();
+var ServerAdres = new Array();
+var ShowProtectedChannels = 1; // Default don't show protected channels.
// Radio channels.js Settings
minChan[9] = 9001;
maxChan[9] = 9099; // set not too far from max rd channel to speed up zapping
defChan[9] = 9051;
baseChn[9] = 9000;
+protChn[9] = 0;
+ServerAdres[9] = "http://192.168.3.15:3000/";
+
// Protected channels.js Settings
minChan[6] = 6001;
maxChan[6] = 6040; // set not too far from max prt channel to speed up zapping
defChan[6] = 6001;
baseChn[6] = 6000;
-var ShowProtectedChannels = 1; // Default don't show protected channels.
+protChn[6] = 1;
+ServerAdres[6] = "http://192.168.3.15:3000/";
// TV channels.js Settings
minChan[0] = 1;
maxChan[0] = 999; // set not too far from max TV channel to speed up zapping
defChan[0] = currChan;
baseChn[0] = 0;
+protChn[0] = 0;
+ServerAdres[0] = "http://192.168.3.15:3000/";
//HD list
//minChan[1] = 1001;
//maxChan[1] = 1999; // set not too far from max HD channel to speed up zapping
//defChan[1] = 1001;
//baseChn[1] = 1000;
-
+//protChn[1] = 0;
+//ServerAdres[1] = "http://192.168.3.15:3000/";
// MultiCast
minChan[5] = 5001;
maxChan[5] = 5010; // set not too far from max multicast channel to speed up zapping
defChan[5] = 5001;
baseChn[5] = 5000;
+protChn[5] = 0;
+ServerAdres[5] = "MultiCast";
var currMed = 0;
var listMed = 0;
@@ -171,8 +190,8 @@ var fsMenuMain = (35*Yfactor) + "px";
var fsEpg = (19*Yfactor) + "px";
var fsEpginfo = (21*Yfactor) + "px";
var fsList = (18*Yfactor) + "px";
-var fsSchedList = (16*Yfactor) + "px";
-var fsSched = (24*Yfactor) + "px";
+var fsSchedList = (18*Yfactor) + "px";
+var fsSched = (26*Yfactor) + "px";
var fsRec = (27*Yfactor) + "px";
var fsReclist = (19*Yfactor) + "px";
var fsMedia = (27*Yfactor) + "px";
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-23 03:01:58 +0000