For consistency, remove references to vlc from libvlc

[vlc] / src / playlist / engine.c

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 10d9500d6c88bf9865042d8e40bf384031e0feb5..5a9c6694f5d57c0d367734eac0bd350fc6e269ab 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -27,6 +27,7 @@
 #include <vlc/input.h>
 #include "vlc_playlist.h"
 #include "vlc_interaction.h"
+#include "playlist_internal.h"
 
 /*****************************************************************************
  * Local prototypes
@@ -81,6 +82,8 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
     p_playlist->b_always_tree = (i_tree == 1);
     p_playlist->b_never_tree = (i_tree == 2);
 
+    p_playlist->b_doing_ml = VLC_FALSE;
+
     p_playlist->p_root_category = playlist_NodeCreate( p_playlist, NULL, NULL);
     p_playlist->p_root_onelevel = playlist_NodeCreate( p_playlist, NULL, NULL);
 
@@ -106,6 +109,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
         p_playlist->p_ml_onelevel->i_flags |= PLAYLIST_RO_FLAG;
         p_playlist->p_ml_onelevel->p_input->i_id =
              p_playlist->p_ml_category->p_input->i_id;
+
     }
     else
     {
@@ -114,7 +118,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
 
     /* Initial status */
     p_playlist->status.p_item = NULL;
-    p_playlist->status.p_node = p_playlist->p_root_onelevel;
+    p_playlist->status.p_node = p_playlist->p_local_onelevel;
     p_playlist->request.b_request = VLC_FALSE;
     p_playlist->status.i_status = PLAYLIST_STOPPED;
 
@@ -122,6 +126,8 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
     p_playlist->i_order = ORDER_NORMAL;
 
     vlc_object_attach( p_playlist, p_parent );
+
+    playlist_MLLoad( p_playlist );
     return p_playlist;
 }
 
@@ -132,6 +138,9 @@ void playlist_Destroy( playlist_t *p_playlist )
         playlist_ServicesDiscoveryRemove( p_playlist,
                                           p_playlist->pp_sds[0]->psz_module );
     }
+
+    playlist_MLDump( p_playlist );
+
     vlc_thread_join( p_playlist->p_preparse );
     vlc_thread_join( p_playlist );
 
@@ -324,7 +333,7 @@ void playlist_MainLoop( playlist_t *p_playlist )
                 if( b_playexit == VLC_TRUE )
                 {
                     msg_Info( p_playlist, "end of playlist, exiting" );
-                    p_playlist->p_vlc->b_die = VLC_TRUE;
+                    p_playlist->p_libvlc->b_die = VLC_TRUE;
                 }
                 p_playlist->status.i_status = PLAYLIST_STOPPED;
                 PL_UNLOCK