X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdirectory.c;h=d770321eaed51c77e18a0f5a2a5b08af09957f30;hb=39aae2a3c9d265085b4a7bfde5bc1fb630860713;hp=b03e1cd7c09ca195826b7118b000b6750bf0d346;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc

diff --git a/modules/access/directory.c b/modules/access/directory.c
index b03e1cd7c0..d770321eae 100644
--- 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>
@@ -94,7 +95,7 @@ vlc_module_begin();
     set_shortname( _("Directory" ) );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     set_description( _("Standard filesystem directory input") );
-    set_capability( "access2", 55 );
+    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 );
 }