[vlc-devel] commit: Attach playlist ASAP ( Rémi Denis-Courmont )

git version control git at videolan.org
Thu Jan 28 17:57:32 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jan 28 18:54:44 2010 +0200| [f6f1fa0be95ac9bbce70760fa8f87f3396944407] | committer: Rémi Denis-Courmont 

Attach playlist ASAP

vlc_object_find is not used for the playlist anymore, so this is OK.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f6f1fa0be95ac9bbce70760fa8f87f3396944407
---

 src/libvlc.c          |    1 -
 src/playlist/engine.c |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/libvlc.c b/src/libvlc.c
index 34926ae..1020384 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -813,7 +813,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
         return VLC_EGENERIC;
     }
     playlist_Activate( p_playlist );
-    vlc_object_attach( p_playlist, p_libvlc );
 
     /* Add service discovery modules */
     psz_modules = var_CreateGetNonEmptyString( p_playlist, "services-discovery" );
diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 6dab8e7..7ac8407 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -76,6 +76,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
 
     assert( offsetof( playlist_private_t, public_data ) == 0 );
     p_playlist = &p->public_data;
+    vlc_object_attach( p_playlist, p_parent );
     TAB_INIT( pl_priv(p_playlist)->i_sds, pl_priv(p_playlist)->pp_sds );
 
     libvlc_priv(p_parent->p_libvlc)->p_playlist = p_playlist;




More information about the vlc-devel mailing list