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
Expand all Hide 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() {
intv++; if (intv > 0) {
setTimeout(setIntv,500); intv++;
}else{ setTimeout(setIntv, 500);
intv=0; } else {
} intv = 0;
if(intv>5){ }
var nt = 0; if (intv > 5) {
switch(ccmd){ var nt = 0;
case 'prev': switch (ccmd) {
nt = Math.max(0,$('#seekSlider').slider('value')-10); case 'prev':
break; nt = Math.max(0, $('#seekSlider').slider('value') - 10);
case 'next': break;
nt = Math.max(0,$('#seekSlider').slider('value')+10); case 'next':
break; nt = Math.max(0, $('#seekSlider').slider('value') + 10);
} break;
switch(current_que){ }
case 'main': switch (current_que) {
sendCommand({'command':'seek','val':Math.round((nt/100)*$('#seekSlider').attr('totalLength')),plreload:false}); case 'main':
break; sendCommand({
case 'stream': 'command': 'seek',
sendVLMCmd('control Current seek '+nt); 'val': Math.round((nt / 100) * $('#seekSlider').attr('totalLength')),
break; plreload: false
} });
} break;
case 'stream':
sendVLMCmd('control Current seek ' + nt);
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;
return true; 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 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 + "'");
return str; 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;
} }
share/lua/http/js/controlers.js
View file @ fb3be334
This diff is collapsed.
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({
break; 'command': 'seek',
case 'stream': 'val': (ui.value) + '%'
sendVLMCmd('control Current seek '+ui.value); });
break; break;
} case 'stream':
} sendVLMCmd('control Current seek ' + ui.value);
}); break;
$( "#volumeSlider" ).slider({ }
range: "min", }
value: 50, });
min: 0, $("#volumeSlider").slider({
max: 100, range: "min",
stop: function( event, ui ) { value: 50,
$( "#currentVolume" ).empty().append( ui.value * 2 +"%" ); min: 0,
sendCommand({ max: 100,
'command':'volume', stop: function (event, ui) {
'val':Math.round(ui.value*5.12) $("#currentVolume").empty().append(ui.value * 2 + "%");
}) sendCommand({
} 'command': 'volume',
}); 'val': Math.round(ui.value * 5.12)
$('#buttonStop').click(function(){ })
switch(current_que){ }
case 'main': });
sendCommand({'command' : 'pl_stop'}) $('#buttonStop').click(function () {
break; switch (current_que) {
case 'stream': case 'main':
sendVLMCmd('control Current stop'); sendCommand({
break; 'command': 'pl_stop'
} })
return false; break;
}); case 'stream':
$('#buttonPlay').click(function(){ sendVLMCmd('control Current stop');
if($(this).attr('state')=='stopped'){ break;
switch(current_que){ }
case 'main': return false;
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}); $('#buttonPlay').click(function () {
break; if ($(this).attr('state') == 'stopped') {
case 'stream': switch (current_que) {
sendVLMCmd('control Current play'); case 'main':
flowplayer("player", "http://releases.flowplayer.org/swf/flowplayer-3.2.7.swf"); var id = $('.jstree-clicked', '#libraryTree').length > 0 ? $('.jstree-clicked', '#libraryTree').first().parents().first().attr('id').substr(5) : current_id;
break; sendCommand({
} 'command': 'pl_play',
}else{ 'id': id
switch(current_que){ });
case 'main': break;
sendCommand({'command':'pl_pause'}); case 'stream':
break; sendVLMCmd('control Current play');
case 'stream': flowplayer("player", "http://releases.flowplayer.org/swf/flowplayer-3.2.7.swf");
sendVLMCmd('control Current pause'); break;
break; }
} } else {
} switch (current_que) {
return false; case 'main':
}); sendCommand({
$('#buttonFull').click(function(){ 'command': 'pl_pause'
sendCommand({'command':'fullscreen'}); });
return false; break;
}); case 'stream':
$('#stream_host').val(stream_server); sendVLMCmd('control Current pause');
break;
}
}
return false;
});
$('#buttonFull').click(function () {
sendCommand({
'command': 'fullscreen'
});
return false;
});
$('#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