Skip to content

V
vlc-gpu
Commit ddc09dc6 authored by Yoann Peronneau's avatar Yoann Peronneau
Browse files
Options

* 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
parent fcb440b4
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 6 deletions
modules/control/http.c
View file @ ddc09dc6
...@@ -1317,10 +1317,17 @@ static mvar_t *mvar_VlmSetNew( char *name, vlm_t *vlm ) ...@@ -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 ); */ /* fprintf( stderr, " child=%s [%d]\n", ch->psz_name, ch->i_child ); */
for( c = 0; c < ch->i_child; c++ ) 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 ); mvar_AppendVar( set, n );
} }
......
share/http/vlm/index.html
View file @ ddc09dc6
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</head> </head>
<body> <body>
<h2> <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="sectitle">VLM - Configuration</div>
<div class="section"> <div class="section">
...@@ -68,7 +68,9 @@ ...@@ -68,7 +68,9 @@
<table> <table>
<tr> <tr>
<td> <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>
<td align="right"> <td align="right">
<form method="get" action="" /> <form method="get" action="" />
......
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