If passed ?control=play without any item, just ask playlist to play

diff --git a/modules/control/http/macro.c b/modules/control/http/macro.c
index 9389e87a6e15fa3645fc78b5fcd2b0f5dffe23f9..7d3764e9f7120cddf0d6498786e26b4a3192453f 100644 (file)
--- a/modules/control/http/macro.c
+++ b/modules/control/http/macro.c
@@ -188,6 +188,13 @@ void MacroDo( httpd_file_sys_t *p_args,
 
                     E_(ExtractURIValue)( p_request, "item", item, 512 );
                     i_item = atoi( item );
+                    /* id = 0 : simply ask playlist to play */
+                    if( i_item == 0 )
+                    {
+                        playlist_Play( p_sys->p_playlist );
+                        msg_Dbg( p_intf, "requested playlist play" );
+                        break;
+                    }
                     playlist_Control( p_sys->p_playlist, PLAYLIST_ITEMPLAY,
                                       playlist_ItemGetById( p_sys->p_playlist,
                                       i_item ) );

diff --git a/modules/control/http/rpn.c b/modules/control/http/rpn.c
index bd9164d27d5182c6f927b92d907a7fe39dfb6644..b5c840ec015b10a24c2d4d21724500b2ee66161c 100644 (file)
--- a/modules/control/http/rpn.c
+++ b/modules/control/http/rpn.c
@@ -314,8 +314,8 @@ void  EvaluateRPN( intf_thread_t *p_intf, mvar_t  *vars,
             char value[512];
             char *tmp;
 
-            E_(uri_extract_value)( url, name, value, 512 );
-            E_(uri_decode_url_encoded)( value );
+            E_(ExtractURIValue)( url, name, value, 512 );
+            E_(DecodeEncodedURI)( value );
             tmp = E_(FromUTF8)( p_intf, value );
             SSPush( st, tmp );
             free( tmp );
@@ -577,7 +577,7 @@ void  EvaluateRPN( intf_thread_t *p_intf, mvar_t  *vars,
         else if( !strcmp( s, "vlc_seek" ) )
         {
             char *psz_value = SSPop( st );
-            E_(Seek)( p_intf, psz_value );
+            E_(HandleSeek)( p_intf, psz_value );
             msg_Dbg( p_intf, "requested playlist seek: %s", psz_value );
             free( psz_value );
         }