[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-544-g69480c1
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-544-g69480c1
|
From: GetAway <tux...@ne...> - 2015-05-07 18:46:05
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 69480c1578baba8b7a36e0fa27689bec2db7d40a (commit)
via 9d8f2313debcad8bc6dced2c8f16561963de8d5d (commit)
via bda8ceb4c47c70311b9dc577a5c05aa3c8dc0a7e (commit)
from 3b19f1bdf4736b1d9a711d7be2e789eda67cbbac (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 69480c1578baba8b7a36e0fa27689bec2db7d40a
Author: GetAway <get...@t-...>
Date: Thu May 7 20:45:16 2015 +0200
Y_LIVE.js: fix audio track selection for streamts
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
index a3e8075..4dd4ae4 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
@@ -213,7 +213,7 @@ function do_play_state(_state, _options)
if(Mode == "tv") {
loadXMLDoc("/control/exec?Y_Live&udp_stream&stop", dummy);
}
- mrl = loadSyncURL("/control/build_live_url");
+ mrl = loadSyncURL("/control/build_live_url?audio_no="+AudioTrack);
}
V2.set_actual_mrl(mrl);
V2.play();
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index bc6a940..73bc5b2 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.2.29
+version=2.8.2.30
date=07.05.2015
type=Release
info=Tuxbox
commit 9d8f2313debcad8bc6dced2c8f16561963de8d5d
Author: GetAway <get...@t-...>
Date: Thu May 7 20:37:02 2015 +0200
Y_LIVE.js: fix IE audio track selection for udp streaming
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
index 5c13c39..a3e8075 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
@@ -160,18 +160,18 @@ function do_play()
{
var options = new Array();
if(Mode == "tv"){
- if(isDeinterlace){
- options.push(":vout-filter=deinterlace");
- options.push(":deinterlace-mode=bob");
- }
+ if(AudioTrack != 0)
+ options.push(":audio-track="+AudioTrack);
if(isUDP && Mode == "tv"){
options.push(":access-filter=timeshift");
}
else if(cachetime > 0){
options.push(":http-caching="+cachetime);
}
- if(AudioTrack != 0)
- options.push(":audio-track="+AudioTrack);
+ if(isDeinterlace){
+ options.push(":vout-filter=deinterlace");
+ options.push(":deinterlace-mode=bob");
+ }
}
do_play_state(0, options);
}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 0319efe..bc6a940 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.2.28
-date=06.05.2015
+version=2.8.2.29
+date=07.05.2015
type=Release
info=Tuxbox
commit bda8ceb4c47c70311b9dc577a5c05aa3c8dc0a7e
Author: GetAway <get...@t-...>
Date: Thu May 7 20:24:42 2015 +0200
Y_Live.js: fix audio track selection for udp streaming
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
index d3f9f3a..5c13c39 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
@@ -15,7 +15,7 @@ var vlc_height = 288;
var Window_delta_w = 0;
var Window_delta_h = 0;
var Mode = "tv";
-var AudioChannel = 0;
+var AudioTrack = 0;
var isSubs = false;
var cachetime = 0;
/*resize,init*/
@@ -170,14 +170,14 @@ function do_play()
else if(cachetime > 0){
options.push(":http-caching="+cachetime);
}
- if(AudioChannel != 0)
- options.push(":audio-track="+AudioChannel);
+ if(AudioTrack != 0)
+ options.push(":audio-track="+AudioTrack);
}
do_play_state(0, options);
}
function start_udp_server()
{
- var pids = loadSyncURL("/control/yweb?video_stream_pids=0&no_commas=true");
+ var pids = loadSyncURL("/control/yweb?video_stream_pids="+AudioTrack+"&no_commas=true");
var args = "-b /dev/null "+ClientAddr+" 31330 0 "+pids;
var _cmd = "udp_stream start "+args;
var __cmd = _cmd.replace(/ /g, "&");
@@ -275,7 +275,7 @@ function change_channel()
if(sel != -1)
channel = dd[sel].value;
do_stop();
- AudioChannel = 0;
+ AudioTrack = 0;
window.setTimeout("change_channel_zapto(\""+channel+"\")",500);
}
function change_sub_channel()
@@ -286,7 +286,7 @@ function change_sub_channel()
if(sel != -1)
channel = dd[sel].value;
do_stop();
- AudioChannel = 0;
+ AudioTrack = 0;
window.setTimeout("change_channel_zapto(\""+channel+"\")",500);
}
function change_channel_zapto(channel)
@@ -361,14 +361,14 @@ function view_streaminfo()
function doChangeAudioPid()
{
var dd = id('audiopid');
- AudioChannel = dd.selectedIndex;
+ AudioTrack = dd.selectedIndex;
do_stop();
// insert_message_control("... zapping ...");
window.setTimeout("change_channel_play()",1000);
}
function build_audio_pid_list()
{
- var audio_pids_url = "/y/cgi?execute=func:get_audio_pids_as_dropdown%20audio="+AudioChannel+":";
+ var audio_pids_url = "/y/cgi?execute=func:get_audio_pids_as_dropdown%20audio="+AudioTrack+":";
var audio_pid_list = loadSyncURL(audio_pids_url);
audio_pid_list = "<select size=\"1\" class=\"y_live_audio_pids\" id=\"audiopid\" onchange=\"doChangeAudioPid()\">"
+ audio_pid_list
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 7e41467..0319efe 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.2.27
-date=05.05.2015
+version=2.8.2.28
+date=06.05.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js | 26 +++++++++++-----------
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
2 files changed, 15 insertions(+), 15 deletions(-)
--
Tuxbox-GIT: apps
|
