Use pl_Locked and pl_Unlocked.

diff --git a/modules/access/cdda/info.c b/modules/access/cdda/info.c
index 5529e8e0579a9b9d8fda5dbb8933511e5c2a677a..19d0dd0de893973752164c84e6bd07aa1d5055cb 100644 (file)
--- a/modules/access/cdda/info.c
+++ b/modules/access/cdda/info.c
@@ -961,7 +961,7 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
 
     if( b_play )
     {
-        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, false,
+        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked,
                           p_playlist->status.p_item, NULL );
     }
 

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 88b521057c1505bbd4cebd795fcbed487194f5bc..98bb4c234f5e6f3650f8b8dc8ed94d1d741722fa 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -925,7 +925,7 @@ static void PlayBookmark( intf_thread_t *p_intf, int i_num )
         if( !strcmp( psz_bookmark, psz_uri ) )
         {
             free( psz_uri );
-            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
+            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
                               NULL, p_item );
             break;
         }

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 54c3cad6e8607e03451cdde7302830bd70d863fe..bb1daae18d5d42b53f2f74d74ba94c235aa5e9a5 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -1417,7 +1417,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
             p_item = p_parent = p_playlist->items.p_elems[i_pos*2-1];
             while( p_parent->p_parent )
                 p_parent = p_parent->p_parent;
-            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, false,
+            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked,
                     p_parent, p_item );
         }
         else

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index dd9b9b204f33844c79d7ea902029df71b8a3560c..45a580a7b1dc9bd4dd5dda7025fd75957df7b4ba 100644 (file)
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -711,7 +711,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
                     while( p_parent->p_parent )
                         p_parent = p_parent->p_parent;
                     playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
-                                      false, p_parent, p_item );
+                                      pl_Unlocked, p_parent, p_item );
                 }
                 else if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children
                         == 0 )
@@ -722,7 +722,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
                 else
                 {
                     p_sys->p_node = p_sys->pp_plist[p_sys->i_box_plidx]->p_item;
-                    playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, false,
+                    playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked,
                         p_sys->pp_plist[p_sys->i_box_plidx]->p_item, NULL );
                 }
                 b_box_plidx_follow = true;

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index fa8a3cf8beb8d2889fa685c9bfd0170e8e82219a..710156accb017bc480237547565c27e8e482d05c 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -276,7 +276,7 @@ void PLModel::activateItem( playlist_item_t *p_item )
         p_parent = p_parent->p_parent;
     }
     if( p_parent )
-        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
+        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
                           p_parent, p_item );
 }
 

diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp
index 667e33f491ec238d75b47b5f5a73b352cc8be56d..ad808d4214bf175cc71ef739a7e289aee5cdf3f7 100644 (file)
--- a/modules/gui/skins2/vars/playtree.cpp
+++ b/modules/gui/skins2/vars/playtree.cpp
@@ -112,7 +112,7 @@ void Playtree::action( VarTree *pItem )
 
     if( p_parent )
     {
-        playlist_Control( m_pPlaylist, PLAYLIST_VIEWPLAY, true, p_parent, p_item );
+        playlist_Control( m_pPlaylist, PLAYLIST_VIEWPLAY, pl_Locked, p_parent, p_item );
     }
     vlc_object_unlock( m_pPlaylist );
 }

diff --git a/src/control/playlist.c b/src/control/playlist.c
index d68971cf5ec30cde9bd6e3b60178e5b16a97b449..8e98dbcc521b8d783cbbc4d7c8d9c1f8a70b180a 100644 (file)
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -91,7 +91,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
             RAISEVOID( "Unable to find item" );
         }
 
-        playlist_Control( PL, PLAYLIST_VIEWPLAY, true,
+        playlist_Control( PL, PLAYLIST_VIEWPLAY, pl_Locked,
                           PL->status.p_node, p_item );
         if( did_lock == 1 )
         {

diff --git a/src/playlist/item.c b/src/playlist/item.c
index d131d45985f75ae0dc28b7f86fad0505f22471da..d9d9e9dd958288bafd5934e2b91e867ab7042272 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -99,7 +99,7 @@ static void input_item_subitem_added( const vlc_event_t * p_event,
         if( i_ret == VLC_SUCCESS && b_play )
         {
             playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
-                          true, p_item_in_category, NULL );
+                          pl_Locked, p_item_in_category, NULL );
         }
     }