Commit 212f8afc authored by Antoine Cellerier's avatar Antoine Cellerier

* playlist improvements :

   * nodes can now be opened/closed
   * items can be deleted
   * shuffle, repeat and loop should work
 * add some comments to functions.js
parent 234ce239
This diff is collapsed.
...@@ -559,29 +559,29 @@ ...@@ -559,29 +559,29 @@
Playlist Playlist
</div> </div>
<div class="controls"> <div class="controls">
<button id="btn_delete" onmouseover="button_over(this);" onmouseout="button_out(this);"> <!--<button id="btn_delete" onmouseover="button_over(this);" onmouseout="button_out(this);">
<img src="images/delete.png" alt="Delete" /> <img src="images/delete.png" alt="Delete" />
<span class="btn_text">Delete</span> <span class="btn_text">Delete</span>
</button> </button>-->
<button id="btn_empty" onclick="pl_empty();" onmouseover="button_over(this);" onmouseout="button_out(this);"> <button id="btn_empty" onclick="pl_empty();" onmouseover="button_over(this);" onmouseout="button_out(this);">
<img src="images/empty.png" alt="Empty" /> <img src="images/empty.png" alt="Empty" />
<span class="btn_text">Empty</span> <span class="btn_text">Empty</span>
</button> </button>
&nbsp; &nbsp;
<button id="btn_sort" onmouseover="button_over(this);" onmouseout="button_out(this);"> <button id="btn_sort" onclick="pl_sort();" onmouseover="button_over(this);" onmouseout="button_out(this);">
<img src="images/sort.png" alt="Sort" /> <img src="images/sort.png" alt="Sort" />
<span class="btn_text">Sort</span> <span class="btn_text">Sort</span>
</button> </button>
&nbsp; &nbsp;
<button id="btn_shuffle" onmouseover="button_over(this);" onmouseout="button_out(this);"> <button id="btn_shuffle" onclick="pl_shuffle();" onmouseover="button_over(this);" onmouseout="button_out(this);">
<img src="images/shuffle.png" alt="Shuffle" /> <img src="images/shuffle.png" alt="Shuffle" />
<span class="btn_text">Shuffle</span> <span class="btn_text">Shuffle</span>
</button> </button>
<button id="btn_loop" onmouseover="button_over(this);" onmouseout="button_out(this);"> <button id="btn_loop" onclick="pl_loop();" onmouseover="button_over(this);" onmouseout="button_out(this);">
<img src="images/loop.png" alt="Loop" /> <img src="images/loop.png" alt="Loop" />
<span class="btn_text">Loop</span> <span class="btn_text">Loop</span>
</button> </button>
<button id="btn_repeat" onmouseover="button_over(this);" onmouseout="button_out(this);"> <button id="btn_repeat" onclick="pl_repeat();" onmouseover="button_over(this);" onmouseout="button_out(this);">
<img src="images/repeat.png" alt="Repeat" /> <img src="images/repeat.png" alt="Repeat" />
<span class="btn_text">Repeat</span> <span class="btn_text">Repeat</span>
</button> </button>
......
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<vlc id="if" param1="0"/>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
< status.xml: VLC media player web interface < status.xml: VLC media player web interface
< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
...@@ -21,6 +22,7 @@ ...@@ -21,6 +22,7 @@
< along with this program; if not, write to the Free Software < along with this program; if not, write to the Free Software
< Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. < Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<vlc id="end" />
<root> <root>
<vlc id="if" param1="url_param 1 =" /> <vlc id="if" param1="url_param 1 =" />
......
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<vlc id="if" param1="0"/>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
< playlist.xml: VLC media player web interface < playlist.xml: VLC media player web interface
< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
...@@ -21,6 +22,7 @@ ...@@ -21,6 +22,7 @@
< along with this program; if not, write to the Free Software < along with this program; if not, write to the Free Software
< Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. < Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<vlc id="end"/>
<vlc id="rpn" param1="first_item 0 store" /> <vlc id="rpn" param1="first_item 0 store" />
<vlc id="rpn" param1="last_depth 0 store" /> <vlc id="rpn" param1="last_depth 0 store" />
......
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<vlc id="if" param1="0"/>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
< status.xml: VLC media player web interface < status.xml: VLC media player web interface
< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
< along with this program; if not, write to the Free Software < along with this program; if not, write to the Free Software
< Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. < Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<vlc id="end"/>
<vlc id="if" param1="url_param 1 =" /> <vlc id="if" param1="url_param 1 =" />
<vlc id="rpn" param1="input 'input' url_extract store" /> <vlc id="rpn" param1="input 'input' url_extract store" />
<vlc id="rpn" param1="command 'command' url_extract store" /> <vlc id="rpn" param1="command 'command' url_extract store" />
...@@ -60,6 +61,18 @@ ...@@ -60,6 +61,18 @@
<vlc id="if" param1="command value 'pl_empty' strcmp 0 =" /> <vlc id="if" param1="command value 'pl_empty' strcmp 0 =" />
<vlc id="rpn" param1="playlist_empty" /> <vlc id="rpn" param1="playlist_empty" />
<vlc id="end" /> <vlc id="end" />
<vlc id="if" param1="command value 'pl_sort' strcmp 0 =" />
<vlc id="rpn" param1="" /> <!-- FIXME -->
<vlc id="end" />
<vlc id="if" param1="command value 'pl_random' strcmp 0 =" />
<vlc id="rpn" param1="'random' 'VLC_OBJECT_PLAYLIST' vlc_var_get ! 'random' 'VLC_OBJECT_PLAYLIST' vlc_var_set" />
<vlc id="end" />
<vlc id="if" param1="command value 'pl_loop' strcmp 0 =" />
<vlc id="rpn" param1="'loop' 'VLC_OBJECT_PLAYLIST' vlc_var_get ! 'loop' 'VLC_OBJECT_PLAYLIST' vlc_var_set" />
<vlc id="end" />
<vlc id="if" param1="command value 'pl_repeat' strcmp 0 =" />
<vlc id="rpn" param1="'repeat' 'VLC_OBJECT_PLAYLIST' vlc_var_get 1 + 2 % 'repeat' 'VLC_OBJECT_PLAYLIST' vlc_var_set" />
<vlc id="end" />
<!-- misc commands --> <!-- misc commands -->
<vlc id="if" param1="command value 'fullscreen' strcmp 0 =" /> <vlc id="if" param1="command value 'fullscreen' strcmp 0 =" />
...@@ -76,4 +89,7 @@ ...@@ -76,4 +89,7 @@
<time><vlc id="value" param1="stream_time" /></time> <time><vlc id="value" param1="stream_time" /></time>
<state><vlc id="value" param1="stream_state" /></state> <state><vlc id="value" param1="stream_state" /></state>
<position><vlc id="value" param1="stream_position" /></position> <position><vlc id="value" param1="stream_position" /></position>
<fullscreen><vlc id="value" param1="'fullscreen' 'VLC_OBJECT_VOUT' vlc_var_get" /></fullscreen>
<loop><vlc id="value" param1="'loop' 'VLC_OBJECT_PLAYLIST' vlc_var_get"/></loop>
<repeat><vlc id="value" param1="'repeat' 'VLC_OBJECT_PLAYLIST' vlc_var_get" /></repeat>
</root> </root>
...@@ -103,18 +103,18 @@ ul#list, ul#list ul { ...@@ -103,18 +103,18 @@ ul#list, ul#list ul {
padding-left: 1em; padding-left: 1em;
} }
div.pl_node, a.pl_leaf {
padding-left: 20px;
}
div.pl_node { div.pl_node {
padding-left: 20px;
font-style: italic; font-style: italic;
} }
a.pl_leaf { a.pl_leaf {
font-style: normal; font-style: normal;
display: block;
} }
a.pl_leaf:hover { a.pl_leaf:hover {
background-color: #ffd; color: #f00;
}
img {
border: 0px none black;
} }
div#browse { div#browse {
......
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