Use gettext_noop() consistently

[vlc] / modules / access / directory.c

diff --git a/modules/access/directory.c b/modules/access/directory.c
index b03e1cd7c09ca195826b7118b000b6750bf0d346..0fb421aebb50fba08739a523bebf19811467be0b 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -31,6 +31,7 @@
 #endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
@@ -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" );
@@ -107,7 +108,7 @@ vlc_module_begin();
 
     add_submodule();
         set_description( "Directory EOF");
-        set_capability( "demux2", 0 );
+        set_capability( "demux", 0 );
         set_callbacks( DemuxOpen, NULL );
 vlc_module_end();
 
@@ -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;
@@ -350,7 +352,7 @@ static int Demux( demux_t *p_demux )
  *****************************************************************************/
 static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
 {
-    return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
+    return demux_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
 }