Skip to content

V
vlc-2-2
Commit cb7de733 authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

* Added some status information to the HTTP interface 

* Invalid HTML SUX !
* Table layout SUX !
parent e94917b1
Show whitespace changes
Inline Side-by-side
Showing with 201 additions and 137 deletions
share/http/index.html
View file @ cb7de733
...@@ -14,61 +14,55 @@ ...@@ -14,61 +14,55 @@
<vlc id="set" param1="sout" param2="string" /> <vlc id="set" param1="sout" param2="string" />
</head> </head>
<body> <body>
<h2> <div class="left">
<a href="http://www.videolan.org/">VLC media player <vlc id="value" param1="version" /></a> (http interface)</h2> <div class="sectitle">Playback control</div>
<div class="sectitle">Control VLC</div> <div class="section-controls">
<div class="section">
<table class="add">
<tr>
<td nowrap="nowrap">Current state: <vlc id="value" param1="stream_state" /></td>
<td align="right"><a href="info.html">Information</a> <a href="admin/">Administration</a></td>
</tr>
<tr>
<td nowrap="nowrap">
<form method="get" action=""> <form method="get" action="">
<p>
<input type="submit" name="control" value="stop" /> <input type="submit" name="control" value="stop" />
<input type="submit" name="control" value="pause" /> <input type="submit" name="control" value="pause" />
<br />
<input type="submit" name="control" value="previous" /> <input type="submit" name="control" value="previous" />
<input type="submit" name="control" value="next" /> <input type="submit" name="control" value="next" />
<input type="submit" name="control" value="fullscreen" /> </p>
</form>
</td>
</tr>
<tr>
<td colspan="2">
<table>
<tr>
<td>
<form method="get" action="">
<input type="submit" name="seek_value" value="-1min"/><input type="hidden" name="control" value="seek"/> <input type="submit" name="seek_value" value="-1min"/><input type="hidden" name="control" value="seek"/>
</form>
</td>
<td>
<form method="get" action="">
<input type="text" name="seek_value" size="14"/><input type="hidden" name="control" value="seek"/>
</form>
</td>
<td>
<form method="get" action="">
<input type="submit" name="seek_value" value="+1min"/><input type="hidden" name="control" value="seek"/> <input type="submit" name="seek_value" value="+1min"/><input type="hidden" name="control" value="seek"/>
<br />
<input type="text" name="seek_value" size="14"/><input type="hidden" name="control" value="seek"/>
</form> </form>
</td> <br />
<td> <span class="small">( Seek Textbox: for example "+12min 42sec", "01:13:43", "-12%" etc... )</span>
( Seek Textbox: for example "+12min 42sec", "01:13:43", "-12%" etc... ) </div> <!-- End section -->
</td>
</tr> <div class="sectitle">Misc controls</div>
</table> <div class="section-controls">
</td>
</tr>
<tr>
<td>
<form method="get" action=""> <form method="get" action="">
Current volume level: <vlc id="value" param1="volume" /> <input type="text" name="value" size="5"/><button name="control" value="volume">Set</button> Vol: <input type="text" name="value" size="5"/>
<input type="submit" value="Set" /><br /> (0 -&gt;1024)<br />
<br />
<input type="submit" name="control" value="fullscreen" />
</form> </form>
</td>
</tr>
</table>
</div> </div>
<div class="sectitle">Status</div>
<div class="section">
State: <vlc id="value" param1="stream_state" /><br />
Length: <span id="length"><vlc id="value" param1="stream_length" /> s
</span><br />
Time: <span id="time"><vlc id="value" param1="stream_time" /> s</span><br />
Volume: <span id="volume"><vlc id="value" param1="volume" /></span>
<br /><a href="info.html">Information</a>
</div>
<div><a href="/admin/">Administration Page</a></div>
</div> <!-- End left -->
<div class ="right">
<h2><a href="http://www.videolan.org/">VLC media player
<vlc id="value" param1="version" /></a> (http interface)
</h2>
<div class="sectitle">Add</div> <div class="sectitle">Add</div>
<div class="section"> <div class="section">
<form method="get" action="" enctype="text/plain" > <form method="get" action="" enctype="text/plain" >
...@@ -85,18 +79,12 @@ ...@@ -85,18 +79,12 @@
</form> </form>
</div> </div>
<div class="sectitle">Move Item</div>
<div class="section">
<form method="get" action="">
Move the item number <input type="text" name="psz_pos" size="5" /> to <input type="text" name="psz_newpos" size="5" /> <input type="submit" name="control" value="move" />
</form>
</div>
<div class="sectitle">VLC Playlist</div>
<div class="section"> <div class="section">
<form method="get" action=""> <form method="get" action="">
<table> <table>
<tr> <tr>
<td>
<table><tr>
<td> <td>
<input type="submit" name="control" value="sort" /> by <input type="submit" name="control" value="sort" /> by
<select name="type"> <select name="type">
...@@ -110,6 +98,16 @@ ...@@ -110,6 +98,16 @@
<option value="1">reverse order</option> <option value="1">reverse order</option>
</select> </select>
</td> </td>
<td>
<form method="get" action="">
Move the item number
<input type="text" name="psz_pos" size="5" /> to
<input type="text" name="psz_newpos" size="5" />
<input type="submit" name="control" value="move" />
</form>
</td>
</tr></table>
</td>
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -120,12 +118,12 @@ ...@@ -120,12 +118,12 @@
<td> <td>
<input type="checkbox" name="item" value="<vlc id="value" param1="pl.index" />"/> <input type="checkbox" name="item" value="<vlc id="value" param1="pl.index" />"/>
<vlc id="if" param1="pl.current" /> <vlc id="if" param1="pl.current" />
<b> <strong>
<vlc id="end" /> <vlc id="end" />
<a href="?control=play&amp;item=<vlc id="value" param1="pl.index" />"> <a href="?control=play&amp;item=<vlc id="value" param1="pl.index" />">
<vlc id="value" param1="pl.index" /> - <vlc id="value" param1="pl.uri" /><vlc id="if" param1="pl.uri value pl.name value strcmp"/> (<vlc id="value" param1="pl.name" />)<vlc id="end"/></a> <vlc id="value" param1="pl.index" /> - <vlc id="value" param1="pl.uri" /><vlc id="if" param1="pl.uri value pl.name value strcmp"/> (<vlc id="value" param1="pl.name" />)<vlc id="end"/></a>
<vlc id="if" param1="pl.current" /> <vlc id="if" param1="pl.current" />
</b> </strong>
<vlc id="end" /> <vlc id="end" />
</td> </td>
</tr> </tr>
...@@ -133,9 +131,7 @@ ...@@ -133,9 +131,7 @@
<vlc id="end" /> <vlc id="end" />
<vlc id="if" param1="0 ="/> <vlc id="if" param1="0 ="/>
<tr class="ligne1"> <tr class="ligne1">
<td> <td>empty playlist</td>
empty playlist
</td>
</tr> </tr>
<vlc id="end"/> <vlc id="end"/>
</table> </table>
...@@ -150,7 +146,29 @@ ...@@ -150,7 +146,29 @@
</table> </table>
</form> </form>
</div> </div>
</div>
<hr/> <hr/>
<p> <vlc id="value" param1="copyright" /> </p> <p style="text-align:center;font-size:1.2em;"> <vlc id="value" param1="copyright" /> </p>
<script language="javascript" type="text/javascript">
got_time = <vlc id="value" param1="stream_time" />;
hours = Math.floor(got_time/ 3600);
minutes = Math.floor((got_time/60) % 60);
seconds = got_time % 60;
if ( hours < 10 ) hours = "0" + hours;
if ( minutes < 10 ) minutes = "0" + minutes;
if ( seconds < 10 ) seconds = "0" + seconds;
document.getElementById('time').innerHTML = hours+":"+minutes+":"+seconds;
got_length = <vlc id="value" param1="stream_length" />;
hours = Math.floor(got_length/ 3600);
minutes = Math.floor((got_length/60) % 60);
seconds = got_length % 60;
if ( hours < 10 ) hours = "0" + hours;
if ( minutes < 10 ) minutes = "0" + minutes;
if ( seconds < 10 ) seconds = "0" + seconds;
document.getElementById('length').innerHTML = hours+":"+minutes+":"+seconds;
got_volume = <vlc id="value" param1="volume" />;
document.getElementById( 'volume').innerHTML = Math.floor(got_volume * 100/1024) + " %";
</script>
</body> </body>
</html> </html>
share/http/style.css
View file @ cb7de733
body {font-family:Verdana, Arial, Sans Serif; } body
{
font-family:Verdana, Arial, Sans Serif;
font-size:10pt;
}
h2 { text-align:center; } h2 { text-align:center; }
h3 { text-align:left; } h3 { text-align:left; }
table {width:100%;} table {width:100%;}
table.add {width:100%;} table.add {width:100%;}
div.section {background-color:#DDDDFF;
div.section
{
background-color:#DDDDFF;
border:1pt black solid; border:1pt black solid;
margin-bottom:2em; margin-bottom:2em;
padding:0.5em;} padding:0.5em;
div.sectitle {background-color:#5A5ABB; }
div.section-controls
{
text-align:center;
background-color:#DDDDFF;
border:1pt black solid;
margin-bottom:2em;
padding:0.5em;
}
div.sectitle
{
background-color:#5A5ABB;
color:#FFFFFF; color:#FFFFFF;
border:1pt black solid; border:1pt black solid;
width:8em; font-weight:bold;
font-weight:bold;} }
tr.ligne1 { background-color:#EEEEFF; } tr.ligne1 { background-color:#EEEEFF; }
tr.ligne2 { background-color:#CCCCFF; } tr.ligne2 { background-color:#CCCCFF; }
div.left {
width:15em;
position:absolute;
float:left;
margin-left:0.5em;
}
div.right {
margin-left:17.5em;
float:right;
}
span.small {
font-size:0.9em;
}
form {
margin:0pt;
padding:0pt;
}
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