vcdx: Don't include playlist.h

[vlc] / modules / access / directory.c

diff --git a/modules/access/directory.c b/modules/access/directory.c
index c59dc9221187f6b15e8fabe3c5b1b2e2dfb784d3..3acb6a57664bad3311dbf06e38f7125f51d6d682 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -30,7 +30,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
@@ -78,9 +79,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,10 +92,10 @@ 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_capability( "access2", 55 );
+    set_description( N_("Standard filesystem directory input") );
+    set_capability( "access", 55 );
     add_shortcut( "directory" );
     add_shortcut( "dir" );
     add_shortcut( "file" );
@@ -165,6 +166,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;