diff options
| -rw-r--r-- | History | 3 | ||||
| -rw-r--r-- | javascript/channels.js | 138 | ||||
| -rw-r--r-- | javascript/main.js | 44 | ||||
| -rw-r--r-- | javascript/settings.js | 1 |
4 files changed, 104 insertions, 82 deletions
@@ -20,6 +20,9 @@ VDR 1.7.29+ (if server is stopped/restarted you get this error) Black skin is getting completer BVN has no epg (unknown language code) + Autoset number of digits lower if needed (default on but can be switched back to old behaviour) + Epg info update for non C/T/S channels + Changed key word 'FullURL' to 'IPTV' 0.26 Fix for [undefined] in (search)timer menu when there are no (search)timers on server diff --git a/javascript/channels.js b/javascript/channels.js index a3ad65c..2d63a0b 100644 --- a/javascript/channels.js +++ b/javascript/channels.js @@ -3210,78 +3210,80 @@ channelsnames[6010]="Brazzers TV"; channels[6010]="S19.2E-53-1119-12882"; channelsnames[6011]="Hustler TV"; channels[6011]="S19.2E-53-1119-12883"; -channelsnames[6012]="FRENCH LOVER"; -channels[6012]="S19.2E-1-1018-6407"; -channelsnames[6013]="LIBIDO TV"; -channels[6013]="S19.2E-1-1018-6402"; -channelsnames[6014]="BRAZZERS TV Europe"; -channels[6014]="S13.0E-318-12200-7461"; -channelsnames[6015]="PRIVATE TV"; -channels[6015]="S13.0E-318-13300-4960"; -channelsnames[6016]="FL TV"; -channels[6016]="S13.0E-318-15400-13512"; +channelsnames[6012]="FRENCH LOVER HD"; +channels[6012]="S19.2E-1-1024-8501"; +channelsnames[6013]="LIBIDO TV HD"; +channels[6013]="S19.2E-1-1024-8504"; +channelsnames[6014]="PINK X HD"; +channels[6014]="S19.2E-1-1024-8508"; +channelsnames[6015]="BRAZZERS TV Europe"; +channels[6015]="S13.0E-318-12200-7461"; +channelsnames[6016]="PRIVATE TV"; +channels[6016]="S13.0E-318-13300-4960"; channelsnames[6017]="Venus"; channels[6017]="S30.0W-83-102-213"; channelsnames[6018]="Leo TV"; channels[6018]="S23.5E-3-3219-13142"; channelsnames[6019]="Vivid"; channels[6019]="S19.2E-53-1105-4064"; -channelsnames[6020]="Vivid CZ"; -channels[6020]="S19.2E-53-1105-4065"; -channelsnames[6021]="Dorcel TV"; -channels[6021]="S19.2E-1-1094-17029"; -channelsnames[6022]="XXL"; -channels[6022]="S19.2E-1-1094-17054"; -channelsnames[6023]="Dorcel TV"; -channels[6023]="S19.2E-1-1094-17059"; -channelsnames[6024]="DORCEL XXX"; -channels[6024]="S19.2E-1-1096-8613"; -channelsnames[6025]="Hustler TV CZ"; -channels[6025]="S19.2E-53-1119-12884"; -channelsnames[6026]="XXL"; -channels[6026]="S13.0E-319-9900-468"; -channelsnames[6027]="SCT HD"; -channels[6027]="S13.0E-318-5000-10"; -channelsnames[6028]="Redlight HD"; -channels[6028]="S13.0E-318-15800-16932"; -channelsnames[6029]="Daring tv! 133"; -channels[6029]="S13.0E-318-13300-4961"; -channelsnames[6030]="EROXXX"; -channels[6030]="S23.5E-3-3212-14055"; -channelsnames[6031]="Brazzers TV"; -channels[6031]="S23.5E-3-3221-5061"; -channelsnames[6032]="Hustler HD"; -channels[6032]="S13.0E-318-15800-16933"; -channelsnames[6033]="Penthouse"; -channels[6033]="S23.5E-3-3222-20917"; -channelsnames[6034]="Penthouse CZ"; -channels[6034]="S23.5E-3-3222-20957"; -channelsnames[6035]="PENTHOUSE HD"; -channels[6035]="S19.2E-1-1086-9907"; -channelsnames[6036]="PLAYBOY TV"; -channels[6036]="S19.2E-1-1060-30603"; -channelsnames[6037]="Brazzers TV CZ"; -channels[6037]="S23.5E-3-3221-5069"; -channelsnames[6038]="Beate-Uhse.TV,BeateU"; -channels[6038]="S19.2E-133-17-21"; -channelsnames[6039]="Hustler HD"; -channels[6039]="S23.5E-3-3211-20830"; -channelsnames[6040]="Hustler HD CZ"; -channels[6040]="S23.5E-3-3211-20831"; -channelsnames[6041]="Redlight HD!"; -channels[6041]="S13.0E-318-15800-16943"; -channelsnames[6042]="Hustler HD!"; -channels[6042]="S13.0E-318-15800-16944"; -channelsnames[6043]="XXL PL"; -channels[6043]="S13.0E-319-9900-469"; -channelsnames[6044]="Penthouse HD"; -channels[6044]="S23.5E-3-3236-5711"; -channelsnames[6045]="Penthouse HD1"; -channels[6045]="S23.5E-3-3236-5712"; -channelsnames[6046]="Penthouse HD2"; -channels[6046]="S23.5E-3-3236-5713"; -channelsnames[6047]="Penthouse 3D"; -channels[6047]="S23.5E-3-3204-5311"; +channelsnames[6020]="FL TV"; +channels[6020]="S13.0E-318-15400-13512"; +channelsnames[6021]="Vivid CZ"; +channels[6021]="S19.2E-53-1105-4065"; +channelsnames[6022]="Dorcel TV"; +channels[6022]="S19.2E-1-1094-17029"; +channelsnames[6023]="XXL"; +channels[6023]="S19.2E-1-1094-17054"; +channelsnames[6024]="Dorcel TV"; +channels[6024]="S19.2E-1-1094-17059"; +channelsnames[6025]="DORCEL XXX"; +channels[6025]="S19.2E-1-1096-8613"; +channelsnames[6026]="Hustler TV CZ"; +channels[6026]="S19.2E-53-1119-12884"; +channelsnames[6027]="XXL"; +channels[6027]="S13.0E-319-9900-468"; +channelsnames[6028]="SCT HD"; +channels[6028]="S13.0E-318-5000-10"; +channelsnames[6029]="Redlight HD"; +channels[6029]="S13.0E-318-15800-16932"; +channelsnames[6030]="Daring tv! 133"; +channels[6030]="S13.0E-318-13300-4961"; +channelsnames[6031]="EROXXX"; +channels[6031]="S23.5E-3-3212-14055"; +channelsnames[6032]="Brazzers TV"; +channels[6032]="S23.5E-3-3221-5061"; +channelsnames[6033]="Hustler HD"; +channels[6033]="S13.0E-318-15800-16933"; +channelsnames[6034]="Penthouse"; +channels[6034]="S23.5E-3-3222-20917"; +channelsnames[6035]="Penthouse CZ"; +channels[6035]="S23.5E-3-3222-20957"; +channelsnames[6036]="PENTHOUSE HD"; +channels[6036]="S19.2E-1-1086-9907"; +channelsnames[6037]="PLAYBOY TV"; +channels[6037]="S19.2E-1-1060-30603"; +channelsnames[6038]="Brazzers TV CZ"; +channels[6038]="S23.5E-3-3221-5069"; +channelsnames[6039]="Beate-Uhse.TV,BeateU"; +channels[6039]="S19.2E-133-17-21"; +channelsnames[6040]="Hustler HD"; +channels[6040]="S23.5E-3-3211-20830"; +channelsnames[6041]="Hustler HD CZ"; +channels[6041]="S23.5E-3-3211-20831"; +channelsnames[6042]="Redlight HD!"; +channels[6042]="S13.0E-318-15800-16943"; +channelsnames[6043]="Hustler HD!"; +channels[6043]="S13.0E-318-15800-16944"; +channelsnames[6044]="XXL PL"; +channels[6044]="S13.0E-319-9900-469"; +channelsnames[6045]="Penthouse HD"; +channels[6045]="S23.5E-3-3236-5711"; +channelsnames[6046]="Penthouse HD1"; +channels[6046]="S23.5E-3-3236-5712"; +channelsnames[6047]="Penthouse HD2"; +channels[6047]="S23.5E-3-3236-5713"; +channelsnames[6048]="Penthouse 3D"; +channels[6048]="S23.5E-3-3204-5311"; channelsnames[8001]="NPO 1"; channels[8001]="T-8720-2214-1101"; channelsnames[8002]="NPO 2"; @@ -3539,7 +3541,7 @@ minChan[5] = 5001; maxChan[5] = 5100; baseChn[5] = 5000; minChan[6] = 6001; -maxChan[6] = 6047; +maxChan[6] = 6048; baseChn[6] = 6000; minChan[8] = 8001; maxChan[8] = 8059; @@ -3558,4 +3560,4 @@ defChan[6] = minChan[6]; protChn[6] = 1; defChan[7] = minChan[7]; protChn[7] = 0; defChan[8] = minChan[8]; protChn[8] = 0; defChan[9] = minChan[9]; protChn[9] = 0; -Chan_Ver = "07/26/15 10:45:06" ; +Chan_Ver = "08/11/15 18:11:30" ; diff --git a/javascript/main.js b/javascript/main.js index a8df190..49b10a4 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -206,7 +206,7 @@ function GetSettings() { audio = Number(is.getObject("vip.languagepriority")); for (var i=0;i<10;i++) { - if (ServerAdres[i] == "FullURL" || ServerAdres[i] == "MultiCast") { + if (ServerAdres[i] == "IPTV" || ServerAdres[i] == "MultiCast") { // url ready } else { ServerAdres[i] = server_ip + StreamPort; @@ -494,11 +494,11 @@ try { var x = Math.floor(currChan / 256); uri = "239.255." + x.toString() + "." + (currChan - ( x * 256)).toString() + ":11111"; initialDelayPlay = 0; - } else if (Global_Server && ServerAdres[ChanGroup] !== "MultiCast" && ServerAdres[ChanGroup] !== "FullURL") { + } else if (Global_Server && ServerAdres[ChanGroup] !== "MultiCast" && ServerAdres[ChanGroup] !== "IPTV") { uri = ServerAdres[ChanGroup] + uri; } else if (ServerAdres[ChanGroup] == "MultiCast" ) { SI=channels[currChan].split("-"); uri = SI[4]; - } else if (ServerAdres[ChanGroup] == "FullURL" ) { + } else if (ServerAdres[ChanGroup] == "IPTV" ) { ;// uri = ready! } else { uri = Server_Address[currChan] + uri; @@ -528,18 +528,18 @@ function play(uri) { var x = Math.floor(currChan / 256); uri = "239.255." + x.toString() + "." + (currChan - ( x * 256)).toString() + ":11111"; initialDelayPlay = 0; - } else if (Global_Server && ServerAdres[ChanGroup] !== "MultiCast" && ServerAdres[ChanGroup] !== "FullURL") { + } else if (Global_Server && ServerAdres[ChanGroup] !== "MultiCast" && ServerAdres[ChanGroup] !== "IPTV") { uri = ServerAdres[ChanGroup] + uri; } else if (ServerAdres[ChanGroup] == "MultiCast" ) { SI=channels[currChan].split("-"); uri = SI[4]; - } else if (ServerAdres[ChanGroup] == "FullURL" ) { + } else if (ServerAdres[ChanGroup] == "IPTV" ) { ;// uri = ready! } else { uri = Server_Address[currChan] + uri; } -alert(uri); -alert(ChanGroup); + //alert(uri); + //alert(ChanGroup); URL = uri; @@ -1361,7 +1361,11 @@ function Makedigit() { showDisplay((Change.toString()), false, 100, 0 ); } - if (count>channeldigits) { + var x = channeldigits; + var y = (maxChan[ChanGroup] - baseChn[ChanGroup]).toString().length - 1; + if (autodigits && (y < x )) { x = y;} + + if (count>x) { CheckChannel(Change); count = 0; } else { @@ -1497,16 +1501,28 @@ function OSDchannr(channr) { //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]); } function OSDhtml(){ osdtime.innerHTML = "<span class=osdtime" + cssres[css_nr][Set_Res] + ">" + result + "</span>"; + var sx = channels[currChan].split("-")[0]; + if (Left(sx,1) !== "S" && Left(sx,1) !== "C" && Left(sx,1) !== "T") { + EPG[0][7][currChan] = sx; + EPG[1][7][currChan] = Lang[52]; + EPG[0][8][currChan] = ""; + EPG[1][8][currChan] = ""; + EPG[0][9][currChan] = ""; + EPG[1][9][currChan] = ""; + EPG[1][5][currChan] = sx; + sx = "IP"; + } + if (ShowSource == 1) { - osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + ">" + channels[currChan].split("-")[0] + "\uE003" + channelsnames[currChan] + "</span>"; + osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + ">" + sx + "\uE003" + channelsnames[currChan] + "</span>"; } else { osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + "> \uE003 " + channelsnames[currChan] + "</span>"; } + osdepg.innerHTML = "<pre class=osdepg" + cssres[css_nr][Set_Res] + ">" + EPG[0][7][currChan] + "</pre>\n<pre class=osdepg" + cssres[css_nr][Set_Res] + ">" + EPG[1][7][currChan] + "</pre>"; osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">" + "<p class=epg_head>" + currChan + "\uE003" + channelsnames[currChan] + "</p><p class=epg_avinfo>" + AvInfo[currChan] + "</p><p class=epg_title>" + EPG[0][7][currChan] + EPG[0][9][currChan] + EPG[0][8][currChan] + "</p>\n<p class=epg_info>" + EPG[0][4][currChan] + "</p>\n<p class=epg_info_long>" + Left(EPG[0][5][currChan],750) + "</p></span>"; osdepginfonext.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">" + "<p class=epg_head>" + currChan + "\uE003" + channelsnames[currChan] + "</p><p class=epg_title>" + EPG[1][7][currChan] + EPG[1][9][currChan] + EPG[1][8][currChan] + "</p>\n<p class=epg_info>" + EPG[1][4][currChan] + "</p>\n<p class=epg_info_long>" + Left(EPG[1][5][currChan],750) + "</p></span>"; @@ -2742,7 +2758,7 @@ function onKeyMenu(keyCode) { GetServerIP(); for (var i=0;i<10;i++) { - if (ServerAdres[i] == "FullURL" || ServerAdres[i] == "MultiCast") { + if (ServerAdres[i] == "IPTV" || ServerAdres[i] == "MultiCast") { // url ready } else { ServerAdres[i] = server_ip + StreamPort; @@ -4512,8 +4528,8 @@ function DelRec2() { xmlhttp=new XMLHttpRequest(); xmlhttp.open("POST",(server_ip + recServ + "/deleteRecording.xml?id=" + recGUID[currMed] ),false); xmlhttp.send(); - recList[currMed] = ""; recGroup[currMed] = -1; + recList[currMed] = ""; recProt[currMed] = 0; } catch(e) { alert("Delete Recordings problem: " + e); @@ -5310,11 +5326,11 @@ function onScheduledStart(event) { if (Global_Multicast) { var x = Math.floor(recChannr / 256); recChan = "239.255." + x.toString() + "." + (recChannr - ( x * 256)).toString() + ":11111"; - } else if (Global_Server && ServerAdres[recGroup] !== "MultiCast" && ServerAdres[recGroup] !== "FullURL") { + } else if (Global_Server && ServerAdres[recGroup] !== "MultiCast" && ServerAdres[recGroup] !== "IPTV") { recChan = ServerAdres[recGroup] + channels[recChannr]; } else if (ServerAdres[recGroup] == "MultiCast" ) { SI=channels[recChannr].split("-"); recChan = SI[4]; - } else if (ServerAdres[recGroup] == "FullURL" ) { + } else if (ServerAdres[recGroup] == "IPTV" ) { recChan = channels[recChannr]; } else { recChan = Server_Address[recChannr] + channels[recChannr]; diff --git a/javascript/settings.js b/javascript/settings.js index adfa977..692a6b6 100644 --- a/javascript/settings.js +++ b/javascript/settings.js @@ -99,6 +99,7 @@ var StreamPort = ":" + "3000" + "/"; //var StreamPort = ":" + "8000" + "/live/"; var channeldigits = 2; // 0 - Max 9, 1 max 99, 2 max 999 or 3 max 9999 channels directly selectable by numbers +var autodigits = 1; //0 like before, 1 if max in group is < 99 autoset digits to 1, if max < 9 autoset to 0. Autoset can't be > channeldigits var Fav_group = 10; // Favorite Group 10 |