Fix race condition while removing video outputs

[vlc] / modules / access / directory.c

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 3acb6a57664bad3311dbf06e38f7125f51d6d682..2834da7536d3e92dadad843fd366af577e8fd72a 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -32,6 +32,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
+#warning playlist code must not be used here.
 #include <vlc_playlist.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
@@ -198,7 +199,7 @@ static ssize_t ReadNull( access_t *p_access, uint8_t *p_buffer, size_t i_len)
 static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
 {
     char               *psz;
-    int                 i_mode, i_activity;
+    int                 i_mode;
     char               *psz_name = strdup (p_access->psz_path);
 
     if( psz_name == NULL )
@@ -255,17 +256,9 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
     p_item_in_category = playlist_ItemToNode( p_playlist, p_current,
                                               false );
 
-    i_activity = var_GetInteger( p_playlist, "activity" );
-    var_SetInteger( p_playlist, "activity", i_activity +
-                    DIRECTORY_ACTIVITY );
-
     ReadDir( p_playlist, psz_name, i_mode, p_current, p_item_in_category,
              p_current_input, (DIR *)p_access->p_sys, NULL );
 
-    i_activity = var_GetInteger( p_playlist, "activity" );
-    var_SetInteger( p_playlist, "activity", i_activity -
-                    DIRECTORY_ACTIVITY );
-
     playlist_Signal( p_playlist );
 
     free( psz_name );