Skip to content

V
vlc-1.1
Commit 4b2db5bc authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

* modules/control/joystick.c 

	* Allow the user to remap the actions.
	* Improved the strings (please check)
	* Prevent 0 seconds seeks

* share/http/*.html
	* partial HTML validation fixes
	* Improved the look

* src/stream_output/announce.c
	* minor fixes (thanks sam)
parent fa06cb36
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 268 additions and 123 deletions
modules/control/joystick.c
View file @ 4b2db5bc
This diff is collapsed.
share/http/admin/browse.html
View file @ 4b2db5bc
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</tr> </tr>
<p>This page is disabled (Change _directory_ into directory to enable it but you should think about security)</p> <p>This page is disabled (Change _directory_ into directory to enable it but you should think about security)</p>
<vlc id="rpn" param1="'dir' url_extract" /> <vlc id="rpn" param1="'dir' url_extract" />
<vlc id="foreach" param1="file" param2="_directory_" /> <vlc id="foreach" param1="file" param2="directory" />
<tr> <tr>
<td> <td>
<vlc id="if" param1="file.type value 'directory' strcmp 0 =" /> <vlc id="if" param1="file.type value 'directory' strcmp 0 =" />
......
share/http/admin/index.html
View file @ 4b2db5bc
<html> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml10/DTD/xhtml10transitional.dtd">
<head>
<title>VLC Media Player - Admin</title> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title>VLC Media Player</title>
<style>
body {font-family:Verdana, Arial, Sans Serif; }
h2 { text-align:center; }
td {border:1pt black solid;margin:0em; }
table.border {border:1pt black solid;}
div.section {background-color:#FFFFCC;
border:1pt black solid;
margin-bottom:2em;
padding:0.5em; }
div.section-ctr {background-color:#FFFFCC;
border:1pt black solid;
margin-bottom:2em;
padding:0.5em;
font-size:1.2em;
text-align:center; }
div.sectitle { background-color:#FFFF99;
color:#019;
border:1pt black solid;
width:20%;
font-weight:bold;}
tr.ligne1 { background-color:#FFFFEE; }
tr.ligne2 { background-color:#FFFFAA; }
</style>
<vlc id="if" param1="url_param"/> <vlc id="if" param1="url_param"/>
<meta http-equiv="refresh" content="0;URL=/admin/" /> <meta http-equiv="refresh" content="0;URL=/admin/" />
<vlc id="end" /> <vlc id="end" />
...@@ -9,15 +35,13 @@ ...@@ -9,15 +35,13 @@
<vlc id="set" param1="sout" param2="string" /> <vlc id="set" param1="sout" param2="string" />
</head> </head>
<body> <body>
<h2> <h2><a href="/">VLC Media Player - Admin <vlc id="value" param1="version" /></a></h2>
<center>
<a href="/">VLC Media Player - Admin <vlc id="value" param1="version" /></a> <form method="get" action=""> <input type="submit" name="control" value="shutdown" /> </form>
</center>
</h2>
<hr/>
<h3>Host list</h3> <div class="section-ctr">Shutdown VLC<br /> <form method="get" action=""> <input type="submit" name="control" value="shutdown" /> </form></div>
<table border="1" cellspacing="0" >
<div class="sectitle">Host list</div>
<div class="section">
<table class="border" >
<tr> <tr>
<th>Id</th><th>Host</th><th>IP</th><th>Port</th> <th>Id</th><th>Host</th><th>IP</th><th>Port</th>
</tr> </tr>
...@@ -30,14 +54,16 @@ ...@@ -30,14 +54,16 @@
</tr> </tr>
<vlc id="end" /> <vlc id="end" />
</table> </table>
</div>
<h3>File list</h3>
<div class="sectitle">File list</div>
<div class="section">
<table border="1" cellspacing="0" > <table border="1" cellspacing="0" >
<tr> <tr>
<th>Id</th><th>URL</th><th>Mime</th><th>Protected</th><th>usage</th> <th>Id</th><th>URL</th><th>Mime</th><th>Protected</th><th>usage</th>
</tr> </tr>
<vlc id="foreach" param1="url" param2="urls" /> <vlc id="foreach" param1="url" param2="urls" />
<vlc id="if" param1="url.stream 0 =" /> <vlc id="if" param1="url.stream 0 =" />
<tr> <tr>
<td><vlc id="value" param1="url.id" /></td> <td><vlc id="value" param1="url.id" /></td>
<td><vlc id="value" param1="url.url" /></td> <td><vlc id="value" param1="url.url" /></td>
...@@ -48,8 +74,11 @@ ...@@ -48,8 +74,11 @@
<vlc id="end" /> <vlc id="end" />
<vlc id="end" /> <vlc id="end" />
</table> </table>
</div>
<h3>Stream list</h3> <div class="sectitle">Stream list</div>
<div class="section">
<table border="1" cellspacing="0" > <table border="1" cellspacing="0" >
<tr> <tr>
<th>Id</th><th>URL</th><th>Mime</th><th>Protected</th><th>usage</th> <th>Id</th><th>URL</th><th>Mime</th><th>Protected</th><th>usage</th>
...@@ -66,8 +95,10 @@ ...@@ -66,8 +95,10 @@
<vlc id="end" /> <vlc id="end" />
<vlc id="end" /> <vlc id="end" />
</table> </table>
</div>
<h3>Connections list</h3> <div class="sectitle">Connections list</div>
<div class="section">
<table border="1" cellspacing="0" > <table border="1" cellspacing="0" >
<tr> <tr>
<th>Id</th><th>ip</th><th>URL</th><th>Status</th><th>Actions</th> <th>Id</th><th>ip</th><th>URL</th><th>Status</th><th>Actions</th>
...@@ -88,7 +119,7 @@ ...@@ -88,7 +119,7 @@
</tr> </tr>
<vlc id="end" /> <vlc id="end" />
</table> </table>
</div>
<hr /> <hr />
<p> <vlc id="value" param1="copyright" /> </p> <p> <vlc id="value" param1="copyright" /> </p>
</body> </body>
......
share/http/index.html
View file @ 4b2db5bc
<html> <?xml version="1.0" encoding="iso-8859-1" ?>
<head> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml10/DTD/xhtml10transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title>VLC Media Player</title> <title>VLC Media Player</title>
<style type="css">
body {font-family:Verdana, Arial, Sans Serif; }
h2 { text-align:center; }
table {width:100%;}
table.add {width:70%;}
div.section {background-color:#FFFFCC;
border:1pt black solid;
margin-bottom:2em;
padding:0.5em;}
div.sectitle { background-color:#FFFF99;
color:#019;
border:1pt black solid;
width:20%;
font-weight:bold;}
tr.ligne1 { background-color:#FFFFEE; }
tr.ligne2 { background-color:#FFFFAA; }
</style>
<vlc id="if" param1="url_param"/> <vlc id="if" param1="url_param"/>
<meta http-equiv="refresh" content="0;URL=/" /> <meta http-equiv="refresh" content="0;URL=/" />
<vlc id="end" /> <vlc id="end" />
<vlc id="control" param1="stop,pause,previous,next,add,sout,play" /> <vlc id="control" param1="stop,pause,previous,next,add,sout,play" />
<vlc id="set" param1="sout" param2="string" /> <vlc id="set" param1="sout" param2="string" />
</head> </head>
<body> <body>
<h2><center><a href="http://www.videolan.org">VLC Media Player <vlc id="value" param1="version" /></a> (http interface)</center></h2> <h2>
<hr/> <a href="http://www.videolan.org">VLC Media Player <vlc id="value" param1="version" /></a> (http interface)</h2>
<td> <div class="sectitle">Control VLC</div>
<form method="get" action=""> <div class="section">
<input type="submit" name="control" value="stop" /> <form method="get" action="">
<input type="submit" name="control" value="pause" /> <table class="add">
<input type="submit" name="control" value="previous" /> <tr>
<input type="submit" name="control" value="next" /> <td><input type="submit" name="control" value="stop" /></td>
<a href="info.html">infos</a> <td><input type="submit" name="control" value="pause" /></td>
</form> <td><input type="submit" name="control" value="previous" /></td>
</td> <td><input type="submit" name="control" value="next" /></td>
<br /> <td><a href="admin/">Administration</a></td>
<td> </tr>
<form method="get" action="" enctype="text/plain" > </table>
<input type="text" name="mrl" size="40" /> </form>
<input type="submit" name="control" value="add" /> </div>
</form> <div class="sectitle">Add</div>
</td> <div class="section">
<td> <form method="get" action="" enctype="text/plain" >
<form method="get" action="" enctype="text/plain" > <table class="add">
<input type="text" name="sout" size="30" value="<vlc id="get" param1="sout" param2="string" />" /> <tr>
<input type="submit" name="control" value="sout" /> <td>Add a MRL (Media Resource Locator) to the playlist</td>
</form> <td><input type="text" name="mrl" size="40" /></td>
</td> <td><input type="submit" name="control" value="add" /></td>
<hr/> </tr>
<p> <tr>
<td>Stream Output:</td>
<td><input type="text" name="sout" size="40" value="<vlc id="get" param1="sout" param2="string" />" /></td>
<td><input type="submit" name="control" value="sout" /></td>
</tr>
</table>
</form>
</div>
<div class="sectitle">VLC Playlist</div>
<div class="section">
<table>
<vlc id="foreach" param1="pl" param2="playlist" /> <vlc id="foreach" param1="pl" param2="playlist" />
<vlc id="if" param1="pl.current" /> <tr class="<vlc id="if" param1="2 pl.index % 0 =" />ligne1<vlc id="else" />ligne2<vlc id="end" />">
<td>
<vlc id="if" param1="pl.current" />
<b> <b>
<vlc id="end" /> <vlc id="end" />
<a href=?control=play&item=<vlc id="value" param1="pl.index" />><vlc id="value" param1="pl.index" /> - <vlc id="value" param1="pl.name" /></a> <br /> <a href="?control=play&item=<vlc id="value" param1="pl.index" />"><vlc id="value" param1="pl.index" /> - <vlc id="value" param1="pl.name" /></a> <vlc id="if" param1="pl.current" />
<vlc id="if" param1="pl.current" />
</b> </b>
<vlc id="end" /> <vlc id="end" />
</td></tr>
<vlc id="end" /> <vlc id="end" />
</p> </table>
</div>
<hr/> <hr/>
<p> <vlc id="value" param1="copyright" /> </p> <p> <vlc id="value" param1="copyright" /> </p>
</body> </body>
......
src/stream_output/announce.c
View file @ 4b2db5bc
...@@ -46,8 +46,6 @@ ...@@ -46,8 +46,6 @@
# include <sys/socket.h> # include <sys/socket.h>
#endif #endif
#undef DEBUG_BUFFER
#include "announce.h" #include "announce.h"
#include "network.h" #include "network.h"
...@@ -375,14 +373,7 @@ void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_sap ) ...@@ -375,14 +373,7 @@ void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_sap )
if( i_size < 1024 ) /* We mustn't send packets larger than 1024B */ if( i_size < 1024 ) /* We mustn't send packets larger than 1024B */
{ {
if( p_sap->i_ip_version == 6 ) i_ret = send( p_sap->i_socket, psz_send, i_size, 0 );
{
i_ret = send( p_sap->i_socket, psz_send, i_size, 0 );
}
else
{
i_ret = send( p_sap->i_socket, psz_send, i_size, 0 );
}
} }
if( i_ret <= 0 ) if( i_ret <= 0 )
......
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