* configure.ac: -> 0.7.2-cvs

 * modules/control/http.c: added a playlist.uri field.

configure.ac

 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.188 2004/03/03 13:24:31 fenrir Exp $
+dnl $Id: configure.ac,v 1.189 2004/03/03 14:22:47 fenrir Exp $
 
-AC_INIT(vlc,0.7.1)
+AC_INIT(vlc,0.7.2-cvs)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Bond"
@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.7.1)
+AM_INIT_AUTOMAKE(vlc,0.7.2-cvs)
 AM_CONFIG_HEADER(config.h)
 
 dnl

doc/intf-http.txt

@@ -324,7 +324,8 @@ variable will be displayed (instead of it name).
             - current : 1 if currently selected else 0
             - index   : the index value (to be used for example for the 
                         "delete" control command.
-            - name
+            - name    : the name of the item (it is equal to uri most of the time).
+            - uri     : the URI of the item
             - group   : the group number
 
         - "informations"  : Create informations for  the current playing

modules/control/http.c

@@ -2,7 +2,7 @@
  * http.c :  http mini-server ;)
  *****************************************************************************
  * Copyright (C) 2001-2004 VideoLAN
- * $Id: http.c,v 1.54 2004/03/03 13:26:50 fenrir Exp $
+ * $Id: http.c,v 1.55 2004/03/03 14:22:47 fenrir Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -843,6 +843,8 @@ static mvar_t *mvar_PlaylistSetNew( char *name, playlist_t *p_pl )
 
         mvar_AppendNewVar( itm, "name", p_pl->pp_items[i]->psz_name );
 
+        mvar_AppendNewVar( itm, "uri", p_pl->pp_items[i]->psz_uri );
+
         sprintf( value, "%d", p_pl->pp_items[i]->i_group );
         mvar_AppendNewVar( itm, "group", value );
 

share/http/index.html

@@ -113,7 +113,8 @@
                   <vlc id="if" param1="pl.current" />
                   <b>
                   <vlc id="end" />
-                  <a href="?control=play&amp;item=<vlc id="value" param1="pl.index" />"><vlc id="value" param1="pl.index" /> - <vlc id="value" param1="pl.name" /></a>
+                  <a href="?control=play&amp;item=<vlc id="value" param1="pl.index" />">
+                  <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>
                   <vlc id="if" param1="pl.current" />
                   </b>
                   <vlc id="end" />