summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--History1
-rw-r--r--index.html55
-rw-r--r--settings.js100
3 files changed, 78 insertions, 78 deletions
diff --git a/History b/History
index 7f51cda..5fc40a7 100644
--- a/History
+++ b/History
@@ -21,6 +21,7 @@ VDR 1.7.29
Dynamic audio selection with green button while watching. (Settings menu as before)
Added EPG Icon for radio channels.
From settings menu channel groups can be switched off.
+ In settings menu you can use GREEN to change screen resolution.
0.21 Language in sepate file, link your lang_XXX.js to language.js to activate it.
Updated EPG filter, (DVB-T defaults to German), added MTV transponder on 19E.
diff --git a/index.html b/index.html
index 0ae51d6..61a20e2 100644
--- a/index.html
+++ b/index.html
@@ -69,10 +69,11 @@ function onLoad() {
toi.schedulerService.setCategorySubscription(onScheduledStart, "*");
toi.schedulerService.setCategorySubscription(onScheduledStop, "*");
- setOSDtimer();
+ setOSDscale();
+ SetupFonts();
+ setOSDtimer();
showOSD();
- SetupFonts();
videoplane.subtitles = Boolean(ShowSubs);
colorkeys.innerHTML = "<font color=red> " + NN[4] + " </font><font color=green > " + NN[1] + " </font><font color=yellow> " + NN[2] + " </font><font color=blue> " + NN[5] + " </font>";
mediaList.innerHTML = "<h1><center style='font-size:" + fsRec + ";" + color_main_head + ";'>" + Lang[0] + "</center></h1>";
@@ -169,6 +170,14 @@ function GetSettings() {
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 + ":3000/";} }
+ try {
+ if (!toi.informationService.getObject("vip.resolution")) {}
+ } catch(e) {
+ toi.informationService.setObject("vip.resolution","2",toi.informationService.STORAGE_PERMANENT)
+ }
+
+ Set_Res = toi.informationService.getObject("vip.resolution");
+
//if needed types can be set here. Default of the box is normal.
//is = toi.informationService;
//is.setObject("cfg.media.subtitling.typepriority","hearing_impaired",is.STORAGE_PERMANENT);
@@ -448,6 +457,9 @@ for(x=0; x<cList.length;x++) {
function VideoOutput() {
+Set_Res = Set_Res + 1;
+if (Set_Res > VideoOutputModes.length) { Set_Res = 0;}
+
videoConfig = toi.videoOutputService.getVideoConfiguration();
var session = null;
@@ -471,11 +483,6 @@ videoConfig = toi.videoOutputService.getVideoConfiguration();
}
setOSDscale();
-InitMenu(menu);
-
-Set_Res = Set_Res + 1;
-if (Set_Res > VideoOutputModes.length) { Set_Res = 0;}
-
}
@@ -2044,7 +2051,10 @@ function onKeyMenu(keyCode) {
}
break;
case "Green":
- VideoOutput();
+ if (menu == 1) {
+ VideoOutput();
+ InitMenu(menu);
+ }
break;
case "Yellow":
break;
@@ -2347,8 +2357,12 @@ if(menu == 1) { // settings menu
htmltext = htmltext + Lang[26] + "\n 8 - ";
if (SwitchGuide) { htmltext = htmltext + "\uE017"; } else { htmltext = htmltext + "\uE016"; }
htmltext = htmltext + Lang[27] + "\n 9 -" + Lang[28] + "\n S -" + Lang[29];
+
if (SleepTimer) { htmltext = htmltext + SleepTimer + Lang[30]; } else { htmltext = htmltext + Lang[31]; }
- htmltext = htmltext + "\n 0 -" + Lang[9] +"</pre>";
+
+ htmltext += "\n <font style='color:green;'>G<font style='" + color_main_font + ";'> - VideoMode : ";
+ htmltext += VideoOutputModes_txt[VideoOutputModes[Set_Res]] + "\n";
+// htmltext = htmltext + "\n 0 -" + Lang[9] +"</pre>";
mainmenu.innerHTML = htmltext;
}
@@ -2387,23 +2401,24 @@ if(menu == 4) { // INFO Menu
try {
is = toi.informationService;
- htmltext = htmltext + "\n Product name: " + is.getObject("config.productdisplayname");
- htmltext = htmltext + "\n Build date : " + is.getObject("config.build.date");
- htmltext = htmltext + "\n\n IP address : " + is.getObject("config.ipaddress");
- htmltext = htmltext + "\n VDR address : " + server_ip + "\n";
+ 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 VDR address : " + server_ip + "\n";
+
var x = is.getObject("cfg.ip.eth0.mode");
- if (x == "DHCP") { htmltext = htmltext + "\n \uE017 "; } else { htmltext = htmltext + "\n \uE016 "; }
- htmltext = htmltext + "DHCP";
+ if (x == "DHCP") { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
+ htmltext += "DHCP";
var x = is.getObject("var.capabilities.dvr");
- if (x !== "FALSE") { htmltext = htmltext + "\n \uE017 "; } else { htmltext = htmltext + "\n \uE016 "; }
- htmltext = htmltext + "DVR ";
- if (fullupdate !== 0) { htmltext = htmltext + "\n \uE017 "; } else { htmltext = htmltext + "\n \uE016 "; }
- htmltext = htmltext + "Full EPG Update ";
+ if (x !== "FALSE") { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
+ htmltext += "DVR ";
+ if (fullupdate !== 0) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
+ htmltext += "Full EPG Update ";
} catch(e) {
alert("Error : " + e);
}
- htmltext = htmltext + "\n\n 0 -" + Lang[9] + "</pre>";
+ htmltext += "\n\n 0 -" + Lang[9] + "</pre>";
mainmenu.innerHTML = htmltext;
}
diff --git a/settings.js b/settings.js
index 94debc7..fb38c44 100644
--- a/settings.js
+++ b/settings.js
@@ -2,39 +2,6 @@
// Default settings
//
-var videoConfig;
-var Set_Res = 2; // Default VIDEO_MODE_1080I50
-var Xfactor = new Array();
-var Yfactor = new Array();
-VideoOutputModes = new Array(2,5,7); // Modes for the portal.
-// NO_VIDEO_MODE = 0
-// VIDEO_MODE_480I60 = 1
-// VIDEO_MODE_576I50 = 2
-// VIDEO_MODE_480P60 = 3
-// VIDEO_MODE_576P50 = 4
-// VIDEO_MODE_720P50 = 5
-// VIDEO_MODE_720P60 = 6
-// VIDEO_MODE_1080I50 = 7
-// VIDEO_MODE_1080I60 = 8
-// VIDEO_MODE_1080P23976 = 9
-// VIDEO_MODE_1080P24 = 10
-// VIDEO_MODE_1080P25 = 11
-// VIDEO_MODE_1080P29970 = 12
-// VIDEO_MODE_1080P30 = 13
-// VIDEO_MODE_1080P50 = 14
-// VIDEO_MODE_1080P59940 = 15
-// VIDEO_MODE_1080P60 = 16
-
-// keep scale compliant with outputmodes!!
-
-// 720x576
-Xfactor[0] = 720 / 720; Yfactor[0] = 576 / 576;
-// 1280x720
-Xfactor[1] = 1280 / 720; Yfactor[1] = 720 / 576;
-// 1920x1080
-Xfactor[2] = 1920 / 720; Yfactor[2] = 1080 / 576;
-
-
server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://192.168.3.100","http://192.168.178.19");
var server_ip = server_ip_array[0]; // default server
@@ -43,11 +10,6 @@ var currChan = 10; // default channel
var experimental = "yes" ;// Use some experimental code
-//
-//
-//
-//
-//
var ShowSubDir = 1 ; // 0 = no, 1 = yes (default) // show seperate maps for subdirs in menu recordings
var showClock = 0; // 0 = no, 1 = yes
@@ -79,16 +41,52 @@ var MPDAddress = ":8888";
var channeldigits = 2; // 0 - Max 9, 1 max 99, 2 max 999 or 3 max 9999 channels directly selectable by numbers
+//
+// No need to change anything from here on.
+//
+
+VideoOutputModes = new Array(4,5,7); // Modes for the portal.
+VideoOutputModes_txt = new Array("NO_VIDEO_MODE","480I60","576I50","480P60","576P50","720P50","720P60","1080I50","1080I60","1080P23976","1080P24",
+ "1080P25","1080P29970","1080P30","1080P50","1080P59940","1080P60")
+
+// NO_VIDEO_MODE = 0
+// VIDEO_MODE_480I60 = 1
+// VIDEO_MODE_576I50 = 2
+// VIDEO_MODE_480P60 = 3
+// VIDEO_MODE_576P50 = 4 <--
+// VIDEO_MODE_720P50 = 5 <--
+// VIDEO_MODE_720P60 = 6
+// VIDEO_MODE_1080I50 = 7 <--
+// VIDEO_MODE_1080I60 = 8
+// VIDEO_MODE_1080P23976 = 9
+// VIDEO_MODE_1080P24 = 10
+// VIDEO_MODE_1080P25 = 11
+// VIDEO_MODE_1080P29970 = 12
+// VIDEO_MODE_1080P30 = 13
+// VIDEO_MODE_1080P50 = 14
+// VIDEO_MODE_1080P59940 = 15
+// VIDEO_MODE_1080P60 = 16
+
+var videoConfig;
+var Set_Res;
+var Xfactor = new Array();
+var Yfactor = new Array();
+
+// keep scale compliant with Videooutputmodes!!
+// 720x576
+Xfactor[0] = 720 / 720; Yfactor[0] = 576 / 576;
+// 1280x720
+Xfactor[1] = 1280 / 720; Yfactor[1] = 720 / 576;
+// 1920x1080
+Xfactor[2] = 1920 / 720; Yfactor[2] = 1080 / 576;
+
+
var audio = 0;
var audio_dyn = 0;
lang_prio = new Array("dut,eng,und","ger,deu,eng","eng,und","fre,fra,eng");
var lang_prio_dyn = new Array(); //Used for dynamic audio track selection
-//
-// No need to change anything from here on.
-//
-
var ChanGroup = Number(String((currChan / 1000)).substring(0,1)); // default group
var minChan = new Array();var minchan = new Array(); var maxChan = new Array(); var defChan = new Array(); var baseChn = new Array(); var protChn = new Array(); var ServerAdres = new Array(); // Define settings for Channels.
@@ -235,22 +233,8 @@ var color_progress2;
var color_notset;
-var fsAudio = (16*Yfactor[Set_Res]) + "px";
-var fsTime = (16*Yfactor[Set_Res]) + "px";
-var fsName = (27*Yfactor[Set_Res]) + "px";
-var fsMenu = (27*Yfactor[Set_Res]) + "px";
-var fsChan = (43*Yfactor[Set_Res]) + "px";
-var fsCA = (32*Yfactor[Set_Res]) + "px";
-var fsMenuMain = (35*Yfactor[Set_Res]) + "px";
-var fsEpg = (19*Yfactor[Set_Res]) + "px";
-var fsEpginfo = (21*Yfactor[Set_Res]) + "px";
-var fsList = (18*Yfactor[Set_Res]) + "px";
-var fsSchedList = (18*Yfactor[Set_Res]) + "px";
-var fsSched = (26*Yfactor[Set_Res]) + "px";
-var fsRec = (27*Yfactor[Set_Res]) + "px";
-var fsReclist = (19*Yfactor[Set_Res]) + "px";
-var fsMedia = (27*Yfactor[Set_Res]) + "px";
-var fsKeys = (19*Yfactor[Set_Res]) + "px";
+var fsAudio; var fsTime; var fsName; var fsMenu; var fsChan; var fsCA; var fsMenuMain; var fsEpg;
+var fsEpginfo; var fsList; var fsSchedList; var fsSched; var fsRec; var fsReclist; var fsMedia; var fsKeys;
var AvInfo = new Array();
var xx = 0;