@@ -330,8 +297,7 @@
-
\ No newline at end of file
diff --git a/share/lua/http/js/common.js b/share/lua/http/js/common.js
index f692ba7128..9982b23449 100644
--- a/share/lua/http/js/common.js
+++ b/share/lua/http/js/common.js
@@ -1,5 +1,8 @@
var intv = 0;
var ccmd = "";
+var video_types = new Array('avi','mp4','wmv','mov','swf','vob','mkv','mpg');
+var audio_types = new Array('mp3','wav');
+var stream_server = window.location.hostname;
function format_time( s ){
var hours = Math.floor(s/3600);
var minutes = Math.floor((s/60)%60);
@@ -36,3 +39,23 @@ function setIntv(){
}
}
}
+function convertHz(value){
+ if(value>=1000){
+ return Math.round(value/1000,2)+'kHz';
+ }else{
+ return Math.round(value,2)+'Hz';
+ }
+}
+function isMobile(){
+ 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 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")));
+ var open = type=="dir" ? "opendir='"+dir+"'" : (type=="file" ? "openfile='"+dir+"'" : "opendev='"+dir+"'");
+ var str = "!["+name+"](images/"+icon+" "\"+name+\"")
VLC media player - Web Interface
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ VLC media player - Web Interface
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ VLC media player - Web Interface
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ VLC media player - Web Interface
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<
+<
< This program is free software; you can redistribute it and/or modify
< it under the terms of the GNU General Public License as published by
< the Free Software Foundation; either version 2 of the License, or
< (at your option) any later version.
-<
+<
< This program is distributed in the hope that it will be useful,
< but WITHOUT ANY WARRANTY; without even the implied warranty of
< MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
< GNU General Public License for more details.
-<
+<
< You should have received a copy of the GNU General Public License
< along with this program; if not, write to the Free Software
< Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
]] ?>
-
+
' ..name.. ' ')
+ for _, child in ipairs(item.children) do
+ print_playlist(child)
+ end
+ print(' ')
else
local name, path = vlc.strings.convert_xml_special_chars(item.name or "", item.path or "")
local current_item = vlc.input.item()
@@ -63,7 +57,7 @@ function print_playlist(item)
current = 'current="current"'
end
end
- print('' ..name.. '
\ No newline at end of file
diff --git a/share/lua/http/requests/playlist_jstree.xml b/share/lua/http/requests/playlist_jstree.xml
new file mode 100644
index 0000000000..d8bbe02eb2
--- /dev/null
+++ b/share/lua/http/requests/playlist_jstree.xml
@@ -0,0 +1,85 @@
+'?>
+
+< playlist.xml: VLC media player web interface
+< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
+< Copyright (C) 2005-2006 the VideoLAN team
+< $Id$
+<
+< Authors: Antoine Cellerier
+<
+< This program is free software; you can redistribute it and/or modify
+< it under the terms of the GNU General Public License as published by
+< the Free Software Foundation; either version 2 of the License, or
+< (at your option) any later version.
+<
+< This program is distributed in the hope that it will be useful,
+< but WITHOUT ANY WARRANTY; without even the implied warranty of
+< MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+< GNU General Public License for more details.
+<
+< You should have received a copy of the GNU General Public License
+< along with this program; if not, write to the Free Software
+< Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+]] ?>
+
+' ..name.. ' ' ..name.. '
\ No newline at end of file
diff --git a/share/lua/http/view.html b/share/lua/http/view.html
index e1d646b9ac..99fd531d60 100644
--- a/share/lua/http/view.html
+++ b/share/lua/http/view.html
@@ -1,16 +1,39 @@
-
+
VLC media player - Flash Viewer
+
+
-
-
+
+
"+name+"
'+value+'dB
'+freq+'
'+value+'dB
'+freq+'
'+$('error',data).text()+'
');
+ $('#window_error').dialog('open');
+ }
+ if(append!=undefined){
+ eval(append);
+ }
updateStreams();
}
});
}else{
$.ajax({
url: 'requests/vlm_cmd.xml',
- data: 'command='+encodeURIComponent(command)
+ data: 'command='+encodeURIComponent(command),
+ success: function(data,status,jqXHR){
+ if($('error',data).text()){
+ $('#error_container').append(''+$('error',data).text()+'
');
+ $('#window_error').dialog('open');
+ }
+ updateStreams();
+ }
});
}
-
}
}
-function sendBatchVLMCmd(command){
+function sendBatchVLMCmd(command,append){
var commands = command.split(';');
$.ajax({
url: 'requests/vlm_cmd.xml',
data: 'command='+encodeURIComponent(commands.shift()),
success:function(data,status,jqXHR){
- sendVLMCmd(commands.join(';'));
+ if($('error',data).text()){
+ $('#error_container').append(''+$('error',data).text()+'
');
+ $('#window_error').dialog('open');
+ }
+ sendVLMCmd(commands.join(';'),append);
}
});
}
+function sendEQCmd(params){
+ $.ajax({
+ url: 'requests/equalizer.xml',
+ data: params,
+ success: function(data,status,jqXHR){
+ updateEQ();
+ }
+ });
+}
+
$(function(){
$('#libraryTree').jstree({
"xml_data":{
"ajax":{
- "url" : "requests/playlist.xml"
+ "url" : "requests/playlist_jstree.xml"
},
"xsl" : "nest"
},
@@ -317,4 +450,5 @@ $(function(){
});
updateStatus();
updateStreams();
+ updateEQ();
});
diff --git a/share/lua/http/js/ui.js b/share/lua/http/js/ui.js
new file mode 100644
index 0000000000..fbef9ff192
--- /dev/null
+++ b/share/lua/http/js/ui.js
@@ -0,0 +1,72 @@
+$(function(){
+ $( "#seekSlider" ).slider({
+ range: "min",
+ value: 0,
+ min: 0,
+ max: 100,
+ stop: function( event, ui ) {
+ $( "#currentTime" ).empty().append( format_time(Math.round((ui.value/100)*$('#seekSlider').attr('totalLength'))) );
+ switch(current_que){
+ case 'main':
+ sendCommand({'command':'seek','val':Math.round((ui.value/100)*$('#seekSlider').attr('totalLength'))});
+ break;
+ case 'stream':
+ sendVLMCmd('control Current seek '+ui.value);
+ break;
+ }
+ }
+ });
+ $( "#volumeSlider" ).slider({
+ range: "min",
+ value: 50,
+ min: 0,
+ max: 100,
+ stop: function( event, ui ) {
+ $( "#currentVolume" ).empty().append( ui.value+"%" );
+ sendCommand({
+ 'command':'volume',
+ 'val':Math.round(ui.value*5.12)
+ })
+ }
+ });
+ $('#buttonStop').click(function(){
+ switch(current_que){
+ case 'main':
+ sendCommand({'command' : 'pl_stop'})
+ break;
+ case 'stream':
+ sendVLMCmd('control Current stop');
+ break;
+ }
+ return false;
+ });
+ $('#buttonPlay').click(function(){
+ if($(this).attr('state')=='stopped'){
+ switch(current_que){
+ case 'main':
+ 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});
+ break;
+ case 'stream':
+ sendVLMCmd('control Current play');
+ flowplayer("player", "http://releases.flowplayer.org/swf/flowplayer-3.2.7.swf");
+ break;
+ }
+ }else{
+ switch(current_que){
+ case 'main':
+ sendCommand({'command':'pl_pause'});
+ break;
+ case 'stream':
+ sendVLMCmd('control Current pause');
+ break;
+ }
+ }
+ return false;
+ });
+ $('#buttonFull').click(function(){
+ sendCommand({'command':'fullscreen'});
+ return false;
+ });
+ $('#stream_host').val(stream_server);
+})
\ No newline at end of file
diff --git a/share/lua/http/mobile.html b/share/lua/http/mobile.html
new file mode 100644
index 0000000000..885c85c4f5
--- /dev/null
+++ b/share/lua/http/mobile.html
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/share/lua/http/mobile_browse.html b/share/lua/http/mobile_browse.html
new file mode 100644
index 0000000000..314da74ef3
--- /dev/null
+++ b/share/lua/http/mobile_browse.html
@@ -0,0 +1,54 @@
+
+
+
+ |
+ |
+ + + + + + | ||
| + | |||
+  |
+ |||
| + + | +|||
|
+
+
+
+
+
+
+
+
|
+ |||
+
+
+
\ No newline at end of file
diff --git a/share/lua/http/mobile_equalizer.html b/share/lua/http/mobile_equalizer.html
new file mode 100644
index 0000000000..310eb406c2
--- /dev/null
+++ b/share/lua/http/mobile_equalizer.html
@@ -0,0 +1,70 @@
+
+
+
+
+
+ -
+
- Play List +
+
+
+
\ No newline at end of file
diff --git a/share/lua/http/mobile_view.html b/share/lua/http/mobile_view.html
new file mode 100644
index 0000000000..b84b2d7652
--- /dev/null
+++ b/share/lua/http/mobile_view.html
@@ -0,0 +1,55 @@
+
+
+
+
+
+ Preamp: 0dB
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/share/lua/http/requests/playlist.xml b/share/lua/http/requests/playlist.xml
index d8bbe02eb2..23fdb64b95 100644
--- a/share/lua/http/requests/playlist.xml
+++ b/share/lua/http/requests/playlist.xml
@@ -6,25 +6,25 @@ vim:syntax=lua
< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
< Copyright (C) 2005-2006 the VideoLAN team
< $Id$
-<
+<
< Authors: Antoine Cellerier