Remove unneeded msg_Error.

[vlc] / modules / access / directory.c

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 76e6bef86693a64051f7750a20befbabf57d3bec..2834da7536d3e92dadad843fd366af577e8fd72a 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -30,7 +30,9 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#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>
@@ -78,9 +80,9 @@ static int  DemuxOpen ( vlc_object_t * );
         "collapse: subdirectories appear but are expanded on first play.\n" \
         "expand: all subdirectories are expanded.\n" )
 
-static const char *psz_recursive_list[] = { "none", "collapse", "expand" };
-static const char *psz_recursive_list_text[] = { N_("none"), N_("collapse"),
-                                                 N_("expand") };
+static const char *const psz_recursive_list[] = { "none", "collapse", "expand" };
+static const char *const psz_recursive_list_text[] = {
+    N_("none"), N_("collapse"), N_("expand") };
 
 #define IGNORE_TEXT N_("Ignored extensions")
 #define IGNORE_LONGTEXT N_( \
@@ -91,9 +93,9 @@ static const char *psz_recursive_list_text[] = { N_("none"), N_("collapse"),
 
 vlc_module_begin();
     set_category( CAT_INPUT );
-    set_shortname( _("Directory" ) );
+    set_shortname( N_("Directory" ) );
     set_subcategory( SUBCAT_INPUT_ACCESS );
-    set_description( _("Standard filesystem directory input") );
+    set_description( N_("Standard filesystem directory input") );
     set_capability( "access", 55 );
     add_shortcut( "directory" );
     add_shortcut( "dir" );
@@ -165,6 +167,7 @@ static int Open( vlc_object_t *p_this )
     p_access->pf_control= Control;
 
     /* Force a demux */
+    free( p_access->psz_demux );
     p_access->psz_demux = strdup( "directory" );
 
     return VLC_SUCCESS;
@@ -196,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 )
@@ -253,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 );