summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--History2
-rw-r--r--channels.js56
-rw-r--r--channels1.js2
-rw-r--r--index.html105
-rw-r--r--settings.js71
5 files changed, 191 insertions, 45 deletions
diff --git a/History b/History
index 1e9a1a4..7f51cda 100644
--- a/History
+++ b/History
@@ -3,7 +3,7 @@ Motorola Vip : 1960, 1910, 1903, 1963.
VDR 1.7.29
-0.22 Updated EPG filter for 42E, canal sat (tid 1088), canal+ (tid 1060), CDS (veronica)
+0.22 Updated EPG filter for 42E, canal sat (tid 1088), canal+ (tid 1060), CDS (veronica, iConcerts, Animax)
Fix: Right month is now shown in recordings menu.
Fix: multiple EPG languages on 1 transponder.
Fix: crash when media/recordings directory is empty
diff --git a/channels.js b/channels.js
index b63f590..015f71e 100644
--- a/channels.js
+++ b/channels.js
@@ -63,22 +63,22 @@ channelsnames[13] = "ComedyCentral/Kindernet (S)";
channels[13] = "S23.5E-3-3211-20826";
channelsnames[14] = "Discovery (S)";
channels[14] = "S19.2E-1-1037-5252";
-//channelsnames[15] = "TLC Netherlands (S)";
-//channels[15] = "S19.2E-53-1097-2020";
+channelsnames[15] = "iConcerts (S)";
+channels[15] = "S23.5E-3-3211-20823";
channelsnames[18] = "NG Wild DUT (S)";
channels[18] = "S23.5E-3-3210-5145";
-channelsnames[19] = "History channel DUT (S)";
-channels[19] = "S23.5E-3-3210-5140";
+//channelsnames[19] = "History channel DUT (S)";
+//channels[19] = "S23.5E-3-3210-5140";
channelsnames[20] = "Animax (S)";
channels[20] = "S19.2E-1-1037-5253";
-//channelsnames[21] = "EUROSPORT (S)";
-//channels[21] = "S19.2E-53-1097-2025";
-channelsnames[21] = "Eurosport Deutschland (S)";
-channels[21] = "S19.2E-1-1091-31200";
-channelsnames[22] = "Eurosport 2 Deutschland (S)";
-channels[22] = "S19.2E-133-15-55";
-channelsnames[23] = "ESPN America (S)";
-channels[23] = "S19.2E-1-1115-13109";
+channelsnames[21] = "EUROSPORT (S)";
+channels[21] = "S23.5E-3-3209-13106";
+channelsnames[22] = "Eurosport Deutschland (S)";
+channels[22] = "S19.2E-1-1091-31200";
+//channelsnames[22] = "Eurosport 2 Deutschland (S)";
+//channels[22] = "S19.2E-133-15-55";
+//channelsnames[23] = "ESPN America (S)";
+//channels[23] = "S19.2E-1-1115-13109";
channelsnames[24] = "MOTORS TV (S)";
channels[24] = "S19.2E-1-1110-9509";
channelsnames[25] = "NAUTICAL CHANNEL (S)";
@@ -228,11 +228,37 @@ channels[111] = "S28.2E-2-2007-4308";
channelsnames[112] = "TCM (S)";
channels[112] = "S28.2E-2-2403-6038";
channelsnames[113] = "TCM +1 (S)";
-channels[113] = "S28.2E-2-2021-5522";
+channels[113] = "S28.2E-2-2301-52175";
channelsnames[114] = "Movies 24 (S)";
channels[114] = "S28.2E-2-2303-52265";
channelsnames[115] = "Movies 24+ (S)";
channels[115] = "S28.2E-2-2303-52270";
+//23East
+channelsnames[116] = "HBO (S)";
+channels[116] = "S23.5E-3-3209-13104";
+channelsnames[117] = "HBO 2 (S)";
+channels[117] = "S23.5E-3-3209-13109";
+channelsnames[118] = "Cinemax (S)";
+channels[118] = "S23.5E-3-3209-13113";
+channelsnames[119] = "MGM (S)";
+channels[119] = "S23.5E-3-3210-5071";
+// UK FTA movie channels
+channelsnames[120] = "Film4 (S)";
+channels[120] = "S28.2E-2-2041-9220";
+channelsnames[121] = "Film4 +1 (S)";
+channels[121] = "S28.2E-2-2041-9225";
+channelsnames[122] = "Men & Movies (S)";
+channels[122] = "S28.2E-2-2602-54110";
+channelsnames[123] = "Men & Movies+1 (S)";
+channels[123] = "S28.2E-2-2412-51120";
+channelsnames[124] = "movies4men (S)";
+channels[124] = "S28.2E-2-2412-51116";
+channelsnames[125] = "mov4men+1 (S)";
+channels[125] = "S28.2E-2-2412-51118";
+
+
+
+
channelsnames[150] = "RTL Crime (S)";
channels[150] = "S19.2E-133-1-27";
@@ -349,9 +375,9 @@ channelsnames[244] = "horror channel (S)";
channels[244] = "S28.2E-2-2301-52105";
channelsnames[245] = "horror ch+1 (S)";
channels[245] = "S28.2E-2-2311-52002";
-channelsnames[246] = "more>movies (S)";
+channelsnames[246] = "Men & Movies (S)";
channels[246] = "S28.2E-2-2602-54110";
-channelsnames[247] = "m>movies+1 (S)";
+channelsnames[247] = "Men & Movies+1 (S)";
channels[247] = "S28.2E-2-2412-51120";
channelsnames[248] = "movies4men (S)";
channels[248] = "S28.2E-2-2412-51116";
diff --git a/channels1.js b/channels1.js
index f1b9663..0faf26d 100644
--- a/channels1.js
+++ b/channels1.js
@@ -318,7 +318,7 @@ channels[1607] = "S23.5E-3-3217-6101"
channelsnames[1608] = "MTV Live HD (S)"
channels[1608] = "S23.5E-3-3226-5600"
channelsnames[1609] = "iConcerts HD (S)"
-channels[1609] = "S23.5E-3-3226-5604"
+channels[1609] = "S23.5E-3-3211-20824"
channelsnames[1610] = "Mezzo Live HD (S)"
channels[1610] = "S23.5E-3-3226-5606"
channelsnames[1700] = "NHK World HD (S)"
diff --git a/index.html b/index.html
index b30f985..bc23a20 100644
--- a/index.html
+++ b/index.html
@@ -20,7 +20,7 @@
//
//
-var Version = "0.22.9"
+var Version = "0.22.10"
window.onkeydown = onKeyDown;
@@ -413,6 +413,26 @@ for(x=0; x<cList.length;x++) {
if(cList[x].type == 0) {
lang_prio_dyn[xx] = mediaPlayer.getAudioStreamInfo(cList[x]).language;
AvInfo[currStream] = AvInfo[currStream] + " Audio " + xx + " " + mediaPlayer.getAudioStreamInfo(cList[x]).encoding + " - " + mediaPlayer.getAudioStreamInfo(cList[x]).language + " , ";
+
+ //
+ alert (mediaPlayer.getAudioStreamInfo(cList[x]).sampleRate);
+ alert (mediaPlayer.getAudioStreamInfo(cList[x]).channelFormat);
+ // AUDIO_CHANNEL_FORMAT_UNKNOWN = 0
+ // AUDIO_CHANNEL_FORMAT_SINGLE_MONO = 1
+ // AUDIO_CHANNEL_FORMAT_DUAL_MONO = 2
+ // AUDIO_CHANNEL_FORMAT_STEREO = 3
+ // AUDIO_CHANNEL_FORMAT_3_FRONT_1_BACK = 4
+ // AUDIO_CHANNEL_FORMAT_3_FRONT_2_BACK = 5
+ // AUDIO_CHANNEL_FORMAT_3_FRONT_2_BACK_LFE = 6
+ // AUDIO_CHANNEL_FORMAT_3_FRONT_2_SIDE_2_BACK_LFE = 7
+ alert (mediaPlayer.getAudioStreamInfo(cList[x]).channelMode);
+ // AUDIO_CHANNEL_MODE_NORMAL = 0
+ // AUDIO_CHANNEL_MODE_DUAL_MONO_LEFT_ONLY = 1
+ // AUDIO_CHANNEL_MODE_DUAL_MONO_RIGHT_ONLY = 2
+ // AUDIO_CHANNEL_MODE_DUAL_MONO_STEREO = 3
+ // AUDIO_CHANNEL_MODE_DUAL_MONO_MIXED = 4
+
+
xx = xx + 1;
}
if(cList[x].type == 1) {
@@ -425,6 +445,58 @@ for(x=0; x<cList.length;x++) {
}
}
+
+function VideoOutput() {
+
+videoConfig = toi.videoOutputService.getVideoConfiguration();
+
+ var session = null;
+ try {
+ var currentOutput = 0;
+ displayInfo=videoConfig.getDisplayInfo(videoConfig.getVideoOutputs()[currentOutput]);
+ var desiredMode = VideoOutputModes[Set_Res];
+
+ // create the session
+ session = toi.videoOutputService.createVideoConfigurationSession();
+ session.setDefaultVideoMode(videoConfig.getVideoOutputs()[currentOutput], desiredMode);
+ session.apply();
+ session.releaseInstance();
+
+ }
+ catch (e) {
+ if (session != null) {
+ session.releaseInstance();
+ }
+ alert(e);
+ }
+
+setOSDscale();
+
+Set_Res = Set_Res + 1;
+if (Set_Res > VideoOutputModes.length) { Set_Res = 0;}
+
+
+}
+
+function setOSDscale() {
+ fsAudio = (16*Yfactor[Set_Res]) + "px";
+ fsTime = (16*Yfactor[Set_Res]) + "px";
+ fsName = (27*Yfactor[Set_Res]) + "px";
+ fsMenu = (27*Yfactor[Set_Res]) + "px";
+ fsChan = (43*Yfactor[Set_Res]) + "px";
+ fsCA = (32*Yfactor[Set_Res]) + "px";
+ fsMenuMain = (35*Yfactor[Set_Res]) + "px";
+ fsEpg = (19*Yfactor[Set_Res]) + "px";
+ fsEpginfo = (21*Yfactor[Set_Res]) + "px";
+ fsList = (18*Yfactor[Set_Res]) + "px";
+ fsSchedList = (18*Yfactor[Set_Res]) + "px";
+ fsSched = (26*Yfactor[Set_Res]) + "px";
+ fsRec = (27*Yfactor[Set_Res]) + "px";
+ fsReclist = (19*Yfactor[Set_Res]) + "px";
+ fsMedia = (27*Yfactor[Set_Res]) + "px";
+ fsKeys = (19*Yfactor[Set_Res]) + "px";
+}
+
function addzero(zero)
{
if (zero<10)
@@ -761,10 +833,10 @@ function onKeyDown(event) {
case "Scroll":
if(isFullscreen) {
NowNext = 0;
- videoplane.style.width = (320*Xfactor)+"px";
- videoplane.style.height = (240*Yfactor)+"px";
- videoplane.style.left = (380*Xfactor)+"px";
- videoplane.style.top = (300*Yfactor)+"px";
+ videoplane.style.width = (320*Xfactor[Set_Res])+"px";
+ videoplane.style.height = (240*Yfactor[Set_Res])+"px";
+ videoplane.style.left = (380*Xfactor[Set_Res])+"px";
+ videoplane.style.top = (300*Yfactor[Set_Res])+"px";
isFullscreen = 0;
ClearScreen();
channelList.style.opacity = 1;
@@ -1471,7 +1543,7 @@ function GetSchedule(schchan,tablelength){
} catch(e) {
alert("Get EPG problem: " + e);
- schedule.innerHTML = "<p style='" + color_sched_head + ";font-size:" + fsSched + ";'>" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "</p><p>" + Lang[6] + "</p>";
+ schedule.innerHTML = "<p style='" + color_sched_head + ";font-size:" + fsSched + ";'>" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "</p><p>" + Lang[6] + "</p>";
}
}
@@ -1566,6 +1638,11 @@ function StreamInfo(si) {
is.setObject("cfg.locale.ui","eng",is.STORAGE_VOLATILE);
}
+ if(SI[0]=="S19.2E" && SI[2]=="1037" && SI[3]=="5253" ) {
+ //Animax
+ is.setObject("cfg.locale.ui","eng",is.STORAGE_VOLATILE);
+ }
+
if(SI[1]=="53" && (SI[3]=="2045") ) {
//Canal Digitaal/ TV Vlaanderen
@@ -1635,6 +1712,13 @@ function StreamInfo(si) {
is.setObject("cfg.locale.ui","dut",is.STORAGE_VOLATILE);
}
+ if(SI[1]=="3" && SI[2]=="3211" && ( SI[3]=="20823" || SI[3]=="20824") ) {
+ //iConcerts
+ is.setObject("cfg.locale.ui","cze",is.STORAGE_VOLATILE);
+ }
+
+
+
if((SI[0]=="S13.0E" && SI[3]=="14003") || (SI[0]=="S13.0E" && SI[3]=="14009") || (SI[0]=="S13.0E" && SI[3]=="14051") || (SI[0]=="S13.0E" && SI[3]=="951")) {
//Swiss ITA channels
is.setObject("cfg.locale.ui","ita",is.STORAGE_VOLATILE);
@@ -1959,6 +2043,7 @@ function onKeyMenu(keyCode) {
}
break;
case "Green":
+ VideoOutput();
break;
case "Yellow":
break;
@@ -2436,7 +2521,7 @@ try {
timersName[i] = x[i].getElementsByTagName("channelname")[0].childNodes[0].nodeValue + fill;
timersDay[i] = x[i].getElementsByTagName("day")[0].childNodes[0].nodeValue;
timersDays[i] = new Date(timersDay[i]*1000);
- timersDays[i] = timersDays[i].getDate() + "\uE003" + months[timersDays[i].getMonth()];
+ timersDays[i] = timersDays[i].getDate() + "\uE003" + Left(months[timersDays[i].getMonth()],4);
if (timersFlag[i] == "1") {
timers[i] = "\uE003\uE00C\uE003";
@@ -3593,7 +3678,13 @@ function getSchedule(schchan){
getRecOK = 2;
} else {
getRecOK = 0;
+
mediaList.innerHTML = "<h1><center style='font-size:" + fsRec + ";" + color_main_head + ";'>" + Lang[11] + "</center><pre>\n\n\n" + Lang[52] + "</pre></h1>";
+
+ if (experimental == "yes" ) {
+ mediaList.innerHTML += "<img src='" + channels[schchan] + ".jpg' style='width:100%; position:absolute; left:0%; top:-11%;'>";
+ }
+
}
} catch(e) {
getRecOK = 0;
diff --git a/settings.js b/settings.js
index 41ef007..94debc7 100644
--- a/settings.js
+++ b/settings.js
@@ -2,19 +2,47 @@
// 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
-// var Xfactor = 720 / 720; var Yfactor = 576 / 576;
+Xfactor[0] = 720 / 720; Yfactor[0] = 576 / 576;
// 1280x720
-// var Xfactor = 1280 / 720; var Yfactor = 720 / 576;
+Xfactor[1] = 1280 / 720; Yfactor[1] = 720 / 576;
// 1920x1080
-var Xfactor = 1920 / 720; var Yfactor = 1080 / 576;
+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");
+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
var StartVolume = 15; // Volume on (re)start of the portal.
var currChan = 10; // default channel
+var experimental = "yes" ;// Use some experimental code
+
//
//
//
@@ -49,7 +77,7 @@ var recServ = ":8000";
var RestFulAPI = ":8002";
var MPDAddress = ":8888";
-var channeldigits = 2; // 0 - Max 9, 1 max 99, 2 max 999 or 3 max 9999 channels directly selectable by numbers (Don't set it to > 2 it crashes the player)
+var channeldigits = 2; // 0 - Max 9, 1 max 99, 2 max 999 or 3 max 9999 channels directly selectable by numbers
var audio = 0;
var audio_dyn = 0;
@@ -207,22 +235,22 @@ var color_progress2;
var color_notset;
-var fsAudio = (16*Yfactor) + "px";
-var fsTime = (16*Yfactor) + "px";
-var fsName = (27*Yfactor) + "px";
-var fsMenu = (27*Yfactor) + "px";
-var fsChan = (43*Yfactor) + "px";
-var fsCA = (32*Yfactor) + "px";
-var fsMenuMain = (35*Yfactor) + "px";
-var fsEpg = (19*Yfactor) + "px";
-var fsEpginfo = (21*Yfactor) + "px";
-var fsList = (18*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";
-var fsKeys = (19*Yfactor) + "px";
+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 AvInfo = new Array();
var xx = 0;
@@ -284,3 +312,4 @@ var used_space = 0;
var perc_space = 0;
var isPause = 0; //used by pause routine.
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-19 05:29:43 +0000