[vlc-commits] playlist: remove impossible code

Rémi Denis-Courmont git at videolan.org
Sun Mar 24 17:55:56 CET 2013


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Mar 24 18:55:17 2013 +0200| [8e3288f91773e1af0e82114850b282964b1a2bdc] | committer: Rémi Denis-Courmont

playlist: remove impossible code

Nothing calls vlc_object_kill() on the playlist.

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

 src/playlist/item.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 205cb16..e536ff5 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -451,8 +451,7 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input,
                        bool b_locked )
 {
     playlist_item_t *p_item;
-    /* FIXME: use b_killed instead: */
-    if( !vlc_object_alive(p_playlist) ) return VLC_EGENERIC;
+
     if( !pl_priv(p_playlist)->b_doing_ml )
         PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name,
                                              p_input->psz_uri );
@@ -494,10 +493,6 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist,
     assert( p_input );
     assert( p_parent && p_parent->i_children != -1 );
 
-    /* FIXME: use b_killed instead: */
-    if( !vlc_object_alive(p_playlist) )
-        return NULL;
-
     PL_LOCK_IF( !b_locked );
 
     p_item = playlist_ItemNewFromInput( p_playlist, p_input );



More information about the vlc-commits mailing list