Skip to content

V
vlc-gpu
Commit fb3be334 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

web intf: prettify js code. 

And convert tabs to 4 spaces according to code guidelines.
parent 6b49065d
Show whitespace changes
Inline Side-by-side
Showing with 629 additions and 607 deletions
share/lua/http/js/common.js
View file @ fb3be334
var intv = 0; var intv = 0;
var ccmd = ""; var ccmd = "";
var video_types = ['avi','mp4','wmv','mov','swf','vob','mkv','mpg']; var video_types = ['avi', 'mp4', 'wmv', 'mov', 'swf', 'vob', 'mkv', 'mpg'];
var audio_types = ['mp3','wav']; var audio_types = ['mp3', 'wav'];
var stream_server = window.location.hostname; var stream_server = window.location.hostname;
function format_time( s ){
var hours = Math.floor(s/3600); function format_time(s) {
var minutes = Math.floor((s/60)%60); var hours = Math.floor(s / 3600);
var seconds = Math.floor(s%60); var minutes = Math.floor((s / 60) % 60);
hours = hours<10 ? "0"+hours : hours; var seconds = Math.floor(s % 60);
minutes = minutes<10 ? "0"+minutes : minutes; hours = hours < 10 ? "0" + hours : hours;
seconds = seconds<10 ? "0"+seconds : seconds; minutes = minutes < 10 ? "0" + minutes : minutes;
return hours+":"+minutes+":"+seconds; seconds = seconds < 10 ? "0" + seconds : seconds;
return hours + ":" + minutes + ":" + seconds;
} }
function toFloat(text)
{ function toFloat(text) {
return parseFloat(text.replace(',','.')); return parseFloat(text.replace(',', '.'));
} }
function setIntv(){
if(intv>0){ function setIntv() {
if (intv > 0) {
intv++; intv++;
setTimeout(setIntv,500); setTimeout(setIntv, 500);
}else{ } else {
intv=0; intv = 0;
} }
if(intv>5){ if (intv > 5) {
var nt = 0; var nt = 0;
switch(ccmd){ switch (ccmd) {
case 'prev': case 'prev':
nt = Math.max(0,$('#seekSlider').slider('value')-10); nt = Math.max(0, $('#seekSlider').slider('value') - 10);
break; break;
case 'next': case 'next':
nt = Math.max(0,$('#seekSlider').slider('value')+10); nt = Math.max(0, $('#seekSlider').slider('value') + 10);
break; break;
} }
switch(current_que){ switch (current_que) {
case 'main': case 'main':
sendCommand({'command':'seek','val':Math.round((nt/100)*$('#seekSlider').attr('totalLength')),plreload:false}); sendCommand({
'command': 'seek',
'val': Math.round((nt / 100) * $('#seekSlider').attr('totalLength')),
plreload: false
});
break; break;
case 'stream': case 'stream':
sendVLMCmd('control Current seek '+nt); sendVLMCmd('control Current seek ' + nt);
break; break;
} }
} }
} }
function convertHz(value){
if(value>=1000){ function convertHz(value) {
return Math.round(value/1000,2)+'kHz'; if (value >= 1000) {
}else{ return Math.round(value / 1000, 2) + 'kHz';
return Math.round(value,2)+'Hz'; } else {
return Math.round(value, 2) + 'Hz';
} }
} }
function isMobile(){
var a = navigator.userAgent||navigator.vendor||window.opera; function isMobile() {
if(/android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|e\-|e\/|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\-|2|g)|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))){ var a = navigator.userAgent || navigator.vendor || window.opera;
if (/android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|e\-|e\/|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\-|2|g)|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) {
return true; return true;
} }
return false; return false;
} }
function createElementLi(name,type,dir,ext){
var icon = type=="dir" && name=='..' ? 'Back-48.png' : (type=='dir' ? "Folder-48.png" : ($.inArray(ext,video_types)!=-1 ? "Video-48.png" : ($.inArray(ext,audio_types)!=-1 ? "Audio-48.png" : "Other-48.png"))); function createElementLi(name, type, dir, ext) {
var open = type=="dir" ? "opendir='"+dir+"'" : (type=="file" ? "openfile='"+dir+"'" : "opendev='"+dir+"'"); var icon = type == "dir" && name == '..' ? 'Back-48.png' : (type == 'dir' ? "Folder-48.png" : ($.inArray(ext, video_types) != -1 ? "Video-48.png" : ($.inArray(ext, audio_types) != -1 ? "Audio-48.png" : "Other-48.png")));
var str = "<li class='system_icon ui-widget-content' "+open+" ><img src='images/"+icon+"' width='48px' height='48px' title='"+name+"' alt='"+name+"' style='border: none;background:none;'/><div style='font-size:10px;border:none;background:none;'>"+name+"</div></li>"; var open = type == "dir" ? "opendir='" + dir + "'" : (type == "file" ? "openfile='" + dir + "'" : "opendev='" + dir + "'");
var str = "<li class='system_icon ui-widget-content' " + open + " ><img src='images/" + icon + "' width='48px' height='48px' title='" + name + "' alt='" + name + "' style='border: none;background:none;'/><div style='font-size:10px;border:none;background:none;'>" + name + "</div></li>";
return str; return str;
} }
share/lua/http/js/controlers.js
View file @ fb3be334
var current_id = 1; var current_id = 1;
var currentArt = null; var currentArt = null;
var current_que = 'main'; var current_que = 'main';
function updateArt(url)
{ function updateArt(url) {
$('#albumArt').fadeOut(500, function(){ $('#albumArt').fadeOut(500, function () {
$(this).addClass('hidden') $(this).addClass('hidden').removeAttr('height').removeAttr('width').attr('src', url);
.removeAttr('height')
.removeAttr('width')
.attr('src',url);
}); });
} }
function updateStatus(){
function updateStatus() {
$.ajax({ $.ajax({
url: 'requests/status.xml', url: 'requests/status.xml',
success: function(data,status,jqXHR){ success: function (data, status, jqXHR) {
if(current_que=='main'){ if (current_que == 'main') {
$('.dynamic').empty(); $('.dynamic').empty();
$('#mediaTitle').append($('[name="filename"]',data).text()); $('#mediaTitle').append($('[name="filename"]', data).text());
$('#totalTime').append(format_time($('length',data).text())); $('#totalTime').append(format_time($('length', data).text()));
$('#currentTime').append(format_time($('time',data).text())); $('#currentTime').append(format_time($('time', data).text()));
$('#seekSlider').slider({value: toFloat($('position',data).text()) * 100 }); $('#seekSlider').slider({
$('#currentVolume').append(Math.round($('volume',data).text()/2.56)+'%'); value: toFloat($('position', data).text()) * 100
$('#volumeSlider').slider({value: ($('volume',data).text()/5.12) }); });
$('#rateSlider').slider({value: ($('rate',data).text()) }); $('#currentVolume').append(Math.round($('volume', data).text() / 2.56) + '%');
$('#currentRate').append(Math.round($('rate',data).text()*100)/100+'x'); $('#volumeSlider').slider({
$('#audioSlider').slider({value: ($('audiodelay',data).text()) }); value: ($('volume', data).text() / 5.12)
$('#currentAudioDelay').append(Math.round($('audiodelay',data).text()*100)/100+'s'); });
$('#subtitleSlider').slider({value: ($('subtitledelay',data).text()) }); $('#rateSlider').slider({
$('#currentSubtitleDelay').append(Math.round($('subtitledelay',data).text()*100)/100+'s'); value: ($('rate', data).text())
$('#seekSlider').attr('totalLength',$('length',data).text()); });
$('#buttonPlay') $('#currentRate').append(Math.round($('rate', data).text() * 100) / 100 + 'x');
.attr('state',$('state',data).text()) $('#audioSlider').slider({
.attr('mrl',$('[name="filename"]',data).text()); value: ($('audiodelay', data).text())
if($('state',data).text()=='playing'){ });
$('#currentAudioDelay').append(Math.round($('audiodelay', data).text() * 100) / 100 + 's');
$('#subtitleSlider').slider({
value: ($('subtitledelay', data).text())
});
$('#currentSubtitleDelay').append(Math.round($('subtitledelay', data).text() * 100) / 100 + 's');
$('#seekSlider').attr('totalLength', $('length', data).text());
$('#buttonPlay').attr('state', $('state', data).text()).attr('mrl', $('[name="filename"]', data).text());
if ($('state', data).text() == 'playing') {
$('#buttonPlay').removeClass('paused').addClass('playing'); $('#buttonPlay').removeClass('paused').addClass('playing');
}else{ } else {
$('#buttonPlay').removeClass('playing').addClass('paused'); $('#buttonPlay').removeClass('playing').addClass('paused');
} }
if($('random',data).text()=='true'){ if ($('random', data).text() == 'true') {
$('#buttonShuffle') $('#buttonShuffle').removeClass('ui-state-default').addClass('ui-state-active');
.removeClass('ui-state-default') } else {
.addClass('ui-state-active'); $('#buttonShuffle').addClass('ui-state-default').removeClass('ui-state-active');
}else{ }
$('#buttonShuffle') if ($('loop', data).text() == 'true') {
.addClass('ui-state-default') $('#buttonLoop').removeClass('ui-state-default').addClass('ui-state-active');
.removeClass('ui-state-active'); } else {
} $('#buttonLoop').addClass('ui-state-default').removeClass('ui-state-active');
if($('loop',data).text()=='true'){ }
$('#buttonLoop') if ($('repeat', data).text() == 'true') {
.removeClass('ui-state-default') $('#buttonRepeat').removeClass('ui-state-default').addClass('ui-state-active');
.addClass('ui-state-active'); } else {
}else{ $('#buttonRepeat').addClass('ui-state-default').removeClass('ui-state-active');
$('#buttonLoop')
.addClass('ui-state-default')
.removeClass('ui-state-active');
}
if($('repeat',data).text()=='true'){
$('#buttonRepeat')
.removeClass('ui-state-default')
.addClass('ui-state-active');
}else{
$('#buttonRepeat')
.addClass('ui-state-default')
.removeClass('ui-state-active');
} }
if($('[name="artwork_url"]',data).text()!=currentArt if ($('[name="artwork_url"]', data).text() != currentArt && $('[name="artwork_url"]', data).text() != "") {
&& $('[name="artwork_url"]',data).text()!="")
{
var tmp = new Date(); var tmp = new Date();
currentArt = $('[name="artwork_url"]',data).text(); currentArt = $('[name="artwork_url"]', data).text();
updateArt('/art?'+tmp.getTime()); updateArt('/art?' + tmp.getTime());
}else if($('[name="artwork_url"]',data).text()=="" } else if ($('[name="artwork_url"]', data).text() == "" && currentArt != 'images/vlc-48.png') {
&& currentArt!='images/vlc-48.png') currentArt = 'images/vlc-48.png';
{
currentArt='images/vlc-48.png';
updateArt(currentArt); updateArt(currentArt);
} }
if(pollStatus){ if (pollStatus) {
setTimeout( updateStatus, 1000 ); setTimeout(updateStatus, 1000);
} }
} }
$('band',data).each(function(){ $('band', data).each(function () {
var id = $(this).attr('id'); var id = $(this).attr('id');
var freq = convertHz($(this).attr('freqency')); var freq = convertHz($(this).attr('freqency'));
var value = $(this).text() ? $(this).text() : 0; var value = $(this).text() ? $(this).text() : 0;
if(!$('#eq_container'+id).length){ if (!$('#eq_container' + id).length) {
$('#window_equalizer').append('<div style="float:left;width:44px;" align="center" id="eq_container'+id+'"><div id="eq'+id+'_txt">'+value+'dB</div><div class="eqBand" id="eq'+id+'" style="font-size: 18px;"></div><div>'+freq+'</div></div>'); $('#window_equalizer').append('<div style="float:left;width:44px;" align="center" id="eq_container' + id + '"><div id="eq' + id + '_txt">' + value + 'dB</div><div class="eqBand" id="eq' + id + '" style="font-size: 18px;"></div><div>' + freq + '</div></div>');
$('#eq'+id).slider({ $('#eq' + id).slider({
min: -20, min: -20,
max: 20, max: 20,
step: 0.1, step: 0.1,
...@@ -96,64 +86,68 @@ function updateStatus(){ ...@@ -96,64 +86,68 @@ function updateStatus(){
value: value, value: value,
animate: true, animate: true,
orientation: "vertical", orientation: "vertical",
stop: function(event,ui){ stop: function (event, ui) {
$('#'+$(this).attr('id')+'_txt').empty().append(ui.value+'dB'); $('#' + $(this).attr('id') + '_txt').empty().append(ui.value + 'dB');
sendCommad({ sendCommad({
command:'equalizer', command: 'equalizer',
val: ui.value, val: ui.value,
band: $(this).attr('id').substr(2) band: $(this).attr('id').substr(2)
}) })
}, },
slide: function(event,ui){ slide: function (event, ui) {
$('#'+$(this).attr('id')+'_txt').empty().append(ui.value+'dB'); $('#' + $(this).attr('id') + '_txt').empty().append(ui.value + 'dB');
} }
}); });
}else{ } else {
$('#eq'+id).slider({value:value}); $('#eq' + id).slider({
$('#eq'+id+'_txt').empty().append(Math.round(value*100)/100+'dB'); value: value
});
$('#eq' + id + '_txt').empty().append(Math.round(value * 100) / 100 + 'dB');
} }
}); });
$('#preamp').slider('value',$('preamp',data).text()); $('#preamp').slider('value', $('preamp', data).text());
$('#preamp_txt').empty().append(Math.round($('preamp',data).text()*100)/100+'dB'); $('#preamp_txt').empty().append(Math.round($('preamp', data).text() * 100) / 100 + 'dB');
}, },
error: function(jqXHR,status,error){ error: function (jqXHR, status, error) {
setTimeout( updateStatus, 500 ); setTimeout(updateStatus, 500);
} }
}); });
} }
function updatePlayList(){
$('#libraryTree').jstree('refresh',-1); function updatePlayList() {
$('#libraryTree').jstree('refresh', -1);
} }
function sendCommand(params,append){
if(current_que=='stream'){ function sendCommand(params, append) {
if (current_que == 'stream') {
$.ajax({ $.ajax({
url: 'requests/status.xml', url: 'requests/status.xml',
data: params, data: params,
success:function(data,status,jqXHR){ success: function (data, status, jqXHR) {
if(append!=undefined){ if (append != undefined) {
eval(append); eval(append);
} }
updateStatus(); updateStatus();
updatePlayList(); updatePlayList();
} }
}); });
}else{ } else {
if(params.plreload===false){ if (params.plreload === false) {
$.ajax({ $.ajax({
url: 'requests/status.xml', url: 'requests/status.xml',
data: params, data: params,
success:function(data,status,jqXHR){ success: function (data, status, jqXHR) {
if(append!=undefined){ if (append != undefined) {
eval(append); eval(append);
} }
} }
}); });
}else{ } else {
$.ajax({ $.ajax({
url: 'requests/status.xml', url: 'requests/status.xml',
data: params, data: params,
success:function(data,status,jqXHR){ success: function (data, status, jqXHR) {
if(append!=undefined){ if (append != undefined) {
eval(append); eval(append);
} }
updatePlayList(); updatePlayList();
...@@ -162,46 +156,47 @@ function sendCommand(params,append){ ...@@ -162,46 +156,47 @@ function sendCommand(params,append){
} }
} }
} }
function browse(dir){
dir = dir==undefined ? 'file://~' : dir; function browse(dir) {
dir = dir == undefined ? 'file://~' : dir;
$.ajax({ $.ajax({
url: 'requests/browse.xml', url: 'requests/browse.xml',
data:'uri='+encodeURIComponent(dir), data: 'uri=' + encodeURIComponent(dir),
success: function(data,status,jqXHR){ success: function (data, status, jqXHR) {
var tgt = browse_target.indexOf('__')==-1 ? browse_target : browse_target.substr(0,browse_target.indexOf('__')); var tgt = browse_target.indexOf('__') == -1 ? browse_target : browse_target.substr(0, browse_target.indexOf('__'));
$('#browse_elements').empty(); $('#browse_elements').empty();
$('element',data).each(function(){ $('element', data).each(function () {
if($(this).attr('type')=='dir' || $.inArray($(this).attr('name').substr(-3),video_types)!=-1 || $.inArray($(this).attr('name').substr(-3),audio_types)!=-1){ if ($(this).attr('type') == 'dir' || $.inArray($(this).attr('name').substr(-3), video_types) != -1 || $.inArray($(this).attr('name').substr(-3), audio_types) != -1) {
$('#browse_elements').append(createElementLi($(this).attr('name'),$(this).attr('type'),$(this).attr('uri'),$(this).attr('name').substr(-3))); $('#browse_elements').append(createElementLi($(this).attr('name'), $(this).attr('type'), $(this).attr('uri'), $(this).attr('name').substr(-3)));
} }
}); });
$('[opendir]').dblclick(function(){ $('[opendir]').dblclick(function () {
browse($(this).attr('opendir')); browse($(this).attr('opendir'));
}); });
$('[openfile]').dblclick(function(){ $('[openfile]').dblclick(function () {
switch(tgt){ switch (tgt) {
case '#stream_input': case '#stream_input':
$(browse_target).val($(this).attr('openfile')); $(browse_target).val($(this).attr('openfile'));
break; break;
case '#mosaic_open': case '#mosaic_open':
$('li',browse_target).remove(); $('li', browse_target).remove();
$(browse_target).append(this); $(browse_target).append(this);
$(this).css({ $(this).css({
'margin-left' : -40, 'margin-left': -40,
'margin-top' : -46, 'margin-top': -46,
'float' : 'left' 'float': 'left'
}); });
break; break;
case '#mobile': case '#mobile':
break; break;
default: default:
sendCommand('command=in_play&input='+encodeURIComponent($(this).attr('openfile'))); sendCommand('command=in_play&input=' + encodeURIComponent($(this).attr('openfile')));
break; break;
} }
$('#window_browse').dialog('close'); $('#window_browse').dialog('close');
}); });
$('[opendir]').click(function(){ $('[opendir]').click(function () {
switch(tgt){ switch (tgt) {
case '#mobile': case '#mobile':
browse($(this).attr('opendir')); browse($(this).attr('opendir'));
break; break;
...@@ -209,16 +204,16 @@ function browse(dir){ ...@@ -209,16 +204,16 @@ function browse(dir){
break; break;
} }
}); });
$('[openfile]').click(function(){ $('[openfile]').click(function () {
switch(tgt){ switch (tgt) {
case '#mobile': case '#mobile':
sendCommand('command=in_play&input='+encodeURIComponent($(this).attr('openfile')),"window.location='mobile.html'"); sendCommand('command=in_play&input=' + encodeURIComponent($(this).attr('openfile')), "window.location='mobile.html'");
break; break;
default: default:
break; break;
} }
}); });
switch(tgt){ switch (tgt) {
case '#mobile': case '#mobile':
break; break;
default: default:
...@@ -226,129 +221,136 @@ function browse(dir){ ...@@ -226,129 +221,136 @@ function browse(dir){
break; break;
} }
}, },
error: function(jqXHR,status,error){ error: function (jqXHR, status, error) {
setTimeout('browse("'+dir+'")',1041); setTimeout('browse("' + dir + '")', 1041);
} }
}); });
} }
function updateStreams(){
function updateStreams() {
$.ajax({ $.ajax({
url: 'requests/vlm.xml', url: 'requests/vlm.xml',
success:function(data,status,jqXHR){ success: function (data, status, jqXHR) {
$('#stream_info').accordion("destroy"); $('#stream_info').accordion("destroy");
$('#stream_info').empty(); $('#stream_info').empty();
$('broadcast',data).each(function(){ $('broadcast', data).each(function () {
var stream_div = $('#stream_status_').clone(); var stream_div = $('#stream_status_').clone();
var name = $(this).attr('name'); var name = $(this).attr('name');
var loop = $(this).attr('loop')=='yes'; var loop = $(this).attr('loop') == 'yes';
var playing = $('instance',$(this)).attr('state')=='playing'; var playing = $('instance', $(this)).attr('state') == 'playing';
var file = $('input',$(this)).text(); var file = $('input', $(this)).text();
var output = $('output',$(this)).text(); var output = $('output', $(this)).text();
var time = isNaN(Math.round($('instance',$(this)).attr('time')/1000000)) ? 0 : Math.round($('instance',$(this)).attr('time')/1000000); var time = isNaN(Math.round($('instance', $(this)).attr('time') / 1000000)) ? 0 : Math.round($('instance', $(this)).attr('time') / 1000000);
var length = isNaN(Math.round($('instance',$(this)).attr('length')/1000000)) ? 0 : Math.round($('instance',$(this)).attr('length')/1000000); var length = isNaN(Math.round($('instance', $(this)).attr('length') / 1000000)) ? 0 : Math.round($('instance', $(this)).attr('length') / 1000000);
$('[id]',stream_div).each(function(){ $('[id]', stream_div).each(function () {
$(this).attr('id',$(this).attr('id')+name); $(this).attr('id', $(this).attr('id') + name);
}); });
$(stream_div).attr('id',$(stream_div).attr('id')+name); $(stream_div).attr('id', $(stream_div).attr('id') + name);
$('#stream_title_'+name,stream_div).append(name); $('#stream_title_' + name, stream_div).append(name);
$('#stream_file_'+name,stream_div).append(file); $('#stream_file_' + name, stream_div).append(file);
$('#stream_pos_'+name,stream_div).slider({ $('#stream_pos_' + name, stream_div).slider({
value: 0, value: 0,
range: "min", range: "min",
min: 0, min: 0,
slide: function( event, ui ) { slide: function (event, ui) {
$( "#stream_current_time_"+name,stream_div ).empty(); $("#stream_current_time_" + name, stream_div).empty();
$( "#stream_current_time_"+name,stream_div ).append( format_time(ui.value) ); $("#stream_current_time_" + name, stream_div).append(format_time(ui.value));
$( "#stream_total_time_"+name,stream_div ).empty(); $("#stream_total_time_" + name, stream_div).empty();
$( "#stream_total_time_"+name,stream_div ).append( format_time($('#stream_pos_'+name,stream_div).slider('option','max')) ); $("#stream_total_time_" + name, stream_div).append(format_time($('#stream_pos_' + name, stream_div).slider('option', 'max')));
sendVLMCmd('control '+name+' seek '+Math.round(ui.value/$('#stream_pos_'+name,stream_div).slider('option','max')*100)); sendVLMCmd('control ' + name + ' seek ' + Math.round(ui.value / $('#stream_pos_' + name, stream_div).slider('option', 'max') * 100));
}, },
change: function(event, ui){ change: function (event, ui) {
$( "#stream_current_time_"+name,stream_div ).empty(); $("#stream_current_time_" + name, stream_div).empty();
$( "#stream_current_time_"+name,stream_div ).append( format_time(ui.value) ); $("#stream_current_time_" + name, stream_div).append(format_time(ui.value));
$( "#stream_total_time_"+name,stream_div ).empty(); $("#stream_total_time_" + name, stream_div).empty();
$( "#stream_total_time_"+name,stream_div ).append( format_time($('#stream_pos_'+name,stream_div).slider('option','max')) ); $("#stream_total_time_" + name, stream_div).append(format_time($('#stream_pos_' + name, stream_div).slider('option', 'max')));
} }
}); });
$('#button_stream_stop_'+name,stream_div).click(function(){ $('#button_stream_stop_' + name, stream_div).click(function () {
sendVLMCmd('control '+name+' stop'); sendVLMCmd('control ' + name + ' stop');
return false; return false;
}); });
$('#button_stream_play_'+name,stream_div).click(function(){ $('#button_stream_play_' + name, stream_div).click(function () {
if($('span',this).hasClass('ui-icon-pause')){ if ($('span', this).hasClass('ui-icon-pause')) {
sendVLMCmd('control '+name+' pause'); sendVLMCmd('control ' + name + ' pause');
}else{ } else {
sendVLMCmd('control '+name+' play'); sendVLMCmd('control ' + name + ' play');
} }
}); });
$('#button_stream_loop_'+name,stream_div).click(function(){ $('#button_stream_loop_' + name, stream_div).click(function () {
if(loop){ if (loop) {
sendVLMCmd('setup '+name+' unloop'); sendVLMCmd('setup ' + name + ' unloop');
}else{ } else {
sendVLMCmd('setup '+name+' loop'); sendVLMCmd('setup ' + name + ' loop');
} }
}); });
$('#button_stream_delete_'+name,stream_div).click(function(){ $('#button_stream_delete_' + name, stream_div).click(function () {
sendVLMCmd('del '+name); sendVLMCmd('del ' + name);
}); });
$('#stream_pos_'+name,stream_div).slider({ $('#stream_pos_' + name, stream_div).slider({
max: length, max: length,
value: time value: time
}); });
if(playing){ if (playing) {
$('span',$('#button_stream_play_'+name,stream_div)).removeClass('ui-icon-play'); $('span', $('#button_stream_play_' + name, stream_div)).removeClass('ui-icon-play');
$('span',$('#button_stream_play_'+name,stream_div)).addClass('ui-icon-pause'); $('span', $('#button_stream_play_' + name, stream_div)).addClass('ui-icon-pause');
} }
if(loop){ if (loop) {
$('#button_stream_loop_'+name,stream_div).addClass('ui-state-active'); $('#button_stream_loop_' + name, stream_div).addClass('ui-state-active');
} }
$(stream_div).css({ $(stream_div).css({
'visibility':'', 'visibility': '',
'display':'' 'display': ''
}); });
$('#stream_info').append(stream_div); $('#stream_info').append(stream_div);
}); });
$('.button').hover( $('.button').hover(
function() { $(this).addClass('ui-state-hover'); },
function() { $(this).removeClass('ui-state-hover'); } function () {
); $(this).addClass('ui-state-hover');
}, function () {
$(this).removeClass('ui-state-hover');
});
$('#stream_info').accordion({ $('#stream_info').accordion({
header: "h3", header: "h3",
collapsible: true, collapsible: true,
autoHeight: true autoHeight: true
}); });
if(current_que=='stream'){ if (current_que == 'stream') {
$('.dynamic').empty(); $('.dynamic').empty();
$('#mediaTitle').append($('[name="Current"] input',data).text()); $('#mediaTitle').append($('[name="Current"] input', data).text());
$('#totalTime').append(format_time(isNaN($('[name="Current"] instance',data).attr('length')) ? 0 : $('[name="Current"] instance',data).attr('length')/1000000)); $('#totalTime').append(format_time(isNaN($('[name="Current"] instance', data).attr('length')) ? 0 : $('[name="Current"] instance', data).attr('length') / 1000000));
$('#currentTime').append(format_time(isNaN($('[name="Current"] instance',data).attr('time')) ? 0 : $('[name="Current"] instance',data).attr('time')/1000000)); $('#currentTime').append(format_time(isNaN($('[name="Current"] instance', data).attr('time')) ? 0 : $('[name="Current"] instance', data).attr('time') / 1000000));
$('#seekSlider').slider({value: (($('[name="Current"] instance',data).attr('time')/1000000)/($('[name="Current"] instance',data).attr('length')/1000000)*100) }); $('#seekSlider').slider({
$('#seekSlider').attr('totalLength',$('[name="Current"] instance',data).attr('length')/1000000); value: (($('[name="Current"] instance', data).attr('time') / 1000000) / ($('[name="Current"] instance', data).attr('length') / 1000000) * 100)
$('#buttonPlay').attr('state',$('[name="Current"] instance',data).length>0 ? $('[name="Current"] instance',data).attr('state') : 'stopped'); });
if($('[name="Current"] instance',data).attr('state')=='playing'){ $('#seekSlider').attr('totalLength', $('[name="Current"] instance', data).attr('length') / 1000000);
$('#buttonPlay').attr('state', $('[name="Current"] instance', data).length > 0 ? $('[name="Current"] instance', data).attr('state') : 'stopped');
if ($('[name="Current"] instance', data).attr('state') == 'playing') {
$('#buttonPlay').removeClass('paused'); $('#buttonPlay').removeClass('paused');
$('#buttonPlay').addClass('playing'); $('#buttonPlay').addClass('playing');
}else{ } else {
$('#buttonPlay').removeClass('playing'); $('#buttonPlay').removeClass('playing');
$('#buttonPlay').addClass('paused'); $('#buttonPlay').addClass('paused');
} }
setTimeout( updateStreams, 1000 ); setTimeout(updateStreams, 1000);
} }
} }
}); });
} }
function updateEQ(){
function updateEQ() {
$.ajax({ $.ajax({
url: 'requests/equalizer.xml', url: 'requests/equalizer.xml',
success: function(data,status,jqXHR){ success: function (data, status, jqXHR) {
$('band',data).each(function(){ $('band', data).each(function () {
var id = $(this).attr('id'); var id = $(this).attr('id');
var freq = convertHz($(this).attr('freqency')); var freq = convertHz($(this).attr('freqency'));
var value = $(this).text() ? $(this).text() : 0; var value = $(this).text() ? $(this).text() : 0;
if(!$('#eq_container'+id).length){ if (!$('#eq_container' + id).length) {
$('#window_equalizer').append('<div style="float:left;width:44px;" align="center" id="eq_container'+id+'"><div id="eq'+id+'_txt">'+value+'dB</div><div class="eqBand" id="eq'+id+'" style="font-size: 18px;"></div><div>'+freq+'</div></div>'); $('#window_equalizer').append('<div style="float:left;width:44px;" align="center" id="eq_container' + id + '"><div id="eq' + id + '_txt">' + value + 'dB</div><div class="eqBand" id="eq' + id + '" style="font-size: 18px;"></div><div>' + freq + '</div></div>');
$('#eq'+id).slider({ $('#eq' + id).slider({
min: -20, min: -20,
max: 20, max: 20,
step: 0.1, step: 0.1,
...@@ -356,55 +358,58 @@ function updateEQ(){ ...@@ -356,55 +358,58 @@ function updateEQ(){
value: value, value: value,
animate: true, animate: true,
orientation: "vertical", orientation: "vertical",
stop: function(event,ui){ stop: function (event, ui) {
$('#'+$(this).attr('id')+'_txt').empty().append(ui.value+'dB'); $('#' + $(this).attr('id') + '_txt').empty().append(ui.value + 'dB');
sendEQCmd({ sendEQCmd({
command:'equalizer', command: 'equalizer',
val: ui.value, val: ui.value,
band: $(this).attr('id').substr(2) band: $(this).attr('id').substr(2)
}) })
}, },
slide: function(event,ui){ slide: function (event, ui) {
$('#'+$(this).attr('id')+'_txt').empty().append(ui.value+'dB'); $('#' + $(this).attr('id') + '_txt').empty().append(ui.value + 'dB');
} }
}); });
}else{ } else {
$('#eq'+id).slider({value:value}); $('#eq' + id).slider({
$('#eq'+id+'_txt').empty().append(Math.round(value*100)/100+'dB'); value: value
});
$('#eq' + id + '_txt').empty().append(Math.round(value * 100) / 100 + 'dB');
} }
}); });
$('#preamp').slider('value',$('preamp',data).text()); $('#preamp').slider('value', $('preamp', data).text());
$('#preamp_txt').empty().append(Math.round($('preamp',data).text()*100)/100+'dB'); $('#preamp_txt').empty().append(Math.round($('preamp', data).text() * 100) / 100 + 'dB');
} }
}) })
} }
function sendVLMCmd(command,append){
function sendVLMCmd(command, append) {
var commands = command.split(';'); var commands = command.split(';');
if(commands.length>1){ if (commands.length > 1) {
sendBatchVLMCmd(command,append); sendBatchVLMCmd(command, append);
}else{ } else {
if(current_que=='main'){ if (current_que == 'main') {
$.ajax({ $.ajax({
url: 'requests/vlm_cmd.xml', url: 'requests/vlm_cmd.xml',
data: 'command='+encodeURIComponent(command), data: 'command=' + encodeURIComponent(command),
success: function(data,status,jqXHR){ success: function (data, status, jqXHR) {
if($('error',data).text()){ if ($('error', data).text()) {
$('#error_container').append('<div>'+$('error',data).text()+'</div>'); $('#error_container').append('<div>' + $('error', data).text() + '</div>');
$('#window_error').dialog('open'); $('#window_error').dialog('open');
} }
if(append!=undefined){ if (append != undefined) {
eval(append); eval(append);
} }
updateStreams(); updateStreams();
} }
}); });
}else{ } else {
$.ajax({ $.ajax({
url: 'requests/vlm_cmd.xml', url: 'requests/vlm_cmd.xml',
data: 'command='+encodeURIComponent(command), data: 'command=' + encodeURIComponent(command),
success: function(data,status,jqXHR){ success: function (data, status, jqXHR) {
if($('error',data).text()){ if ($('error', data).text()) {
$('#error_container').append('<div>'+$('error',data).text()+'</div>'); $('#error_container').append('<div>' + $('error', data).text() + '</div>');
$('#window_error').dialog('open'); $('#window_error').dialog('open');
} }
updateStreams(); updateStreams();
...@@ -413,73 +418,69 @@ function sendVLMCmd(command,append){ ...@@ -413,73 +418,69 @@ function sendVLMCmd(command,append){
} }
} }
} }
function sendBatchVLMCmd(command,append){
function sendBatchVLMCmd(command, append) {
var commands = command.split(';'); var commands = command.split(';');
$.ajax({ $.ajax({
url: 'requests/vlm_cmd.xml', url: 'requests/vlm_cmd.xml',
data: 'command='+encodeURIComponent(commands.shift()), data: 'command=' + encodeURIComponent(commands.shift()),
success:function(data,status,jqXHR){ success: function (data, status, jqXHR) {
if($('error',data).text()){ if ($('error', data).text()) {
$('#error_container').append('<div>'+$('error',data).text()+'</div>'); $('#error_container').append('<div>' + $('error', data).text() + '</div>');
$('#window_error').dialog('open'); $('#window_error').dialog('open');
} }
sendVLMCmd(commands.join(';'),append); sendVLMCmd(commands.join(';'), append);
} }
}); });
} }
function sendEQCmd(params){
function sendEQCmd(params) {
$.ajax({ $.ajax({
url: 'requests/equalizer.xml', url: 'requests/equalizer.xml',
data: params, data: params,
success: function(data,status,jqXHR){ success: function (data, status, jqXHR) {
updateEQ(); updateEQ();
} }
}); });
} }
$(function(){ $(function () {
$('#albumArt').load(function(){ $('#albumArt').load(function () {
var width=$(this).width(); var width = $(this).width();
var height=$(this).height(); var height = $(this).height();
var max=Math.max(width,height); var max = Math.max(width, height);
if(max>150) if (max > 150) {
{ var ratio = 150 / max;
var ratio=150/max; width = Math.floor(width * ratio);
width=Math.floor(width*ratio); height = Math.floor(height * ratio);
height=Math.floor(height*ratio); }
} $(this).attr('width', width).attr('height', height).css('margin-left', Math.floor((150 - width) / 2)).css('margin-top', Math.floor((150 - height) / 2)).removeClass('hidden').fadeIn();
$(this).attr('width',width)
.attr('height',height)
.css('margin-left', Math.floor((150 - width)/2))
.css('margin-top', Math.floor((150 - height)/2))
.removeClass('hidden')
.fadeIn();
}); });
$('#libraryTree').jstree({ $('#libraryTree').jstree({
"xml_data":{ "xml_data": {
"ajax":{ "ajax": {
"url" : "requests/playlist_jstree.xml" "url": "requests/playlist_jstree.xml"
}, },
"xsl" : "nest" "xsl": "nest"
}, },
"themeroller":{ "themeroller": {
"item_leaf":"ui-icon-video" "item_leaf": "ui-icon-video"
}, },
"core" :{ "core": {
"initially_open": ["plid_1","plid_2","plid_3"] "initially_open": ["plid_1", "plid_2", "plid_3"]
}, },
"plugins" : ["xml_data","ui","themeroller"] "plugins": ["xml_data", "ui", "themeroller"]
}).bind("loaded.jstree", function (event, data) { }).bind("loaded.jstree", function (event, data) {
$('[current]','[id^="plid_"]').each(function(){ $('[current]', '[id^="plid_"]').each(function () {
$(this).addClass('ui-state-highlight'); $(this).addClass('ui-state-highlight');
current_id = $(this).attr('id').substr(5); current_id = $(this).attr('id').substr(5);
}); });
}).bind("refresh.jstree",function(event,data){ }).bind("refresh.jstree", function (event, data) {
$('[current]','[id^="plid_"]').each(function(){ $('[current]', '[id^="plid_"]').each(function () {
$(this).addClass('ui-state-highlight'); $(this).addClass('ui-state-highlight');
current_id = $(this).attr('id').substr(5); current_id = $(this).attr('id').substr(5);
}); });
}).delegate("#plid_2 li.jstree-leaf a", "click",function(event, data){ }).delegate("#plid_2 li.jstree-leaf a", "click", function (event, data) {
event.preventDefault(); event.preventDefault();
current_id = $(this).parent().attr('id').substr(5); current_id = $(this).parent().attr('id').substr(5);
sendCommand('command=pl_play&id=' + current_id); sendCommand('command=pl_play&id=' + current_id);
......
share/lua/http/js/ui.js
View file @ fb3be334
$(function(){ $(function () {
$( "#seekSlider" ).slider({ $("#seekSlider").slider({
range: "min", range: "min",
value: 0, value: 0,
min: 0, min: 0,
max: 100, max: 100,
stop: function( event, ui ) { stop: function (event, ui) {
$( "#currentTime" ).empty().append( format_time(Math.round((ui.value/100)*$('#seekSlider').attr('totalLength'))) ); $("#currentTime").empty().append(format_time(Math.round((ui.value / 100) * $('#seekSlider').attr('totalLength'))));
switch(current_que){ switch (current_que) {
case 'main': case 'main':
sendCommand({'command':'seek','val':(ui.value)+'%'}); sendCommand({
'command': 'seek',
'val': (ui.value) + '%'
});
break; break;
case 'stream': case 'stream':
sendVLMCmd('control Current seek '+ui.value); sendVLMCmd('control Current seek ' + ui.value);
break; break;
} }
} }
}); });
$( "#volumeSlider" ).slider({ $("#volumeSlider").slider({
range: "min", range: "min",
value: 50, value: 50,
min: 0, min: 0,
max: 100, max: 100,
stop: function( event, ui ) { stop: function (event, ui) {
$( "#currentVolume" ).empty().append( ui.value * 2 +"%" ); $("#currentVolume").empty().append(ui.value * 2 + "%");
sendCommand({ sendCommand({
'command':'volume', 'command': 'volume',
'val':Math.round(ui.value*5.12) 'val': Math.round(ui.value * 5.12)
}) })
} }
}); });
$('#buttonStop').click(function(){ $('#buttonStop').click(function () {
switch(current_que){ switch (current_que) {
case 'main': case 'main':
sendCommand({'command' : 'pl_stop'}) sendCommand({
'command': 'pl_stop'
})
break; break;
case 'stream': case 'stream':
sendVLMCmd('control Current stop'); sendVLMCmd('control Current stop');
...@@ -40,22 +45,27 @@ $(function(){ ...@@ -40,22 +45,27 @@ $(function(){
} }
return false; return false;
}); });
$('#buttonPlay').click(function(){ $('#buttonPlay').click(function () {
if($(this).attr('state')=='stopped'){ if ($(this).attr('state') == 'stopped') {
switch(current_que){ switch (current_que) {
case 'main': case 'main':
var id = $('.jstree-clicked','#libraryTree').length>0 ? $('.jstree-clicked','#libraryTree').first().parents().first().attr('id').substr(5) : current_id; var id = $('.jstree-clicked', '#libraryTree').length > 0 ? $('.jstree-clicked', '#libraryTree').first().parents().first().attr('id').substr(5) : current_id;
sendCommand({'command':'pl_play','id':id}); sendCommand({
'command': 'pl_play',
'id': id
});
break; break;
case 'stream': case 'stream':
sendVLMCmd('control Current play'); sendVLMCmd('control Current play');
flowplayer("player", "http://releases.flowplayer.org/swf/flowplayer-3.2.7.swf"); flowplayer("player", "http://releases.flowplayer.org/swf/flowplayer-3.2.7.swf");
break; break;
} }
}else{ } else {
switch(current_que){ switch (current_que) {
case 'main': case 'main':
sendCommand({'command':'pl_pause'}); sendCommand({
'command': 'pl_pause'
});
break; break;
case 'stream': case 'stream':
sendVLMCmd('control Current pause'); sendVLMCmd('control Current pause');
...@@ -64,8 +74,10 @@ $(function(){ ...@@ -64,8 +74,10 @@ $(function(){
} }
return false; return false;
}); });
$('#buttonFull').click(function(){ $('#buttonFull').click(function () {
sendCommand({'command':'fullscreen'}); sendCommand({
'command': 'fullscreen'
});
return false; return false;
}); });
$('#stream_host').val(stream_server); $('#stream_host').val(stream_server);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment