Use pl_Locked and pl_Unlocked.

diff --git a/modules/codec/cmml/intf.c b/modules/codec/cmml/intf.c
index b57cd668a6b6084f3b8c5494974f8a6c302c424a..5f58b303d318a92b075c96c3d08d84d46f685ef6 100644 (file)
--- a/modules/codec/cmml/intf.c
+++ b/modules/codec/cmml/intf.c
@@ -510,7 +510,7 @@ static void FollowAnchor ( intf_thread_t *p_intf )
             msg_Dbg( p_intf, "calling browser_Open with \"%s\"", psz_url );
 #endif
             (void) browser_Open( psz_url );
-            playlist_Control( p_playlist, PLAYLIST_PAUSE, false, 0 );
+            playlist_Control( p_playlist, PLAYLIST_PAUSE, pl_Unlocked, 0 );
         }
 
         free( psz_uri_to_load );

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index fd725a5f0ebef960a46cf806c4db68ff8881b877..bd998d5d1159c353b060d88699976583920d76f0 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -507,7 +507,7 @@ DBUS_METHOD( DelTrack )
     {
         playlist_DeleteFromInput( p_playlist,
             p_playlist->current.p_elems[i_position]->p_input->i_id,
-            true );
+            pl_Locked );
     }
     PL_UNLOCK;
 

diff --git a/modules/control/rc.c b/modules/control/rc.c
index bb1daae18d5d42b53f2f74d74ba94c235aa5e9a5..8b3b8d6583bdf48956e1b7231513e08e645a17d6 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -1430,7 +1430,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
     else if( !strcmp( psz_cmd, "clear" ) )
     {
         playlist_Stop( p_playlist );
-        playlist_Clear( p_playlist, false );
+        playlist_Clear( p_playlist, pl_Unlocked );
     }
     else if( !strcmp( psz_cmd, "add" ) &&
              newval.psz_string && *newval.psz_string )
@@ -1442,7 +1442,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
             msg_rc( "Trying to add %s to playlist.", newval.psz_string );
             int i_ret =playlist_AddInput( p_playlist, p_item,
                      PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END, true,
-                     false );
+                     pl_Unlocked );
             vlc_gc_decref( p_item );
             if( i_ret != VLC_SUCCESS )
             {
@@ -1460,7 +1460,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
             msg_rc( "trying to enqueue %s to playlist", newval.psz_string );
             if( playlist_AddInput( p_playlist, p_item,
                                PLAYLIST_APPEND, PLAYLIST_END, true,
-                               false ) != VLC_SUCCESS )
+                               pl_Unlocked ) != VLC_SUCCESS )
             {
                 return VLC_EGENERIC;
             }

diff --git a/modules/gui/macosx/applescript.m b/modules/gui/macosx/applescript.m
index f860af6e32f1bc14abe97594f2ee3cb1013466d7..cfba3bb341d922fd75935874d088d68b5321d9b1 100644 (file)
--- a/modules/gui/macosx/applescript.m
+++ b/modules/gui/macosx/applescript.m
@@ -58,7 +58,7 @@
                                     displayNameAtPath: o_urlString] UTF8String] );
             /* FIXME: playlist_AddInput() can fail */
             playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT,
-                               PLAYLIST_END, true, false );
+                               PLAYLIST_END, true, pl_Unlocked );
 
             vlc_gc_decref( p_input );
 

diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m
index abf197aac62bb3413d667edb40728b0bee1f0830..ee7a94ea84e297fa141a487e5586c8dda5f1bc77 100644 (file)
--- a/modules/gui/macosx/wizard.m
+++ b/modules/gui/macosx/wizard.m
@@ -1294,7 +1294,7 @@ static VLCWizard *_o_sharedInstance = nil;
 
             /* FIXME: playlist_AddInput() can fail */
             playlist_AddInput( p_playlist, p_input, PLAYLIST_STOP,
-                PLAYLIST_END, true, false );
+                PLAYLIST_END, true, pl_Unlocked );
 
             if( x == 0 )
             {

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index 45a580a7b1dc9bd4dd5dda7025fd75957df7b4ba..1d4bfe96dca3b116a89622a6ee20c772886e48d8 100644 (file)
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -679,7 +679,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
                 if( p_item->i_children == -1 )
                 {
                     playlist_DeleteFromInput( p_playlist,
-                                              p_item->p_input->i_id, true );
+                                              p_item->p_input->i_id, pl_Locked );
                 }
                 else
                 {

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index 710156accb017bc480237547565c27e8e482d05c..60ffb4f4c7e76124be675afb4c68940e3d0d8be8 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -705,7 +705,7 @@ void PLModel::doDeleteItem( PLItem *item, QModelIndexList *fullList )
         PL_UNLOCK; return;
     }
     if( p_item->i_children == -1 )
-        playlist_DeleteFromInput( p_playlist, item->i_input_id, true );
+        playlist_DeleteFromInput( p_playlist, item->i_input_id, pl_Locked );
     else
         playlist_NodeDelete( p_playlist, p_item, true, false );
     /* And finally, remove it from the tree */

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 7ce95ebb799a63dfb2d71283637f84643b035c36..ea2c5e18b3f4c19e8e52306dd374db202b3e0bdb 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -313,7 +313,7 @@ void OpenDialog::finish( bool b_enqueue = false )
             /* FIXME: playlist_AddInput() can fail */
             playlist_AddInput( THEPL, p_input,
                 PLAYLIST_APPEND | ( b_start ? PLAYLIST_GO : PLAYLIST_PREPARSE ),
-                PLAYLIST_END, true, false );
+                PLAYLIST_END, true, pl_Unlocked );
             vlc_gc_decref( p_input );
         }
     }

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 67002ded710c7ee1bbdb586c06113c1aaa93f160..dd4f69d0c4fb9455cad4fb861129f02215cb982d 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -355,7 +355,7 @@ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
         /* FIXME: playlist_AddInput() can fail */
         playlist_AddInput( THEPL, p_input,
                        go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND,
-                       PLAYLIST_END, pl, false );
+                       PLAYLIST_END, pl, pl_Unlocked );
         input_Read( THEPL, p_input, false );
         vlc_gc_decref( p_input );
     }

diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp
index ad808d4214bf175cc71ef739a7e289aee5cdf3f7..037d07813bc8b390c4fb2b4420eff7cf6e9d434b 100644 (file)
--- a/modules/gui/skins2/vars/playtree.cpp
+++ b/modules/gui/skins2/vars/playtree.cpp
@@ -74,7 +74,7 @@ void Playtree::delSelected()
             if( p_item->i_children == -1 )
             {
                 playlist_DeleteFromInput( getIntf()->p_sys->p_playlist,
-                                          p_item->p_input->i_id, true );
+                                          p_item->p_input->i_id, pl_Locked );
                 it2 = getNextVisibleItem( it ) ;
                 it->parent()->removeChild( it );
                 it = it2;

diff --git a/modules/gui/wxwidgets/dialogs/open.cpp b/modules/gui/wxwidgets/dialogs/open.cpp
index 562f81f62bcc22ef8ccddb092ab76b5e332febd1..9d1981178c92903debc36c9e5da5bde00dc76e5d 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/open.cpp
+++ b/modules/gui/wxwidgets/dialogs/open.cpp
@@ -1206,7 +1206,7 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
         /* FIXME: playlist_AddInput() can fail */
         playlist_AddInput( p_playlist, p_input,
                PLAYLIST_APPEND | ( b_start ? PLAYLIST_GO : PLAYLIST_PREPARSE ),
-               PLAYLIST_END, true, false );
+               PLAYLIST_END, true, pl_Unlocked );
         vlc_gc_decref( p_input );
     }
     pl_Release( p_playlist );

diff --git a/modules/gui/wxwidgets/dialogs/wizard.cpp b/modules/gui/wxwidgets/dialogs/wizard.cpp
index 95921b7cb39858f4962f0fff7810f69faf0b9052..07f559dd5a2bc10b166080a529de5aed09647812 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/wizard.cpp
+++ b/modules/gui/wxwidgets/dialogs/wizard.cpp
@@ -1631,7 +1631,7 @@ void WizardDialog::Run()
 
             /* FIXME: playlist_AddInput() can fail */
             playlist_AddInput( p_playlist, p_input,
-                               PLAYLIST_GO, PLAYLIST_END, true, false );
+                               PLAYLIST_GO, PLAYLIST_END, true, pl_Unlocked );
             vlc_gc_decref( p_input );
             pl_Release( p_playlist );
         }

diff --git a/modules/misc/lua/libs/playlist.c b/modules/misc/lua/libs/playlist.c
index 4d9b30791b277557e478990180ec4250b850ee93..0eac614724c558391fa3803b4521bb39cafe0544 100644 (file)
--- a/modules/misc/lua/libs/playlist.c
+++ b/modules/misc/lua/libs/playlist.c
@@ -107,7 +107,7 @@ static int vlclua_playlist_clear( lua_State * L )
 {
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     playlist_Stop( p_playlist ); /* Isn't this already implied by Clear? */
-    playlist_Clear( p_playlist, false );
+    playlist_Clear( p_playlist, pl_Unlocked );
     vlc_object_release( p_playlist );
     return 0;
 }

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 9b89a6e3a5f3ba9e2cd87bb4693b4e450a61978d..ff84a13a4ab1743d859d00d2e628f25a58f6f0da 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -684,7 +684,7 @@ static int Demux( demux_t *p_demux )
     if( p_playlist->status.p_item &&
              p_playlist->status.p_item->p_input == p_parent_input )
     {
-        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
+        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
                           p_playlist->status.p_node, p_playlist->status.p_item );
     }
 
@@ -1540,7 +1540,7 @@ static int RemoveAnnounce( services_discovery_t *p_sd,
     if( p_announce->i_input_id > -1 )
     {
         playlist_DeleteFromInput( pl_Yield( p_sd ),
-                                  p_announce->i_input_id, false );
+                                  p_announce->i_input_id, pl_Unlocked );
         pl_Release( p_sd );
     }
 

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 64b44b8333de3071136617489e7d7bdebeaa13f8..10660f80cabbc0897d8bf9de114495e9b467c87b 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -100,7 +100,7 @@ static void input_item_subitem_added( const vlc_event_t * p_event,
     /* playlist_AddInput() can fail, but we have no way to report that ..
      * Any way when it has failed, either the playlist is dying, either OOM */
     playlist_AddInput( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END,
-            false, false );
+            false, pl_Unlocked );
 }
 
 int playlist_MLLoad( playlist_t *p_playlist )

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index d6f1ddcbcdd505e8ff11ec5559896c41ec35f3bb..17bf55102b137ef3d627ce1d51e331ad6114e2d0 100644 (file)
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -269,7 +269,7 @@ static void playlist_sd_item_removed( const vlc_event_t * p_event, void * user_d
 
     /* Delete the non-node item normally */
     playlist_DeleteFromInputInParent( p_parent->p_playlist, p_input->i_id,
-                                      p_parent, true );
+                                      p_parent, pl_Locked );
 
     vlc_object_unlock( p_parent->p_playlist );
 }