* do not set request on startup, we don't want autoplay

[vlc] / src / playlist / playlist.c

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 7f5774c8a2e409fa2cad86a64fb80d626df49ea7..dcb9e46db3a2ab1de54e098456f24f35e71eaae1 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -306,6 +306,12 @@ int playlist_vaControl( playlist_t * p_playlist, int i_query, va_list args )
         p_playlist->request.i_goto = -1;
         break;
 
+    case PLAYLIST_AUTOPLAY:
+        p_playlist->status.i_status = PLAYLIST_RUNNING;
+
+        p_playlist->request.b_request = VLC_FALSE;
+        break;
+
     case PLAYLIST_PAUSE:
         val.i_int = 0;
         if( p_playlist->p_input )
@@ -357,6 +363,7 @@ int playlist_vaControl( playlist_t * p_playlist, int i_query, va_list args )
     }
 
     vlc_mutex_unlock( &p_playlist->object_lock );
+    fprintf(stderr,"control done, request is %i\n", p_playlist->request.b_request);
     return VLC_SUCCESS;
 }
 
@@ -817,6 +824,10 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
             {
                 p_playlist->i_index++;
                 p_new = p_playlist->pp_items[p_playlist->i_index];
+                if( !(p_new->i_flags & PLAYLIST_SKIP_FLAG) )
+                {
+                    return NULL;
+                }
             }
             else
             {
@@ -914,6 +925,9 @@ static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
     p_item->i_nb_played++;
     p_playlist->status.p_item = p_item;
 
+    p_playlist->i_index = playlist_GetPositionById( p_playlist,
+                                                    p_item->input.i_id );
+
 #ifdef PLAYLIST_PROFILE
     if( p_playlist->request_date != 0 )
     {