Skip to content

V
vlc-gpu
Commit 9e8ed400 authored by Jérome Decoodt's avatar Jérome Decoodt
Browse files
Options

Work to support new playlist in http interface. 

+ correct a bug in the <vlc id="foreach" param1="integer" /> macro
+ add a <vlc id="stack" /> to print the rpn stack in debug messages
+ add the != operator in rpn evaluation

Compatibility with old pages should be respected...
parent 727e57b4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 201 additions and 111 deletions
modules/control/http.c
View file @ 9e8ed400
This diff is collapsed.
share/http/index.html
View file @ 9e8ed400
...@@ -7,17 +7,31 @@ ...@@ -7,17 +7,31 @@
<title>VLC media player</title> <title>VLC media player</title>
<link href="/style.css" title="Default" rel="stylesheet" type="text/css" /> <link href="/style.css" title="Default" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<vlc id="if" param1="url_param"/>
<meta http-equiv="refresh" content="0;URL=/" />
<vlc id="end" />
<vlc id="control" param1="stop,pause,previous,next,add,sout,play,delete,empty,seek,fullscreen,keep,volume,sort,move" /> <vlc id="control" param1="stop,pause,previous,next,add,sout,play,delete,empty,seek,fullscreen,keep,volume,sort,move" />
<vlc id="set" param1="sout" param2="string" /> <vlc id="set" param1="sout" param2="string" />
</head> <script type="text/javascript">
<body> function changeMe(item)
{
if (item.parentNode.parentNode.lastChild.style.display=="none")
{
item.parentNode.parentNode.lastChild.style.display="block";
item.alt="[-]";
item.src="cone_minus.png";
}
else
{
item.parentNode.parentNode.lastChild.style.display="none";
item.alt="[+]";
item.src="cone_plus.png";
}
}
</script>
</head>
<body>
<!-- left menu --> <!-- left menu -->
<div class="left"> <div class="left">
<div class="sectitle">Playback control</div> <div class="sectitle">Playback control</div>
...@@ -90,78 +104,81 @@ ...@@ -90,78 +104,81 @@
</div> </div>
<div class="section"> <div class="section">
<table> <form method="get" action="">
<tr> <ul id="playlist">
<td> <vlc id="rpn" param1="first_item 0 store" />
<table> <vlc id="rpn" param1="last_depth 0 store" />
<tr> <vlc id="foreach" param1="pl" param2="playlist" />
<td> <vlc id="if" param1="pl.depth value last_depth value <" />
<form method="get" action=""> <vlc id="rpn" param1="pl.depth value ':' last_depth value 1 - ':' 1 strcat strcat strcat strcat" />
<input type="submit" name="control" value="sort" /> by <vlc id="foreach" param1="the_final_countdown" param2="integer" />
<select name="type"> </ul></li>
<option value="title">title</option> <vlc id="end" />
<option value="group">group</option> <vlc id="end" />
<option value="author">author</option>
<option value="shuffle">shuffle</option> <vlc id="if" param1="pl.type value 'Node' strcmp" />
</select> with <vlc id="rpn" param1="1 +" />
<select name="order"> <li>
<option value="0">normal order</option> <input type="checkbox" name="item" value="<vlc id="value" param1="pl.index" />"/>
<option value="1">reverse order</option> <vlc id="if" param1="pl.current" />
</select> <strong>
</form> <vlc id="end" />
</td> <a href="?control=play&amp;item=<vlc id="value" param1="pl.index" />">
<td> <vlc id="value" param1="pl.name" /><vlc id="if" param1="pl.uri value pl.name value strcmp"/> (<vlc id="value" param1="pl.uri" />)<vlc id="end"/></a>
<form method="get" action=""> <vlc id="if" param1="pl.current" />
Move the item number </strong>
<input type="text" name="psz_pos" size="5" /> to <vlc id="end" />
<input type="text" name="psz_newpos" size="5" /> </li>
<input type="submit" name="control" value="move" /> <vlc id="else" />
</form> <li>
</td> <form method="get" action="">
</tr> <img alt="[-]" src="cone_minus.png" onclick='changeMe(this)'/>
</table> <vlc id="if" param1="first_item value 0 ="/>
</td> Playlist
</tr> <vlc id="rpn" param1="first_item 1 store" />
<tr> <vlc id="else"/>
<td> <vlc id="value" param1="pl.name" /> (<vlc id="value" param1="pl.i_children" /> item<vlc id="if" param1="pl.i_children 1 >" />s<vlc id="end" />)
<form method="get" action=""> <vlc id="end"/>
<table> <input type="hidden" name="item" value="<vlc id="value" param1="pl.index" />" />
<vlc id="rpn" param1="0"/> <input type="submit" name="control" value="sort" /> by
<vlc id="foreach" param1="pl" param2="playlist" /> <select name="type">
<tr class="<vlc id="if" param1="pl.index 2 % 0 =" />line1<vlc id="else" />line2<vlc id="end" />"> <option value="title">title</option>
<td> <option value="shuffle">shuffle</option>
<input type="checkbox" name="item" value="<vlc id="value" param1="pl.index" />"/> </select> with
<vlc id="if" param1="pl.current" /> <select name="order">
<strong> <option value="0">normal order</option>
<vlc id="end" /> <option value="1">reverse order</option>
<a href="?control=play&amp;item=<vlc id="value" param1="pl.index" />"> </select>
<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> </form>
<vlc id="if" param1="pl.current" />
</strong> <vlc id="if" param1="pl.i_children 0 !=" />
<vlc id="end" /> <ul>
</td> <vlc id="else" />
</tr> </li>
<vlc id="rpn" param1="1 +"/> <vlc id="end" />
<vlc id="end" />
<vlc id="if" param1="0 ="/> <vlc id="end" />
<tr class="ligne1">
<td>empty playlist</td> <vlc id="rpn" param1="last_depth pl.depth value store" />
</tr>
<vlc id="end"/> <vlc id="end" />
</table> <vlc id="rpn" param1="0 ':' last_depth value 1 - ':' 1 strcat strcat strcat strcat" />
<input type="submit" name="control" value="delete" /> <vlc id="foreach" param1="the_final_countdown" param2="integer" />
<input type="submit" name="control" value="keep" /> </ul></li>
</form> <vlc id="end" />
</td>
</tr> </ul>
</table> <input type="submit" name="control" value="delete" />
<input type="submit" name="control" value="empty" />
<input type="submit" name="control" value="keep" />
</form>
</div> </div>
</div> </div>
<!-- end main content --> <!-- end main content -->
<p style="text-align:center;font-size:1.2em;"> <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"> <script type="text/javascript">
got_time = <vlc id="value" param1="stream_time" />; got_time = <vlc id="value" param1="stream_time" />;
hours = Math.floor(got_time/ 3600); hours = Math.floor(got_time/ 3600);
minutes = Math.floor((got_time/60) % 60); minutes = Math.floor((got_time/60) % 60);
......
share/http/style.css
View file @ 9e8ed400
...@@ -88,3 +88,7 @@ form { ...@@ -88,3 +88,7 @@ form {
margin: 0pt; margin: 0pt;
padding: 0pt; padding: 0pt;
} }
ul#playlist, ul#playlist ul{
list-style-type: none;
}
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