* playlist improvements :

   * nodes can now be opened/closed
   * items can be deleted
   * shuffle, repeat and loop should work
 * add some comments to functions.js

diff --git a/share/http/functions.js b/share/http/functions.js
index ce34e8470f90226de381a763f4006481dee4d1aa..26ce8d7bf8567beca02b3cde733d327acaaff9ab 100644 (file)
--- a/share/http/functions.js
+++ b/share/http/functions.js
@@ -21,6 +21,15 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+/* global variables */
+
+old_time = 0;
+
+/**********************************************************************
+ * Misc utils
+ *********************************************************************/
+
+/* XMLHttpRequest wrapper */
 function loadXMLDoc( url, callback )
 {
   // branch for native XMLHttpRequest object
@@ -44,6 +53,7 @@ function loadXMLDoc( url, callback )
   }
 }
 
+/* fomat time in second as hh:mm:ss */
 function format_time( s )
 {
     hours = Math.floor(s/3600);
@@ -55,7 +65,135 @@ function format_time( s )
     return hours+":"+minutes+":"+seconds;
 }
 
+/* delete all a tag's children and add a text child node */
+function set_text( id, val )
+{
+    elt = document.getElementById( id );
+    while( elt.hasChildNodes() )
+        elt.removeChild( elt.firstChild );
+    elt.appendChild( document.createTextNode( val ) );
+}
+
+/* set item's 'element' attribute to value */
+function set_css( item, element, value )
+{
+    for( j = 0; j<document.styleSheets.length; j++ )
+    {
+        cssRules = document.styleSheets[j].cssRules;
+        for( i = 0; i<cssRules.length; i++)
+        {
+            if( cssRules[i].selectorText == item )
+            {
+                cssRules[i].style.setProperty( element, value, null );
+                return;
+            }
+        }
+    }
+}
+
+/* get item's 'element' attribute */
+function get_css( item, element )
+{
+    for( j = 0; j<document.styleSheets.length; j++ )
+    {
+        cssRules = document.styleSheets[j].cssRules;
+        for( i = 0; i<cssRules.length; i++)
+        {
+            if( cssRules[i].selectorText == item )
+            {
+                return cssRules[i].style.getPropertyValue( element );
+            }
+        }
+    }
+}
+
+function toggle_show( id )
+{
+    element = document.getElementById( id );
+    if( element.style.display == 'block' || element.style.display == '' )
+    {
+        element.style.display = 'none';
+    }
+    else
+    {
+        element.style.display = 'block';
+    }
+}
+function toggle_show_node( id )
+{
+    element = document.getElementById( 'pl_'+id );
+    img = document.getElementById( 'pl_img_'+id );
+    if( element.style.display == 'block' || element.style.display == '' )
+    {
+        element.style.display = 'none';
+        img.setAttribute( 'src', 'images/plus.png' );
+        img.setAttribute( 'alt', '[+]' );
+    }
+    else
+    {
+        element.style.display = 'block';
+        img.setAttribute( 'src', 'images/minus.png' );
+        img.setAttribute( 'alt', '[-]' );
+    }
+}
+
+function show( id ){ document.getElementById( id ).style.display = 'block'; }
+
+function hide( id ){ document.getElementById( id ).style.display = 'none'; }
+
+function checked( id ){ return document.getElementById( id ).checked; }
+
+function value( id ){ return document.getElementById( id ).value; }
+
+function radio_value( name )
+{
+    radio = document.getElementsByName( name );
+    for( i = 0; i<radio.length; i++ )
+    {
+        if( radio[i].checked )
+        {
+            return radio[i].value;
+        }
+    }
+    return "";
+}
+
+function check_and_replace_int( id, val )
+{
+    var objRegExp = /^\d\d*$/;
+    if( value( id ) != ''
+        && ( !objRegExp.test( value( id ) )
+             || parseInt( value( id ) ) < 1 ) )
+        document.getElementById( id ).value = val;
+}
 
