Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / demux / vobsub.c

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index ef5dd3a9c246a33de8b361fe962296b67dbd0e1f..208284217b5f22acf404ce2dd61c3a34f2b7029f 100644 (file)
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -32,12 +32,10 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 
-#include <errno.h>
 #include <sys/types.h>
 #include <limits.h>
 
 #include <vlc_demux.h>
-#include <vlc_charset.h>
 
 #include "ps.h"
 #include "vobsub.h"
@@ -58,8 +56,7 @@ vlc_module_begin ()
 
     set_callbacks( Open, Close )
 
-    add_shortcut( "vobsub" )
-    add_shortcut( "subtitle" )
+    add_shortcut( "vobsub", "subtitle" )
 vlc_module_end ()
 
 /*****************************************************************************
@@ -191,7 +188,8 @@ static int Open ( vlc_object_t *p_this )
         }
     }
 
-    if( asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, p_demux->psz_path ) == -1 )
+    if( asprintf( &psz_vobname, "%s://%s", p_demux->psz_access,
+                  p_demux->psz_location ) == -1 )
     {
         free( p_sys );
         return VLC_EGENERIC;