Use pl_Locked and pl_Unlocked

[vlc] / modules / access / cdda / info.c

diff --git a/modules/access/cdda/info.c b/modules/access/cdda/info.c
index faeb9e2f2c84d9703662c1b0acb255ad4044f32d..e13c6d8758b30cdc2aa5088dc5e8081f2764bf0f 100644 (file)
--- a/modules/access/cdda/info.c
+++ b/modules/access/cdda/info.c
@@ -26,6 +26,8 @@
  *****************************************************************************/
 #include "callback.h"      /* FIXME - reorganize callback.h, cdda.h better */
 #include "cdda.h"          /* private structures. Also #includes vlc things */
+
+#warning playlist code must not be used here.
 #include <vlc_playlist.h>  /* Has to come *after* cdda.h */
 
 #include <cdio/cdio.h>
@@ -828,7 +830,7 @@ CDDACreatePlaylistItem( const access_t *p_access, cdda_data_t *p_cdda,
                psz_mrl, psz_title, (long int) i_mduration / 1000000 );
 
     p_child = playlist_ItemNew( p_playlist, psz_mrl, psz_title );
-    input_item_SetDuration( input_GetItem( p_child->p_input ),
+    input_item_SetDuration( p_child->p_input,
             (mtime_t) i_mduration );
     free(psz_mrl);
     free(psz_title);
@@ -880,7 +882,7 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
         input_thread_t *p_input = (input_thread_t*)vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT );
         if( p_input )
         {
-            p_item = playlist_ItemGetByInput( p_playlist, input_GetItem(p_input), false );
+            p_item = playlist_ItemGetByInput( p_playlist, input_GetItem(p_input), pl_Unlocked );
 
             if( p_item == p_playlist->status.p_item && !b_single_track )
                 b_play = true;
@@ -922,7 +924,7 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
         input_title_t *t;
 
         if( !p_cdda->b_nav_mode )
-            playlist_ItemToNode( p_playlist, p_item, false );
+            playlist_ItemToNode( p_playlist, p_item, pl_Unlocked );
 
         for( i = 0 ; i < p_cdda->i_tracks ; i++ )
         {
@@ -959,7 +961,7 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
 
     if( b_play )
     {
-        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
+        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked,
                           p_playlist->status.p_item, NULL );
     }