+function addslashes( str ){ return str.replace(/\'/, '\\\''); }
+
+function disable( id ){ document.getElementById( id ).disabled = true; }
+
+function enable( id ){ document.getElementById( id ).disabled = false; }
+
+function button_over( element ){ element.style.border = "1px solid black"; }
+
+function button_out( element ){ element.style.border = "1px none black"; }
+
+/* toggle show help under the buttons */
+function toggle_btn_text()
+{
+    if( get_css( '.btn_text', 'display' ) == 'none' )
+    {
+        set_css( '.btn_text', 'display', 'block' );
+    }
+    else
+    {
+        set_css( '.btn_text', 'display', 'none' );
+    }
+}
+
+/**********************************************************************
+ * Interface actions
+ *********************************************************************/
+/* input actions */
 function in_play()
 {
     input_iesuxx = value('input_mrl');
@@ -74,6 +212,8 @@ function in_enqueue()
     loadXMLDoc( url, parse_status );
     setTimeout( 'update_playlist()', 1000 );
 }
+
+/* playlist actions */
 function pl_play( id )
 {
     loadXMLDoc( 'requests/status.xml?command=pl_play&id='+id, parse_status );
@@ -108,6 +248,27 @@ function pl_empty()
     loadXMLDoc( 'requests/status.xml?command=pl_empty', parse_status );
     setTimeout( 'update_playlist()', 1000 );
 }
+function pl_sort()
+{
+    /* FIXME */
+    loadXMLDoc( 'requests/status.xml?command=pl_sort', parse_status );
+    setTimeout( 'update_playlist()', 1000 );
+}
+function pl_shuffle()
+{
+    loadXMLDoc( 'requests/status.xml?command=pl_random', parse_status );
+    setTimeout( 'update_playlist()', 1000 );
+}
+function pl_loop()
+{
+    loadXMLDoc( 'requests/status.xml?command=pl_loop', parse_status );
+}
+function pl_repeat()
+{
+    loadXMLDoc( 'requests/status.xml?command=pl_repeat', parse_status );
+}
+
+/* misc actions */
 function volume_down()
 {
     loadXMLDoc( 'requests/status.xml?command=volume&val=-20', parse_status );
@@ -129,14 +290,10 @@ function update_playlist()
     loadXMLDoc( 'requests/playlist.xml', parse_playlist );
 }
 
-function set_text( id, val )
-{
-    elt = document.getElementById( id );
-    while( elt.hasChildNodes() )
-        elt.removeChild( elt.firstChild );
-    elt.appendChild( document.createTextNode( val ) );
-}
-
+/**********************************************************************
+ * Parse xml replies to XMLHttpRequests
+ *********************************************************************/
+/* parse request/status.xml */
 function parse_status()
 {
     if( req.readyState == 4 )
@@ -144,7 +301,11 @@ function parse_status()
         if( req.status == 200 )
         {
             status_iesuxx = req.responseXML.documentElement;
-            set_text( 'time', format_time( status_iesuxx.getElementsByTagName( 'time' )[0].firstChild.data ) );
+            new_time = status_iesuxx.getElementsByTagName( 'time' )[0].firstChild.data;
+            if( old_time > new_time )
+                setTimeout('update_playlist()',50);
+            old_time = new_time;
+            set_text( 'time', format_time( new_time ) );
             set_text( 'length', format_time( status_iesuxx.getElementsByTagName( 'length' )[0].firstChild.data ) );
             if( status_iesuxx.getElementsByTagName( 'volume' ).length != 0 )
             set_text( 'volume', Math.floor(status_iesuxx.getElementsByTagName( 'volume' )[0].firstChild.data/512)+'%' );
@@ -165,6 +326,7 @@ function parse_status()
     }
 }
 
