Remove PLAYLIST_AUTOPLAY and use PLAYLIST_PLAY instead. Fix #1477

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

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 5b0452707bb36319f521f8d327cc2145fcc7d7f8..bc179a0f4b075ea753cd43ce0f1009c8f97733e1 100644 (file)
--- a/include/vlc_common.h
+++ b/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*/

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 18381cb43173397796c6e05d2e64c165f5ad65d4..9d87106c8d9b9b008988e7e04c6227c889c4b076 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/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;

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index 017f885af7f8dd7320bddf5ffd9a79f685e25699..f9072e5a6b1363f95d6b48cd131eff72efd9f704 100644 (file)
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/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 );
         }
     }

diff --git a/src/playlist/control.c b/src/playlist/control.c
index 3ff414102bf41d26ffdeeffafce9868499fee1db..70ccf5a7bab7d1ba1cf18bf236f0d249e9a21ca7 100644 (file)
--- a/src/playlist/control.c
+++ b/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 )