#endif
#include <vlc_common.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
#include <vlc_url.h>
#ifdef HAVE_DIRENT_H
if( !psz_name_org )
return NULL;
- if( !strncmp( psz_name_org, "file://", 7 ) )
- {
- psz_name_org += 7;
- if( !strncmp( psz_name_org, "localhost", 9 ) )
- psz_name_org += 9;
- }
- char *psz_fname = decode_URI_duplicate( psz_name_org );
+ char *psz_fname = make_path( psz_name_org );
if( !psz_fname )
return NULL;
continue;
/* parse psz_src dir */
- i_dir_content = utf8_scandir( psz_dir, &ppsz_dir_content,
+ i_dir_content = vlc_scandir( psz_dir, &ppsz_dir_content,
subtitles_Filter, NULL );
if( i_dir_content < 0 )
continue;
if( !strcmp( psz_path, psz_fname ) )
continue;
- if( !utf8_stat( psz_path, &st ) && S_ISREG( st.st_mode ) && result )
+ if( !vlc_stat( psz_path, &st ) && S_ISREG( st.st_mode ) && result )
{
msg_Dbg( p_this,
"autodetected subtitle: %s with priority %d",