mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

yWeb: dont zap on channel change

Browse Source
This commit is contained in:
Jacek Jendrzej
2014-04-09 17:02:05 +02:00
parent f1028f0d16
commit 74e1cb7f14
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nhttpd/web/Y_Live.js
View File

@@ -16,6 +16,7 @@ var Mode = "tv";
var AudioChannel = 0; var AudioChannel = 0;
var isSubs=false; var isSubs=false;
var g_intervall=null; var g_intervall=null;
var current_channel = 0;
/*resize,init*/ /*resize,init*/
function do_onload(){ function do_onload(){
if(Mode != "tv" && Mode != "radio") if(Mode != "tv" && Mode != "radio")
@@ -194,7 +195,11 @@ function do_play_state(_state, _options){
if(Mode == "tv" && isUDP) if(Mode == "tv" && isUDP)
mrl = "udp://@:31330"; mrl = "udp://@:31330";
else else
mrl = loadSyncURL("/control/build_live_url"); if(current_channel)
mrl = "http://" + window.location.host + ":31339/id=" + current_channel;
else
mrl = loadSyncURL("/control/build_live_url");
V2.set_actual_mrl(mrl); V2.set_actual_mrl(mrl);
V2.play(); V2.play();
V2.next(); V2.next();
@@ -236,8 +241,10 @@ function change_channel(){
var dd = id('channels'); var dd = id('channels');
var channel = -1; var channel = -1;
var sel = dd.selectedIndex; var sel = dd.selectedIndex;
if(sel != -1) if(sel != -1){
channel = dd[sel].value; channel = dd[sel].value;
current_channel = channel;
}
do_stop(); do_stop();
AudioChannel = 0; AudioChannel = 0;
window.setTimeout("change_channel_zapto(\""+channel+"\")",100); window.setTimeout("change_channel_zapto(\""+channel+"\")",100);
@@ -246,14 +253,16 @@ function change_sub_channel(){
var dd = id('subs'); var dd = id('subs');
var channel = -1; var channel = -1;
var sel = dd.selectedIndex; var sel = dd.selectedIndex;
if(sel != -1) if(sel != -1){
channel = dd[sel].value; channel = dd[sel].value;
current_channel = channel;
}
do_stop(); do_stop();
AudioChannel = 0; AudioChannel = 0;
window.setTimeout("change_channel_zapto(\""+channel+"\")",100); window.setTimeout("change_channel_zapto(\""+channel+"\")",100);
} }
function change_channel_zapto(channel){ function change_channel_zapto(channel){
dbox_zapto(channel); //dbox_zapto(channel);
window.setTimeout("change_channel_play()",500); window.setTimeout("change_channel_play()",500);
} }
function build_subchannels(){ function build_subchannels(){