Don't use find for the playlist

[vlc] / modules / access / directory.c

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 5f36d4399aa463b039813ec27a4f13a2e0cecf5f..9d43eec97d538a254c222b1c4e8f502f30393b7f 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -203,17 +203,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
     int  i_mode, i_activity;
 
     playlist_item_t *p_item, *p_root_category;
-    vlc_bool_t b_play = VLC_FALSE;
-
-    playlist_t *p_playlist =
-        (playlist_t *) vlc_object_find( p_access,
-                                        VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-
-    if( !p_playlist )
-    {
-        msg_Err( p_access, "can't find playlist" );
-        goto end;
-    }
+    playlist_t *p_playlist = pl_Yield( p_access );
 
     psz_name = ToLocale( p_access->psz_path );
     ptr = strdup( psz_name );
@@ -249,23 +239,17 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
 
     if( p_playlist->status.p_item && p_playlist->status.p_item->p_input ==
         ((input_thread_t *)p_access->p_parent)->input.p_item )
-    {
         p_item = p_playlist->status.p_item;
-        b_play = VLC_TRUE;
-        msg_Dbg( p_access, "starting directory playback");
-    }
     else
     {
         input_item_t *p_current = ( (input_thread_t*)p_access->p_parent)->
                                                         input.p_item;
         p_item = playlist_LockItemGetByInput( p_playlist, p_current );
-        msg_Dbg( p_access, "not starting directory playback");
         if( !p_item )
         {
             msg_Dbg( p_playlist, "unable to find item in playlist");
-            return -1;
+            return VLC_ENOOBJ;
         }
-        b_play = VLC_FALSE;
     }
     p_item->p_input->i_type = ITEM_TYPE_DIRECTORY;
 
@@ -281,16 +265,6 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
     var_SetInteger( p_playlist, "activity", i_activity -
                     DIRECTORY_ACTIVITY );
 end:
-
-    /* Begin to read the directory */
-    if( b_play )
-    {
-#if 0
-       /// \bug we can start playing an already deleted item. Fix ?*/
-       playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, 1242,
-                          p_playlist->status.p_item, NULL );
-#endif
-    }
     if( psz_name ) free( psz_name );
     vlc_object_release( p_playlist );