+/* parse playlist.xml */
 function parse_playlist()
 {
     if( req.readyState == 4 )
@@ -173,7 +335,6 @@ function parse_playlist()
         {
             answer = req.responseXML.documentElement;
             playtree_iesuxx = document.getElementById( 'playtree' );
-            /* pos = playtree; */
             pos = document.createElement( "div" );
             pos_top = pos;
             elt = answer.firstChild;
@@ -181,14 +342,26 @@ function parse_playlist()
             {
                 if( elt.nodeName == "node" )
                 {
+                    if( pos.hasChildNodes() )
+                        pos.appendChild( document.createElement( "br" ) );
+                    pos.appendChild( document.createElement( 'a' ) );
+                    nda = pos.lastChild;
+                    nda.setAttribute( 'href', 'javascript:toggle_show_node(\''+elt.getAttribute( 'id' )+'\');' );
+                    nda.appendChild( document.createElement( 'img' ) );
+                    ndai = nda.lastChild;
+                    ndai.setAttribute( 'src', 'images/minus.png' );
+                    ndai.setAttribute( 'alt', '[-]' );
+                    ndai.setAttribute( 'id', 'pl_img_'+elt.getAttribute( 'id' ) );
+                    pos.appendChild( document.createTextNode( ' ' + elt.getAttribute( 'name' ) ) );
                     pos.appendChild( document.createElement( "div" ) );
-                    pos.lastChild.setAttribute( 'class', 'pl_node' );
-                    /*pos.lastChild.setAttribute( 'onclick', 'pl_play('+elt.getAttribute( 'id' )+');' );*/
-                    pos.lastChild.setAttribute( 'id', 'pl_'+elt.getAttribute( 'id' ) );
-                    pos.lastChild.appendChild( document.createTextNode( elt.getAttribute( 'name' ) ) );
+                    nd = pos.lastChild;
+                    nd.setAttribute( 'class', 'pl_node' );
+                    nd.setAttribute( 'id', 'pl_'+elt.getAttribute( 'id' ) );
                 }
                 else if( elt.nodeName == "leaf" )
                 {
+                    if( pos.hasChildNodes() )
+                    pos.appendChild( document.createElement( "br" ) );
                     pos.appendChild( document.createElement( "a" ) );
                     pl = pos.lastChild;
                     pl.setAttribute( 'class', 'pl_leaf' );
@@ -202,6 +375,14 @@ function parse_playlist()
                     }
                     pl.setAttribute( 'title', elt.getAttribute( 'uri' ));
                     pl.appendChild( document.createTextNode( elt.getAttribute( 'name' ) ) );
+                    pos.appendChild( document.createTextNode( ' ' ) );
+                    pos.appendChild( document.createElement( "a" ) );
+                    del = pos.lastChild;
+                    del.setAttribute( 'href', 'javascript:pl_delete('+elt.getAttribute( 'id' )+')' );
+                    del.appendChild( document.createElement( "img" ) );
+                    del = del.lastChild;
+                    del.setAttribute( 'src', 'images/delete_small.png' );
+                    del.setAttribute( 'alt', '(delete)' );
                 }
                 if( elt.firstChild )
                 {
@@ -230,86 +411,58 @@ function parse_playlist()
     }
 }
 
-function set_css( item, element, value )
+/* parse browse.xml */
+function parse_browse_dir( )
 {
-    for( j = 0; j<document.styleSheets.length; j++ )
+    if( req.readyState == 4 )
     {
-        cssRules = document.styleSheets[j].cssRules;
-        for( i = 0; i<cssRules.length; i++)
+        if( req.status == 200 )
         {
-            if( cssRules[i].selectorText == item )
+            answer = req.responseXML.documentElement;
+            browser_iesuxx = document.getElementById( 'browser' );
+            pos = document.createElement( "div" );
+            elt = answer.firstChild;
+            while( elt )
             {
-                cssRules[i].style.setProperty( element, value, null );
-                return;
+                if( elt.nodeName == "element" )
+                {
+                    pos.appendChild( document.createElement( "a" ) );
+                    pos.lastChild.setAttribute( 'class', 'browser' );
+                    if( elt.getAttribute( 'type' ) == 'directory' )
+                    {
+                        pos.lastChild.setAttribute( 'href', 'javascript:browse_dir(\''+addslashes(elt.getAttribute( 'path' ))+'\');');
+                    }
+                    else
+                    {
+                        pos.lastChild.setAttribute( 'href', 'javascript:browse_path(\''+addslashes(elt.getAttribute( 'path' ))+'\');' );
+                    }
+                    pos.lastChild.appendChild( document.createTextNode( elt.getAttribute( 'name' ) ) );
+                    if( elt.getAttribute( 'type' ) == 'directory' )
+                    {
+                        pos.appendChild( document.createTextNode( ' ' ) );
+                        pos.appendChild( document.createElement( "a" ) );
+                        pos.lastChild.setAttribute( 'class', 'browser' );
+                        pos.lastChild.setAttribute( 'href', 'javascript:browse_path(\''+addslashes(elt.getAttribute( 'path' ))+'\');');
+                        pos.lastChild.appendChild( document.createTextNode( '(select)' ) );
+                    }
+                    pos.appendChild( document.createElement( "br" ) );
+                }
+                elt = elt.nextSibling;
             }
+            while( browser_iesuxx.hasChildNodes() )
+                browser_iesuxx.removeChild( browser_iesuxx.firstChild );
+            browser_iesuxx.appendChild( pos );
         }
-    }
-}
-
-function get_css( item, element )
-{
-    for( j = 0; j<document.styleSheets.length; j++ )
-    {
-        cssRules = document.styleSheets[j].cssRules;
-        for( i = 0; i<cssRules.length; i++)
+        else
         {
-            if( cssRules[i].selectorText == item )
-            {
-                return cssRules[i].style.getPropertyValue( element );
-            }
+            /*alert( 'Error! HTTP server replied: ' + req.status );*/
         }
     }
 }
 
-function toggle_btn_text()
-{
-    if( get_css( '.btn_text', 'display' ) == 'none' )
-    {
-        set_css( '.btn_text', 'display', 'block' );
-    }
-    else
-    {
-        set_css( '.btn_text', 'display', 'none' );
-    }
-}
-
-function toggle_show_sout_helper()
-{
-    element = document.getElementById( "sout_helper" );
-        if( element.style.display == 'block' )
-    {
-        element.style.display = 'none';
-        document.getElementById( "sout_helper_toggle" ).value = 'Full sout interface';
-    }
-    else
-    {
-        element.style.display = 'block';
-        document.getElementById( "sout_helper_toggle" ).value = 'Hide sout interface';
-    }
-}
-
-function toggle_show( id )
-{
-    element = document.getElementById( id );
-    if( element.style.display == 'block' || element.style.display == '' )
-    {
-        element.style.display = 'none';
-    }
-    else
-    {
-        element.style.display = 'block';
-    }
-}
-
-function show( id )
-{
-    document.getElementById( id ).style.display = 'block';
-}
-function hide( id )
-{
-    document.getElementById( id ).style.display = 'none';
-}
-
+/**********************************************************************
+ * Input dialog functions
+ *********************************************************************/
 function hide_input( )
 {
     document.getElementById( 'input_file' ).style.display = 'none';
@@ -317,61 +470,6 @@ function hide_input( )
     document.getElementById( 'input_network' ).style.display = 'none';
 }
 
-function checked( id )
-{
-    return document.getElementById( id ).checked;
-}
-function value( id )
-{
-    return document.getElementById( id ).value;
-}
-function radio_value( name )
-{
-    radio = document.getElementsByName( name );
-    for( i = 0; i<radio.length; i++ )
-    {
-        if( radio[i].checked )
-        {
-            return radio[i].value;
-        }
-    }
-    return "";
-}
-function disable( id )
-{/* FIXME */
-    return document.getElementById( id ).value;
-}
-
-function check_and_replace_int( id, val )
-{
-    var objRegExp = /^\d\d*$/;
-    if( value( id ) != ''
-        && ( !objRegExp.test( value( id ) )
-             || parseInt( value( id ) ) < 1 ) )
-        document.getElementById( id ).value = val;
-
-}
-
-function disable( id )
-{
-    document.getElementById( id ).disabled = true;
-}
-
-function enable( id )
-{
-    document.getElementById( id ).disabled = false;
-}
-
-function button_over( element )
-{
-    element.style.border = "1px solid black";
-}
-
-function button_out( element )
-{
-    element.style.border = "1px none black";
-}
-
 /* update the input MRL using data from the input file helper */
 /* FIXME ... subs support */
 function update_input_file()
@@ -484,6 +582,25 @@ function update_input_net()
         mrl.value += " :access-filter=timeshift";
 }
 
+/**********************************************************************
+ * Sout dialog functions
+ *********************************************************************/
+/* toggle show the full sout interface */
+function toggle_show_sout_helper()
+{
+    element = document.getElementById( "sout_helper" );
+        if( element.style.display == 'block' )
+    {
+        element.style.display = 'none';
+        document.getElementById( "sout_helper_toggle" ).value = 'Full sout interface';
+    }
+    else
+    {
+        element.style.display = 'block';
+        document.getElementById( "sout_helper_toggle" ).value = 'Hide sout interface';
+    }
+}
+
 /* update the sout MRL using data from the sout_helper */
 function update_sout()
 {
@@ -644,27 +761,16 @@ function reset_sout()
     document.getElementById('sout_mrl').value = value('sout_old_mrl');
 }
 
+/* save sout mrl value */
 function save_sout()
 {
     document.getElementById('sout_old_mrl').value = value('sout_mrl');
 }
 
-function loop_refresh_status()
-{
-    setTimeout( 'loop_refresh_status()', 1000 );
-    update_status();
-}
-function loop_refresh_playlist()
-{
- /*   setTimeout( 'loop_refresh_playlist()', 10000 ); */
-    update_playlist();
-}
-function loop_refresh()
-{
-    setTimeout('loop_refresh_status()',0);
-    setTimeout('loop_refresh_playlist()',0);
-}
-
+/**********************************************************************
+ * Browser dialog functions
+ *********************************************************************/
+/* only browse() should be called directly */
 function browse( dest )
 {
     document.getElementById( 'browse_dest' ).value = dest;
@@ -682,50 +788,23 @@ function browse_path( p )
     hide( 'browse' );
     document.getElementById( document.getElementById( 'browse_dest' ).value ).focus();
 }
-function parse_browse_dir( )
+
+/**********************************************************************
+ * Periodically update stuff in the interface
+ *********************************************************************/
+function loop_refresh_status()
 {
-    if( req.readyState == 4 )
-    {
-        if( req.status == 200 )
-        {
-            answer = req.responseXML.documentElement;
-            browser_iesuxx = document.getElementById( 'browser' );
-            pos = document.createElement( "div" );
-            elt = answer.firstChild;
-            while( elt )
-            {
-                if( elt.nodeName == "element" )
-                {
-                    pos.appendChild( document.createElement( "a" ) );
-                    pos.lastChild.setAttribute( 'class', 'browser' );
-                    if( elt.getAttribute( 'type' ) == 'directory' )
-                    {
-                        pos.lastChild.setAttribute( 'href', 'javascript:browse_dir(\''+elt.getAttribute( 'path' )+'\');');
-                    }
-                    else
-                    {
-                        pos.lastChild.setAttribute( 'href', 'javascript:browse_path(\''+elt.getAttribute( 'path' )+'\');' );
-                    }
-                    pos.lastChild.appendChild( document.createTextNode( elt.getAttribute( 'name' ) ) );
-                    if( elt.getAttribute( 'type' ) == 'directory' )
-                    {
-                        pos.appendChild( document.createTextNode( ' ' ) );
-                        pos.appendChild( document.createElement( "a" ) );
-                        pos.lastChild.setAttribute( 'class', 'browser' );
-                        pos.lastChild.setAttribute( 'href', 'javascript:browse_path(\''+elt.getAttribute( 'path' )+'\');');
-                        pos.lastChild.appendChild( document.createTextNode( '(select)' ) );
-                    }
-                    pos.appendChild( document.createElement( "br" ) );
-                }
-                elt = elt.nextSibling;
-            }
-            while( browser_iesuxx.hasChildNodes() )
-                browser_iesuxx.removeChild( browser_iesuxx.firstChild );
-            browser_iesuxx.appendChild( pos );
-        }
-        else
-        {
-            /*alert( 'Error! HTTP server replied: ' + req.status );*/
-        }
-    }
+    setTimeout( 'loop_refresh_status()', 1000 );
+    update_status();
 }
+function loop_refresh_playlist()
+{
+ /*   setTimeout( 'loop_refresh_playlist()', 10000 ); */
+    update_playlist();
+}
+function loop_refresh()
+{
+    setTimeout('loop_refresh_status()',0);
+    setTimeout('loop_refresh_playlist()',0);
+}
+

diff --git a/share/http/images/delete_small.png b/share/http/images/delete_small.png
new file mode 100644 (file)
index 0000000..43287f6
Binary files /dev/null and b/share/http/images/delete_small.png differ

diff --git a/share/http/index.html b/share/http/index.html
index 8fcede88305811b011c8b68d89b6b83970c06d6b..977029ed6488801217b13cf5e99812d351a8ab6c 100644 (file)
--- a/share/http/index.html
+++ b/share/http/index.html
@@ -559,29 +559,29 @@
     Playlist
   </div>
   <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" />
       <span class="btn_text">Delete</span>
-    </button>
+    </button>-->
     <button id="btn_empty" onclick="pl_empty();" onmouseover="button_over(this);" onmouseout="button_out(this);">
       <img src="images/empty.png" alt="Empty" />
       <span class="btn_text">Empty</span>
     </button>
     &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" />
       <span class="btn_text">Sort</span>
     </button>
     &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" />
       <span class="btn_text">Shuffle</span>
     </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" />
       <span class="btn_text">Loop</span>
     </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" />
       <span class="btn_text">Repeat</span>
     </button>

diff --git a/share/http/requests/browse.xml b/share/http/requests/browse.xml
index f2ee09c4e2d695ea5b93d1dd1d3b2ffe3efbda8a..0f00971c75f0b5fa731df182935cb6d6ed6ec1e6 100644 (file)
--- a/share/http/requests/browse.xml
+++ b/share/http/requests/browse.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<vlc id="if" param1="0"/>
 <!--  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
 <  status.xml: VLC media player web interface
 < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
@@ -21,6 +22,7 @@
 <  along with this program; if not, write to the Free Software
 <  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<vlc id="end" />
 
 <root>
 <vlc id="if" param1="url_param 1 =" />

diff --git a/share/http/requests/playlist.xml b/share/http/requests/playlist.xml
index b133bf82af8c29687a7b1a8117d2a065c90688e3..59ecc32c1ca3ad17c6fb12f4966faf9b2953991c 100644 (file)
--- a/share/http/requests/playlist.xml
+++ b/share/http/requests/playlist.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<vlc id="if" param1="0"/>
 <!--  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
 <  playlist.xml: VLC media player web interface
 < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
@@ -21,6 +22,7 @@
 <  along with this program; if not, write to the Free Software
 <  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="last_depth 0 store" />

diff --git a/share/http/requests/status.xml b/share/http/requests/status.xml
index 66697fe629f212f3c2730f9278aa80352fe1096d..5f3c9cbe9b21b80c6152db71c287068fe769945d 100644 (file)
--- a/share/http/requests/status.xml
+++ b/share/http/requests/status.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<vlc id="if" param1="0"/>
 <!--  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
 <  status.xml: VLC media player web interface
 < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
@@ -21,7 +22,7 @@
 <  along with this program; if not, write to the Free Software
 <  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
+<vlc id="end"/>
 <vlc id="if" param1="url_param 1 =" />
   <vlc id="rpn" param1="input 'input' url_extract store" />
   <vlc id="rpn" param1="command 'command' url_extract store" />
@@ -60,6 +61,18 @@
   <vlc id="if" param1="command value 'pl_empty' strcmp 0 =" />
     <vlc id="rpn" param1="playlist_empty" />
   <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 -->
   <vlc id="if" param1="command value 'fullscreen' strcmp 0 =" />
@@ -76,4 +89,7 @@
   <time><vlc id="value" param1="stream_time" /></time>
   <state><vlc id="value" param1="stream_state" /></state>
   <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>

diff --git a/share/http/style.css b/share/http/style.css
index 689344f7fecc4ee0105e985e466323178f8f3d54..82a8c8f01ac584643b5603d5be7e6034218dfb5f 100644 (file)
--- a/share/http/style.css
+++ b/share/http/style.css
@@ -103,18 +103,18 @@ ul#list, ul#list ul {
        padding-left: 1em;
 }
 
-div.pl_node, a.pl_leaf {
-       padding-left: 20px;
-}
 div.pl_node {
+       padding-left: 20px;
        font-style: italic;
 }
 a.pl_leaf {
        font-style: normal;
-       display: block;
 }
 a.pl_leaf:hover {
-       background-color: #ffd;
+       color: #f00;
+}
+img {
+       border: 0px none black;
 }
 
 div#browse {