summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--History3
-rw-r--r--channels.js10
-rw-r--r--channels3.js2
-rw-r--r--index.html98
-rw-r--r--settings.js2
5 files changed, 87 insertions, 28 deletions
diff --git a/History b/History
index dffa62b..6ba71f0 100644
--- a/History
+++ b/History
@@ -17,7 +17,8 @@ VDR 1.7.29 / 2.1.1
Added group 4, some Polish channels (NC+ sorting order)
During play '0' jumps to 0:00:00 and now resets posmark index also to 0
Sort the Recordingslist so no double maps are shown
- Volume steps are 1, if volume < 10
+ Volume steps are 1, if volume < 5
+ in EPG/ Guide view you can switch groups with << and >> (Live Update only if 19x3 with pip enabled image)
0.22 Updated EPG filter for 42E, canal sat (tid 1088), canal+ (tid 1060), CDS (veronica, iConcerts, Animax)
diff --git a/channels.js b/channels.js
index 1c0ed98..c7098dc 100644
--- a/channels.js
+++ b/channels.js
@@ -67,8 +67,8 @@ channelsnames[15] = "iConcerts (S)";
channels[15] = "S23.5E-3-3211-20823";
channelsnames[16] = "SyFy Universal (S)";
channels[16] = "S23.5E-53-1105-20822";
-channelsnames[18] = "NG Wild DUT (S)";
-channels[18] = "S23.5E-3-3210-5145";
+channelsnames[18] = "NG Wild (S)";
+channels[18] = "S23.5E-3-3210-5072";
//channelsnames[19] = "History channel DUT (S)";
//channels[19] = "S23.5E-3-3210-5140";
channelsnames[20] = "Animax (S)";
@@ -250,7 +250,7 @@ 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";
+channels[122] = "S28.2E-2-2076-54110";
channelsnames[123] = "Men & Movies+1 (S)";
channels[123] = "S28.2E-2-2081-51120";
channelsnames[124] = "movies4men (S)";
@@ -378,7 +378,7 @@ channels[244] = "S28.2E-2-2301-52105";
channelsnames[245] = "horror ch+1 (S)";
channels[245] = "S28.2E-2-2311-52002";
channelsnames[246] = "Men & Movies (S)";
-channels[246] = "S28.2E-2-2602-54110";
+channels[246] = "S28.2E-2-2076-54110";
channelsnames[247] = "Men & Movies+1 (S)";
channels[247] = "S28.2E-2-2081-51120";
channelsnames[248] = "movies4men (S)";
@@ -419,7 +419,7 @@ channels[268] = "S28.2E-2-2031-6025";
channelsnames[269] = "Sky Arts 1 (S)";
channels[269] = "S28.2E-2-2030-4604";
channelsnames[270] = "Sky Arts 2 (S)";
-channels[270] = "S28.2E-2-2401-5206";
+channels[270] = "S28.2E-2-2023-4900";
channelsnames[271] = "Sony TV (S)";
channels[271] = "S28.2E-2-2311-52005";
channelsnames[272] = "Sony TV +1 (S)";
diff --git a/channels3.js b/channels3.js
index ef6f4b2..570f482 100644
--- a/channels3.js
+++ b/channels3.js
@@ -330,4 +330,4 @@ channels[3606] = "S42.0E-42-502-16";
-maxChan[3] = 3607; // set to max channel else you see 'undefined' in guide view
+maxChan[3] = 3606; // set to max channel else you see 'undefined' in guide view
diff --git a/index.html b/index.html
index 077adff..f069215 100644
--- a/index.html
+++ b/index.html
@@ -21,7 +21,7 @@
//
//
-var Version = "0.23.6"
+var Version = "0.23.9"
window.onkeydown = onKeyDown;
@@ -310,7 +310,7 @@ function decChan(step) {
}
function VolumeUp() {
- if (Volume < 10) {
+ if (Volume < 5) {
var VolStep = 1;
} else {
var VolStep = VolumeStep;
@@ -325,7 +325,7 @@ function VolumeUp() {
}
function VolumeDown() {
- if (Volume > 10) {
+ if (Volume > 5) {
var VolStep = VolumeStep;
} else {
var VolStep = 1;
@@ -376,7 +376,7 @@ function createPip() {
function addPipVideoplane() {
var pipVideoDiv = document.getElementById("pipVideoDiv");
- pipVideoDiv.innerHTML = "<videoplane id='pipvideoplane' index=1 style='position:fixed;left:70%;top:10%;height:20%;width:20%;z-index:550;'></videoplane>";
+ pipVideoDiv.innerHTML = "<videoplane id='pipvideoplane' index=1 style='position:fixed;left:70%;top:60%;height:20%;width:20%;z-index:50;'></videoplane>";
document.body.appendChild(pipVideoDiv);
}
@@ -385,7 +385,16 @@ try {
if (pipPlayer.getState() != pipPlayer.STATE_IDLE) {
pipPlayer.close();
}
- uri = ServerAdres[0] + uri;
+
+ if (ServerAdres[ChanGroup] == "MultiCast" ) {
+ SI=channels[currChan].split("-");
+ uri = SI[4];
+ } else if (ServerAdres[ChanGroup] == "FullURL" ) {
+ // uri = ready!
+ } else {
+ uri = ServerAdres[ChanGroup] + uri;
+ }
+
pipPlayer.open(uri);
pipPlayer.play(1000);
} catch (e) {
@@ -453,8 +462,13 @@ function play(uri) {
function preview(urip) {
if(SwitchGuide) {
- play(urip);
+ play(urip);
+ } else if (PipSwitchGuide && fullupdate) {
+ pipplay(urip);
}
+
+
+
if (isSchedule) { schedule.style.opacity = 0; isSchedule = 0;}
if (epgactive) { osdepginfo.style.opacity = 0; osdepginfonext.style.opacity = 0; epgactive = 0;}
showChannelList();
@@ -592,10 +606,16 @@ function startTimeshiftBuffering() {
function FullScreen() {
- videoplane.style.width = "100%";
- videoplane.style.height = "100%";
- videoplane.style.left = "0px";
- videoplane.style.top = "0px";
+ videoplane.style.width = "100%";
+ videoplane.style.height = "100%";
+ videoplane.style.left = "0px";
+ videoplane.style.top = "0px";
+ if(PipSwitchGuide && pipPlayer){
+ if (pipPlayer.getState() != pipPlayer.STATE_IDLE) {
+ pipPlayer.close();
+ }
+ pipPlayer.releaseInstance();
+ }
}
@@ -839,6 +859,7 @@ function onKeyDown(event) {
isFullscreen = 1;
FullScreen();
currChan = preChan;
+ ChanGroup = preGrp;
}
}
break;
@@ -908,6 +929,10 @@ function onKeyDown(event) {
case KEY_FAV:
case "Scroll":
if(isFullscreen) {
+ if(PipSwitchGuide){
+// addPipVideoplane();
+ createPip();
+ }
NowNext = 0;
videoplane.style.width = (320*Xfactor[Set_Res])+"px";
videoplane.style.height = (240*Yfactor[Set_Res])+"px";
@@ -921,6 +946,7 @@ function onKeyDown(event) {
showChannelList();
if(!SwitchGuide) {
preChan = currChan;
+ preGrp = ChanGroup;
}
} else {
isSchedule = 0;
@@ -929,6 +955,7 @@ function onKeyDown(event) {
FullScreen();
if(!SwitchGuide) {
currChan = preChan;
+ ChanGroup = preGrp;
}
}
break;
@@ -1008,12 +1035,44 @@ function onKeyDown(event) {
VolumeDown();
break;
- case "MediaRewind":
+ case "MediaRewind":
+ if(isFullscreen) {
mediaPlayer.play(mediaPlayer.PACE_REWIND);
- break;
- case "MediaForward":
+ } else {
+ count = 0; Change = 0;
+ defChan[ChanGroup] = currChan;
+ do {
+ do
+ ChanGroup = ChanGroup - 1;
+ while (protChn[ChanGroup] == 1 && ShowProtectedChannels == 1)
+ if (ChanGroup < 0) {
+ ChanGroup = 9;
+ }
+ }
+ while (!minChan[ChanGroup]);
+ currChan = defChan[ChanGroup];
+ preview(channels[currChan]);
+ }
+ break;
+ case "MediaForward":
+ if(isFullscreen) {
mediaPlayer.play(mediaPlayer.PACE_FASTFORWARD);
- break;
+ } else {
+ count = 0; Change = 0;
+ defChan[ChanGroup] = currChan;
+ do{
+ do
+ ChanGroup = ChanGroup + 1;
+ while (protChn[ChanGroup] == 1 && ShowProtectedChannels == 1)
+ if (ChanGroup > 9) {
+ ChanGroup = 0;
+ }
+ }
+ while (!minChan[ChanGroup]);
+ currChan = defChan[ChanGroup];
+ preview(channels[currChan]);
+ }
+ break;
case "MediaPlayPause":
if(isFullscreen && PauseOnServer) {
@@ -1181,7 +1240,7 @@ function showVolume() {
if (osdVolumetimeout) {
clearTimeout(osdVolumetimeout);
}
- osdvolume.innerHTML = Lang[1] + " : \uE007" + (new Array(Volume)).join("\uE008") + (new Array(100 - Volume)).join("\uE009") + "\uE00A";
+ osdvolume.innerHTML = Lang[1] + " : " + Volume + "% \uE007" + (new Array(Volume)).join("\uE008") + (new Array(100 - Volume)).join("\uE009") + "\uE00A";
osdvolume.style.opacity = 1;
osdVolumetimeout = setTimeout("osdvolume.style.opacity = 0;", ShowOsdTime);
}
@@ -4214,12 +4273,9 @@ function ClearScreen() {
<body onload="onLoad()" onunload="onUnload()">
<embed type="application/x-motorola-toi" hidden="true">
- <div id="channelList" style="width:100%; height:48%; position:absolute; left:7%; top:4%;"></div>
-
-
- <div id="colorkeys" style="width:100%; position:absolute; left:10%; top:84%;"></div>
-
- <div id="chanlistepg" style="width:42%; position:absolute; left:7%; top:50%;"> </div>
+ <div id="channelList" style="width:100%; height:48%; position:absolute; left:7%; top:4%;;z-index:400;"></div>
+ <div id="colorkeys" style="width:100%; position:absolute; left:10%; top:84%;z-index:401;"></div>
+ <div id="chanlistepg" style="width:42%; position:absolute; left:7%; top:50%;z-index:402;"></div>
<videoplane id='videoplane' style='position:absolute;left:0px;top:0px;height:100%;width:100%;z-index:500;'></videoplane>
<div id="pipVideoDiv" ></div>
diff --git a/settings.js b/settings.js
index ad3d6d9..bf13dc8 100644
--- a/settings.js
+++ b/settings.js
@@ -20,6 +20,7 @@ var UseNewReclist = 1 ; //use new recordingslist function
var ShowSubDir = 1 ; // 0 = no, 1 = yes (default) // show seperate maps for subdirs in menu recordings
var showClock = 0; // 0 = no, 1 = yes
var SwitchGuide = 0; // 0 = no, 1 = yes
+var PipSwitchGuide = 1; // 0 = no, 1 = yes
var TimeShift = 0; // 0 = no, 1 = yes timeshift
var ShowSubs = 1; // 0 = no, 1 = yes (default)
var KillStream = 1; // 1 = Close stream on Standby
@@ -207,6 +208,7 @@ var osdtimeout = 0;
var osdVolumetimeout = 0;
var epgactive = 0;
var preChan = 0;
+var preGrp = 0;
var timerChan = 10;
var TimerActions;
var switchtimerID = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-21 02:13:17 +0000