Skip to content

V
vlc-2-2
Commit e28b1302 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

luahttp: remove old mosaic

parent 76aa0c1e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 503 deletions
share/Makefile.am
View file @ e28b1302
......@@ -319,7 +319,6 @@ DIST_http_lua = \
lua/http/mobile_equalizer.html \
lua/http/vlm_export.html \
lua/http/mobile_browse.html \
lua/http/mosaic.html \
lua/http/favicon.ico \
lua/http/mobile_view.html \
lua/http/.hosts \
......@@ -356,7 +355,6 @@ DIST_http_lua = \
lua/http/js/jquery.jstree.js \
lua/http/js/controlers.js \
lua/http/js/jquery-ui-1.8.13.custom.min.js \
lua/http/js/mosaic.js \
lua/http/style.css
DIST_maemo = \
......
share/lua/http/dialogs/footer
View file @ e28b1302
......@@ -29,7 +29,6 @@ This dialog needs the following dialogs to be fully functional: <none>
<div id="footer" class="dialog" >
<a href="/">main VLC interface</a> -
<a href="/vlm.html">VLM interface</a> -
<a href="/mosaic.html">Mosaic wizard</a> -
<a href="http://www.videolan.org">VideoLAN website</a>
<br />
<?vlc print(vlc.misc.version() .. " - Lua Web Interface - " .. vlc.misc.copyright()) ?>
......
share/lua/http/dialogs/mosaic deleted 100644 → 0
View file @ 76aa0c1e
<?vlc --[[
vim:syntax=html
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
< mosaic: VLC media player web interface - mosaic wizard
< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
< Copyright (C) 2005-2006 the VideoLAN team
< $Id$
<
< Authors: Antoine Cellerier <dionoea -at- videolan -dot- org>
<
< 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
This dialog needs the following dialogs to be fully functional: input and
sout.
]]?>
<div id="mosaic" class="dialog">
<div class="title">
VLC media player - Mosaic wizard
<button id="btn_toggle_text" onclick="toggle_btn_text();">
<img src="images/help.png" alt="Help" />
Help
</button>
</div>
<div class="controls">
<b>Mosaic dimensions:</b><br/>
<table style="text-align: right;">
<tr>
<td>
<label for="bg_width">Background width*:</label> <input class="mosaic_bg" type="text" id="bg_width" value="400" size="8" onchange="mosaic_size_change();" />
</td>
<td>
<label for="bg_height">Background height*:</label> <input class="mosaic_bg" type="text" id="bg_height" value="300" size="8" onchange="mosaic_size_change();" />
</td>
</tr>
<tr>
<td>
<label for="mosaic_width">Width:</label> <input class="mosaic_tbl" type="text" id="mosaic_width" value="200" size="8" onchange="mosaic_size_change();" />
</td>
<td>
<label for="mosaic_height">Height:</label> <input class="mosaic_tbl" type="text" id="mosaic_height" value="200" size="8" onchange="mosaic_size_change();" />
</td>
</tr>
<tr>
<td>
<label for="mosaic_xoffset">X offset (left):</label> <input class="mosaic_tbl" type="text" id="mosaic_xoffset" value="10" size="8" onchange="mosaic_size_change();" />
</td>
<td>
<label for="mosaic_yoffset">Y offset (top):</label> <input class="mosaic_tbl" type="text" id="mosaic_yoffset" value="10" size="8" onchange="mosaic_size_change();" />
</td>
</tr>
<tr>
<td>
<label for="mosaic_cols">Columns:</label> <input class="mosaic_itm" type="text" id="mosaic_cols" value="2" size="8" onchange="mosaic_size_change();" />
</td>
<td>
<label for="mosaic_rows">Rows:</label> <input class="mosaic_itm" type="text" id="mosaic_rows" value="2" size="8" onchange="mosaic_size_change();" />
</td>
</tr>
<tr>
<td>
<label for="mosaic_hborder">Horizontal border:</label> <input class="mosaic_itm" type="text" id="mosaic_hborder" value="10" size="8" onchange="mosaic_size_change();" />
</td>
<td>
<label for="mosaic_vborder">Vertical border:</label> <input class="mosaic_itm" type="text" id="mosaic_vborder" value="5" size="8" onchange="mosaic_size_change();" />
</td>
</tr>
<tr>
<td colspan="2">
*: these values aren't used by the mosaic code.<br/> They're only here to adapt the preview's size.
</td>
</tr>
</table>
<b>Background:</b><br/>
<label for="mosaic_bg_input">Input:<label> <input type="text" id="mosaic_bg_input" class="mosaic_bg" value="" size="60" onblur="mosaic_code_update();" /> <input type="button" value="Edit" onclick="vlm_input_edit( 'mosaic_bg_input' );" /><br/>
<b>Item:</b><br/>
<label for="mosaic_input_name">Name:</label> <input type="text" id="mosaic_input_name" value="" class="mosaic_itm" />
<label for="mosaic_input">Input:</label> <input type="text" id="mosaic_input" value="" class="mosaic_itm" /> <input type="button" value="Edit" onclick="vlm_input_edit( 'mosaic_input' );" /> <input type="button" value="Add to input list" onclick="mosaic_add_input();" /><br/>
<b>Stream:</b> (leave this empty to display locally)<br/>
<label for="mosaic_output">Output:</label> <input type="text" id="mosaic_output" value="" size="60" onblur="mosaic_code_update();" /> <input type="button" value="Edit" onclick="vlm_output_edit( 'mosaic_output' );" /><br/>
<div id="mosaic_feedback"></div>
</div>
<div id="mosaic_list" class="popup">[<a href="javascript:hide('mosaic_list');">hide</a>] - Select a stream:<br/><div id="mosaic_list_content"></div></div>
<div class="controls">
Click on each of the cells to assign inputs. (<a href="javascript:document.getElementById('mosaic_list').value='';show('mosaic_list');">Show input list</a>)
</div>
</div>
<div id="mosaic_layout" class="mosaic_bg"></div>
<div class="dialog" style="overflow:visible;">
<div class="controls">
<input type="button" value="Let's go!" onclick="mosaic_batch(document.getElementById('mosaic_code').value);" />
<input type="button" value="Stop" onclick="mosaic_stop()" />
<input type="button" id="mosaic_code_show" value="Show VLM code" onclick="show('mosaic_code_div');hide('mosaic_code_show');showinline('mosaic_code_hide');" />
<input type="button" id="mosaic_code_hide" style="display:none" value="Hide VLM code" onclick="hide('mosaic_code_div');hide('mosaic_code_hide');showinline('mosaic_code_show');" />
<br/><br/>
</div>
<div id="mosaic_code_div" style="display:none;" >
Edit the following VLM command batch if you want to fine tune your mosaic settings:
<textarea id="mosaic_code" cols="80" rows="30"></textarea>
</div>
</div>
share/lua/http/js/mosaic.js deleted 100644 → 0
View file @ 76aa0c1e
/*****************************************************************************
* mosaic.js: VLC media player web interface - Mosaic specific functions
*****************************************************************************
* Copyright (C) 2005-2006 the VideoLAN team
* $Id$
*
* Authors: Antoine Cellerier <dionoea -at- videolan -dot- org>
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/**********************************************************************
*
*********************************************************************/
var mosaic_alpha = 255;
var mosaic_height = 0;
var mosaic_width = 0;
var mosaic_align = 5;
var mosaic_xoffset = 0;
var mosaic_yoffset = 0;
var mosaic_vborder = 0;
var mosaic_hborder = 0;
var mosaic_position = 1;
var mosaic_rows = 0;
var mosaic_cols = 0;
var mosaic_delay = 0;
var cell_width = 0;
var cell_height = 0;
var streams = Object();
var cells = Object();
function mosaic_init()
{
document.getElementById( 'sout_transcode_extra' ).value = ",sfilter=mosaic}:bridge-in{offset=100";
mosaic_size_change();
/* Force usage of transcode in sout */
document.getElementById( 'sout_vcodec_s' ).checked = 'checked';
disable( 'sout_vcodec_s' );
update_sout();
}
function mosaic_size_change()
{
var x,y;
var bg_width = check_and_replace_int( "bg_width", "400" );
var bg_height = check_and_replace_int( "bg_height", "300" );
mosaic_height = check_and_replace_int( "mosaic_height", "100" );
mosaic_width = check_and_replace_int( "mosaic_width", "100" );
mosaic_xoffset = check_and_replace_int( "mosaic_xoffset", "10" );
mosaic_yoffset = check_and_replace_int( "mosaic_yoffset", "10" );
mosaic_vborder = check_and_replace_int( "mosaic_vborder", "5" );
mosaic_hborder = check_and_replace_int( "mosaic_hborder", "10" );
mosaic_rows = check_and_replace_int( "mosaic_rows", "1" );
mosaic_cols = check_and_replace_int( "mosaic_cols", "1" );
cell_width = Math.floor((mosaic_width-(mosaic_cols-1)*mosaic_hborder)/mosaic_cols);
cell_height = Math.floor((mosaic_height-(mosaic_rows-1)*mosaic_vborder)/mosaic_rows);
var mlayout = document.getElementById( "mosaic_layout" );
while( mlayout.hasChildNodes() )
mlayout.removeChild( mlayout.firstChild );
mlayout.style.width = bg_width + "px";
mlayout.style.height = bg_height + "px";
if( mosaic_cols && mosaic_rows )
{
var mdt = document.createElement( 'div' );
mdt.setAttribute( 'id', 'mosaic_dt' );
setclass( mdt, 'mosaic_tbl' );
mdt.style.width = mosaic_width + "px";
mdt.style.height = mosaic_height + "px";
mdt.style.top = mosaic_yoffset + "px";
mdt.style.left = mosaic_xoffset + "px";
var mtable = document.createElement( 'table' );
mtable.setAttribute( 'id', 'mosaic_table' );
mtable.style.top = "-" + mosaic_vborder + "px";
mtable.style.left = "-" + mosaic_hborder + "px";
mtable.style.width = (1*mosaic_width +2*mosaic_hborder) + "px";
mtable.style.height = (1*mosaic_height+2*mosaic_vborder) + "px";
mtable.style.borderSpacing = mosaic_hborder + "px " +
mosaic_vborder + "px";
var mtbody = document.createElement( 'tbody' );
for( y = 0; y < mosaic_rows; y++ )
{
var mrow = document.createElement( 'tr' );
for( x = 0; x < mosaic_cols; x++ )
{
var mcell = document.createElement( 'td' );
setclass( mcell, 'mosaic_itm' );
mcell.style.width = cell_width + "px";
mcell.style.height = cell_height + "px";
var id = x+'_'+y;
var melt = create_button( cells[id] ? cells[id] : '?', 'mosaic_elt_choose(\"'+id+'\");' );
melt.setAttribute( 'id', id );
melt.setAttribute( 'title', 'Click to choose stream' );
mcell.appendChild( melt );
mrow.appendChild( mcell );
}
mtbody.appendChild( mrow );
}
mtable.appendChild( mtbody );
mdt.appendChild( mtable );
mlayout.appendChild( mdt );
}
mosaic_code_update();
}
function mosaic_add_input()
{
streams[ addunderscores( value('mosaic_input_name') ) ] =
value('mosaic_input');
mosaic_feedback( addunderscores( value('mosaic_input_name') ) + " ( " + value('mosaic_input') + " ) added to input list.", true );
var mlist = document.getElementById( "mosaic_list_content" );
while( mlist.hasChildNodes() )
mlist.removeChild( mlist.firstChild );
for( var name in streams )
{
var mrl = streams[name];
var minput = document.createElement( 'a' );
minput.setAttribute( 'href', 'javascript:mosaic_elt_select(\''+name+'\');');
minput.setAttribute( 'id', name );
minput.setAttribute( 'value', mrl );
var minputtxt = document.createTextNode( name );
minput.appendChild( minputtxt );
mlist.appendChild( minput );
mlist.appendChild( document.createTextNode( " ( "+mrl+" )" ) );
mlist.appendChild( document.createElement( 'br' ) );
}
}
function mosaic_elt_select( id )
{
hide( 'mosaic_list' );
var ml = document.getElementById( 'mosaic_list' ).value;
if( ml )
{
document.getElementById( ml ).value = id;
cells[ ml ] = id;
mosaic_code_update();
}
}
function mosaic_elt_choose( id )
{
document.getElementById( 'mosaic_list' ).value = id;
show( 'mosaic_list' );
}
function mosaic_code_update()
{
var code = document.getElementById( 'mosaic_code' );
code.value =
"##################################\n"+
"## HTTP interface mosaic wizard ##\n"+
"##################################\n"+
"\n"+
"# Comment the following line if you don't want to reset your VLM configuration\n"+
"del all\n"+
"\n"+
"# Background options\n"+
"new bg broadcast enabled\n"+
"setup bg input " + sanitize_input( value( 'mosaic_bg_input' ) ) + "\n";
if( value( 'mosaic_output' ) )
{
code.value +=
"setup bg output " + value( 'mosaic_output' )+ "\n";
}
var o = /.*transcode.*/;
if(! o.test( value( 'mosaic_output' ) ) )
{
code.value +=
"setup bg option sub-source=mosaic\n"+
"setup bg output #bridge-in{offset=100}:display\n";
}
code.value+=
"\n"+
"# Mosaic options\n"+
"setup bg option mosaic-alpha=" + mosaic_alpha + "\n"+
"setup bg option mosaic-height=" + mosaic_height + "\n"+
"setup bg option mosaic-width=" + mosaic_width + "\n"+
"setup bg option mosaic-align=" + mosaic_align + "\n"+
"setup bg option mosaic-xoffset=" + mosaic_xoffset + "\n"+
"setup bg option mosaic-yoffset=" + mosaic_yoffset + "\n"+
"setup bg option mosaic-vborder=" + mosaic_vborder + "\n"+
"setup bg option mosaic-hborder=" + mosaic_hborder + "\n"+
"setup bg option mosaic-position=" + mosaic_position + "\n"+
"setup bg option mosaic-rows=" + mosaic_rows + "\n"+
"setup bg option mosaic-cols=" + mosaic_cols + "\n"+
"setup bg option mosaic-order=";
for( y = 0; y < mosaic_rows; y++ )
{
for( x = 0; x < mosaic_cols; x++ )
{
var id = x+'_'+y;
if( cells[id] )
code.value += cells[id];
else
code.value += '_';
if( y != mosaic_rows - 1 || x != mosaic_cols - 1 )
code.value += ',';
}
}
code.value += "\n"+
"setup bg option mosaic-delay=" + mosaic_delay + "\n"+
"setup bg option mosaic-keep-picture\n"+
"\n"+
"# Input options\n";
var x, y;
for( y = 0; y < mosaic_rows; y++ )
{
for( x = 0; x < mosaic_cols; x++ )
{
var id = x+'_'+y;
if( cells[id] )
{
var s = cells[id];
code.value +=
"new " + s + " broadcast enabled\n"+
"setup " + s + " input " + sanitize_input( streams[s] ) + "\n"+
"setup " + s + " output #duplicate{dst=mosaic-bridge{id=" + s + ",width="+cell_width+",height="+cell_height+"},select=video,dst=bridge-out{id="+(y*mosaic_cols+x)+"},select=audio}\n"+
"\n";
}
}
}
code.value +=
"# Launch everything\n"+
"control bg play\n";
for( y = 0; y < mosaic_rows; y++ )
{
for( x = 0; x < mosaic_cols; x++ )
{
var id = x+'_'+y;
if( cells[id] )
{
var s = cells[id];
code.value +=
"control " + s + " play\n";
}
}
}
code.value +=
"\n"+
"# end of mosaic batch\n";
}
function mosaic_batch( batch )
{
var i;
var commands = batch.split( '\n' );
for( i = 0; i < commands.length; i++ )
{
mosaic_cmd( commands[i] );
}
}
function mosaic_cmd( cmd )
{
loadXMLDoc( 'requests/vlm_cmd.xml?command='+cmd.replace(/\#/g, '%23'), parse_mosaic_cmd );
}
function parse_mosaic_cmd()
{
/* TODO */
}
function mosaic_stop()
{
var cmd;
cmd = "control bg stop\n";
var x,y;
for( y = 0; y < mosaic_rows; y++ )
{
for( x = 0; x < mosaic_cols; x++ )
{
var id = x+'_'+y;
if( cells[id] )
{
var s = cells[id];
cmd += "control " + s + " stop\n";
}
}
}
mosaic_batch( cmd );
}
function mosaic_feedback( msg, ok )
{
var f = document.getElementById( "mosaic_feedback" );
while( f.hasChildNodes() )
f.removeChild( f.firstChild );
f.style.fontWeight = "bold";
if( ok )
f.style.color = "#0f0";
else
f.style.color = "#f00";
var t = document.createTextNode( ( ok ? "Info: " : "Error: " ) + msg );
f.appendChild( t );
}
share/lua/http/mosaic.html deleted 100644 → 0
View file @ 76aa0c1e
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
< vlm.html: VLC media player web interface - VLM
< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
< Copyright (C) 2005-2006 the VideoLAN team
< $Id$
<
< Authors: Antoine Cellerier <dionoea -at- videolan -dot- org>
<
< 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>VLC media player - Web Interface - Mosaic Wizard</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link href="style.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="js/functions.js"></script>
<script type="text/javascript" src="js/vlm.js"></script>
<script type="text/javascript" src="js/mosaic.js"></script>
</head>
<body onload="mosaic_init();">
<h1>Mosaic wizard</h1>
<?vlc
current_page = "vlm"
dialogs("browse","input","sout","mosaic","footer")
?>
</body>
</html>
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