Remove PLAYLIST_AUTOPLAY and use PLAYLIST_PLAY instead. Fix #1477

Signed-off-by: Rafaël Carré <funman@videolan.org>

include/vlc_common.h

@@ -200,7 +200,6 @@ typedef struct msg_subscription_t msg_subscription_t;
  */
 typedef enum {
     PLAYLIST_PLAY,      /**< No arg.                            res=can fail*/
-    PLAYLIST_AUTOPLAY,  /**< No arg.                            res=cant fail*/
     PLAYLIST_VIEWPLAY,  /**< arg1= playlist_item_t*,*/
                         /**  arg2 = playlist_item_t*          , res=can fail */
     PLAYLIST_PAUSE,     /**< No arg                             res=can fail*/

modules/gui/macosx/intf.m

@@ -553,7 +553,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     /* Check if we need to start playing */
     if( p_intf->b_play )
     {
-        playlist_Control( p_playlist, PLAYLIST_AUTOPLAY, VLC_FALSE );
+        playlist_Control( p_playlist, PLAYLIST_PLAY, VLC_FALSE );
     }
     var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
     val.b_bool = VLC_FALSE;

modules/gui/skins2/src/skin_main.cpp

@@ -262,7 +262,7 @@ static void Run( intf_thread_t *p_intf )
                                            FIND_ANYWHERE );
         if( p_playlist )
         {
-            playlist_Control( p_playlist, PLAYLIST_AUTOPLAY, VLC_FALSE );
+            playlist_Control( p_playlist, PLAYLIST_PLAY, VLC_FALSE );
             vlc_object_release( p_playlist );
         }
     }

src/playlist/control.c

@@ -122,14 +122,6 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args
         }
         break;
 
-    case PLAYLIST_AUTOPLAY:
-        // AUTOPLAY is an ugly hack for initial status.
-        // Hopefully it will disappear
-        p_playlist->status.i_status = PLAYLIST_RUNNING;
-        p_playlist->request.p_node = p_playlist->status.p_node;
-        p_playlist->request.b_request = VLC_FALSE;
-        break;
-
     case PLAYLIST_PAUSE:
         val.i_int = 0;
         if( p_playlist->p_input )