diff options
| -rw-r--r-- | History | 4 | ||||
| -rw-r--r-- | javascript/main.js | 13 | ||||
| -rw-r--r-- | javascript/settings.js | 5 |
3 files changed, 12 insertions, 10 deletions
@@ -26,7 +26,9 @@ VDR 1.7.29+ Bash Script update, default channel of a group is now the first channel (override this in config\custom.js) 'timed' 0 to swap previous <> current channel, first channel of a group can't be 0 (1000,2000 etc) anymore Added global server setting (default = 1, act as before. 0 = set for every channel server address) - + Added option to select how TXT start, 50/50 txt/tv or 100% txt + Retry url after 30 sec in case of error (can be switched off, interval can be set in settings.js) + 0.25 Get recordings from Streamdev, Restfulapi or SmartTVweb. diff --git a/javascript/main.js b/javascript/main.js index bd790f8..d6bd315 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -2079,18 +2079,18 @@ function embedTeletextPlugin() { teletext.id = "teletext"; teletext.type = "application/motorola-teletext-plugin"; teletext.style.position = "absolute"; - teletext.style.width = "100%"; teletext.style.height = "100%"; teletext.style.top = "10px"; // has to be 1 rather than 0 teletext.style.left = "10px"; // has to be 1 rather than 0 teletext.style.zIndex = "501"; teletext.style.visibility = "hidden"; - document.body.appendChild(teletext); + return teletext; } function setVisible(isVisible) { if (isVisible) { + document.body.appendChild(teletext); if (txtfull_screen) { teletext.style.width = "100%"; } else { @@ -3359,12 +3359,12 @@ 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 (KeepTrying) { + ErrorAgain = 0; + setTimeout("mediaPlayer.close();mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",TryingInterval); } else { ErrorAgain = 0; - alert("Media player state changed: state=" + ev.state + ", reason=" + ev.reason + ", code=" + ev.code); + //alert("Media player state changed: state=" + ev.state + ", reason=" + ev.reason + ", code=" + ev.code); showDisplay("ERRR", false, 100, 0 ); if (experimental) { settimer(0,ev.reason,0,2,color_error); @@ -3373,7 +3373,6 @@ if (MPDListener == 0) { } } } - } else { if ( ev.state == 6 && ev.reason == "HostUnreachable" ) { showDisplay("ERRR", false, 100, 0 ); diff --git a/javascript/settings.js b/javascript/settings.js index c280db4..df04b1c 100644 --- a/javascript/settings.js +++ b/javascript/settings.js @@ -2,7 +2,7 @@ // Default settings // -var Version = "0.26.12"; +var Version = "0.26.13"; server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://192.168.178.56","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21","http://192.168.2.100","http://192.168.178.52"); @@ -15,6 +15,8 @@ var Global_Server = 1;// 1 = old style. 0 = every channel needs server_address[c var Server_Address = new Array(); var Global_Multicast = 0;// 1 = use only MultiCast var txtfull_screen = 1;// 0 = 50/50 % txt/tv, 1 = 100% txt +var KeepTrying = 1;//No display of error, but keep trying to restart the stream +var TryingInterval = 30 * 1000; // 30 Seconds. OSDLang = new Array ("English", "Nederlands", "Deutsch"); langfile = new Array ("languages/lang_eng.js", "languages/lang_dut.js","languages/lang_ger.js"); @@ -88,7 +90,6 @@ var afterRecTime = 600 ; // for local recordings time after recording in seconds // var experimental;// Use some experimental code -var Exp_Multi;// Use some experimental code for multicast streams var lang_nr; var testing2; var ShowSubs; //Flash stored |