playlist: remove unsynchronized b_doing_ml

This could loose events and was theoretically undefined.

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index ca342a955152f994f78f73da3808e91083b3e1f2..00bfb610c5229f1ab7c9c199bc3a9a6cc96460af 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -229,8 +229,6 @@ playlist_t *playlist_Create( vlc_object_t *p_parent )
 
     pl_priv(p_playlist)->b_tree = var_InheritBool( p_parent, "playlist-tree" );
 
-    pl_priv(p_playlist)->b_doing_ml = false;
-
     /* Create the root node */
     PL_LOCK;
     p_playlist->p_root = playlist_NodeCreate( p_playlist, NULL, NULL,

diff --git a/src/playlist/item.c b/src/playlist/item.c
index eafc79e0196751b3cd57b5457cc5ca7a3f458e01..e51637f16f4964f192091bcf8c3f89746f16f446 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -450,10 +450,6 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input,
 {
     playlist_item_t *p_item;
 
-    if( !pl_priv(p_playlist)->b_doing_ml )
-        PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name,
-                                             p_input->psz_uri );
-
     PL_LOCK_IF( !b_locked );
 
     p_item = playlist_ItemNewFromInput( p_playlist, p_input );
@@ -788,9 +784,8 @@ static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
     else
         playlist_NodeInsert( p_playlist, p_item, p_node, i_pos );
 
-    if( !pl_priv(p_playlist)->b_doing_ml )
-        playlist_SendAddNotify( p_playlist, p_item->i_id, p_node->i_id,
-                                 !( i_mode & PLAYLIST_NO_REBUILD ) );
+    playlist_SendAddNotify( p_playlist, p_item->i_id, p_node->i_id,
+                            !( i_mode & PLAYLIST_NO_REBUILD ) );
 }
 
 /* Actually convert an item to a node */

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 605059fef537b15bab8d113ad8a01d62bbda1257..9215e2a46da6473e87c338dd435deae5f5a0060f 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -170,16 +170,10 @@ int playlist_MLLoad( playlist_t *p_playlist )
 
     vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemTreeAdded,
                         input_item_subitem_tree_added, p_playlist );
-
-    pl_priv(p_playlist)->b_doing_ml = true;
     PL_UNLOCK;
 
     input_Read( p_playlist, p_input );
 
-    PL_LOCK;
-    pl_priv(p_playlist)->b_doing_ml = false;
-    PL_UNLOCK;
-
     vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemTreeAdded,
                         input_item_subitem_tree_added, p_playlist );
 

diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h
index 51a37487aa1e2b8ea95c3750cea6d0d7270f3a9d..ee8f63231571761ccecceda892493754ad903b2b 100644 (file)
--- a/src/playlist/playlist_internal.h
+++ b/src/playlist/playlist_internal.h
@@ -89,7 +89,6 @@ typedef struct playlist_private_t
     bool     b_reset_currently_playing; /** Reset current item array */
 
     bool     b_tree; /**< Display as a tree */
-    bool     b_doing_ml; /**< Doing media library stuff  get quicker */
 } playlist_private_t;
 
 #define pl_priv( pl ) ((playlist_private_t *)(pl))