Commit 92fb098b authored by Ilkka Ollakka's avatar Ilkka Ollakka

taglib: use decoded path

parent bc638da9
...@@ -330,23 +330,27 @@ static int ReadMeta( vlc_object_t* p_this) ...@@ -330,23 +330,27 @@ static int ReadMeta( vlc_object_t* p_this)
demux_t* p_demux = p_demux_meta->p_demux; demux_t* p_demux = p_demux_meta->p_demux;
vlc_meta_t* p_meta; vlc_meta_t* p_meta;
FileRef f; FileRef f;
char *psz_path = decode_URI_duplicate( p_demux->psz_path );
p_demux_meta->p_meta = NULL; p_demux_meta->p_meta = NULL;
if( !psz_path )
return VLC_ENOMEM;
#if defined(WIN32) || defined (UNDER_CE) #if defined(WIN32) || defined (UNDER_CE)
wchar_t wpath[MAX_PATH + 1]; wchar_t wpath[MAX_PATH + 1];
if( !MultiByteToWideChar( CP_UTF8, 0, p_demux->psz_path, -1, wpath, MAX_PATH) ) if( !MultiByteToWideChar( CP_UTF8, 0, psz_path, -1, wpath, MAX_PATH) )
return VLC_EGENERIC; return VLC_EGENERIC;
wpath[MAX_PATH] = L'\0'; wpath[MAX_PATH] = L'\0';
f = FileRef( wpath ); f = FileRef( wpath );
#else #else
const char* local_name = ToLocale( p_demux->psz_path ); const char* local_name = ToLocale( psz_path );
if( !local_name ) if( !local_name )
return VLC_EGENERIC; return VLC_EGENERIC;
f = FileRef( local_name ); f = FileRef( local_name );
LocaleFree( local_name ); LocaleFree( local_name );
#endif #endif
free( psz_path );
if( f.isNull() ) if( f.isNull() )
return VLC_EGENERIC; return VLC_EGENERIC;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment