* modules/control/http.c: elements are now one level more recursive (if needed)

* share/http/vlm/index.html: we now display the state of media instances

* modules/control/http.c: elements are now one level more recursive (if needed)
* share/http/vlm/index.html: we now display the state of media instances
ddc09dc6 · Yoann Peronneau · fcb440b4 · ddc09dc6 · ddc09dc6
Commit ddc09dc6 authored Mar 04, 2005 by Yoann Peronneau
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 6 deletions

modules/control/http.c modules/control/http.c +11 -4

share/http/vlm/index.html share/http/vlm/index.html +4 -2

No files found.
--- a/modules/control/http.c
+++ b/modules/control/http.c
@@ -1317,10 +1317,17 @@ static mvar_t *mvar_VlmSetNew( char *name, vlm_t *vlm )
                    /* fprintf( stderr, "        child=%s [%d]\n", ch->psz_name, ch->i_child ); */
                    for( c = 0; c < ch->i_child; c++ )
                    {
-                        mvar_t *in = mvar_New( ch->psz_name, ch->child[c]->psz_name );
+                        if( ch->child[c]->psz_value )
-                        mvar_AppendVar( n, in );
+                        {
+                            mvar_AppendNewVar( n, ch->child[c]->psz_name, ch->child[c]->psz_value );
-                        /* fprintf( stderr, "            sub=%s\n", ch->child[c]->psz_name );*/
+                            /* fprintf( stderr, "            sub=%s->%s\n", ch->child[c]->psz_name, ch->child[c]->psz_value ); */
+                        }
+                        else
+                        {
+                            mvar_t *in = mvar_New( ch->psz_name, ch->child[c]->psz_name );
+                            mvar_AppendVar( n, in );
+                            /* fprintf( stderr, "            sub=%s\n", ch->child[c]->psz_name ); */
+                        }
                    }
                    mvar_AppendVar( set, n );
                }

--- a/share/http/vlm/index.html
+++ b/share/http/vlm/index.html
@@ -14,7 +14,7 @@
 </head>
 <body>
    <h2>
-     <a href="http://www.videolan.org/">VLC media player<vlc id="value" param1="version" /></a> (http interface)</h2>
+     <a href="http://www.videolan.org/">VLC media player <vlc id="value" param1="version" /></a> (http interface)</h2>
    <div class="sectitle">VLM - Configuration</div>
    <div class="section">
@@ -68,7 +68,9 @@
       <table>
        <tr>
         <td>
-          <vlc id="value" param1="el.state" />
+          <vlc id="foreach" param1="instance" param2="el.instances" />
+           <vlc id="value" param1="instance" />
+          <vlc id="end" />
         </td>
         <td align="right">
          <form method="get" action="" />