diff options
| -rw-r--r-- | History | 2 | ||||
| -rw-r--r-- | index.html | 3 | ||||
| -rw-r--r-- | javascript/main.js | 19 | ||||
| -rw-r--r-- | javascript/settings.js | 19 | ||||
| -rw-r--r-- | skins/blue.css | 9 |
5 files changed, 41 insertions, 11 deletions
@@ -16,6 +16,8 @@ VDR 1.7.29+ Timed change, set to 0 for old behavior (press ok for change) epginfo box was left active but invisible when pressed menu(green key didn't change audio but show epginfonext) add to favorite now refreshes view + added keys from Motorola NYX remote. (Both up/down/left/right keys do the same) + Turn record key off 0.25 Get recordings from Streamdev, Restfulapi or SmartTVweb. Check if SmartTVweb is on the server if not turn SmartTVweb options off @@ -39,7 +39,8 @@ <div id="osdtimer"></div> <div id="osdepg"></div> <div id="osdtime"></div> - <div id="osdca"></div> + <div id="osdca"></div> + <div id="osdlogo"></div> </div> <div id="schedule"></div> diff --git a/javascript/main.js b/javascript/main.js index 95a0af5..7d67bbb 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -657,7 +657,8 @@ function onKeyDown(event) { switch(event.keyIdentifier) { - case "ChannelUp": + case KEY_UP1: + case KEY_UP2: case "Up": if(isFullscreen) { count = 0; Change = 0; @@ -679,7 +680,9 @@ function onKeyDown(event) { preview(channels[currChan]); } break; - case "ChannelDown": + + case KEY_DOWN1: + case KEY_DOWN2: case "Down": if(isFullscreen) { count = 0; Change = 0; @@ -701,6 +704,8 @@ function onKeyDown(event) { preview(channels[currChan]); } break; + + case KEY_LEFT2: case "Left": count = 0; Change = 0; if(isFullscreen) { @@ -732,6 +737,8 @@ function onKeyDown(event) { preview(channels[currChan]); } break; + + case KEY_RIGHT2: case "Right": count = 0; Change = 0; if(isFullscreen) { @@ -1369,7 +1376,7 @@ function onCacheUpdated() { function OSDchannr(channr) { // Show logo's if (experimental) { -// osdnr.innerHTML = "<img src='" + channels[currChan] + ".logo.jpg' style='width:80%; max-height:100%; position:absolute; left:10%;' >"; + osdlogo.innerHTML = "<img src='experimental/logo/" + channels[currChan] + ".png' >"; } osdnr.innerHTML = "<span class=osdnr" + cssres[css_nr][Set_Res] + ">" + Right(channr,3) + "</span>"; // alert(cssres[css_nr][Set_Res]); @@ -3273,9 +3280,9 @@ if (MPDListener == 0) { if (ev.reason == "CommandClose" && ErrorAgain == 0) { setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",500); ErrorAgain = 1; - } else if (ev.reason == "CommandClose" && ErrorAgain == 1) { - setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",105000); - ErrorAgain = 2; + //} else if (ev.reason == "CommandClose" && ErrorAgain == 1) { + // setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",105000); + // ErrorAgain = 2; } else { ErrorAgain = 0; alert("Media player state changed: state=" + ev.state + ", reason=" + ev.reason + ", code=" + ev.code); diff --git a/javascript/settings.js b/javascript/settings.js index db06608..cb9f802 100644 --- a/javascript/settings.js +++ b/javascript/settings.js @@ -75,7 +75,7 @@ var RecCmdsIcon = new Array("","\uE005","","","","","","","",""); var preRecTime = 300 ;// for local recordings time before recording in seconds var afterRecTime = 600 ; // for local recordings time after recording in seconds - +var No_rec_key = 1; // 0 = use rec_keys, 1 = don't use rec_keys, no server recording possible // // No need to change anything from here on. @@ -167,10 +167,17 @@ var KEY_6 = "U+0036"; var KEY_7 = "U+0037"; var KEY_8 = "U+0038"; var KEY_9 = "U+0039"; -var KEY_REC = "U+00bd"; -var KEY_REC2 = "MediaRecord"; +if (No_rec_key) { + var KEY_REC = ""; + var KEY_REC2 = ""; +} else { + var KEY_REC = "U+00bd"; + var KEY_REC2 = "MediaRecord"; +} var KEY_OK = "Accept"; //Extra keys +var KEY_DOWN1 = "ChannelDown"; +var KEY_UP1 = "ChannelUp"; // Comhem Remote var KEY_FAV = "U+e0003"; var KEY_FILM = "U+e0033"; @@ -192,7 +199,11 @@ var KEY_MPT = "MediaPreviousTrack"; var KEY_MNT = "MediaNextTrack"; // Comx remote - +// Motorola NYX remote +var KEY_RIGHT2 = "ScrollRight"; +var KEY_LEFT2 = "ScrollLeft"; +var KEY_UP2 = "ScrollUp"; +var KEY_DOWN2 = "ScrollDown"; var eitCache = null; var events = null; diff --git a/skins/blue.css b/skins/blue.css index 1e1e6da..165d5ee 100644 --- a/skins/blue.css +++ b/skins/blue.css @@ -570,6 +570,15 @@ top : 20%; } + div#osdlogo { + z-index : 505; + position : absolute; + width : 10%; + height : 30%; + left : 4%; + top : 55%; + } + div#channellist { z-index : 400; position : absolute; |