Skip to content

V
vlc-1.1
Commit 28caaf85 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Taglib: assume Windows NT for filesystem access

parent 3cdb4538
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 21 deletions
modules/meta_engine/taglib.cpp
View file @ 28caaf85
...@@ -329,16 +329,11 @@ static int ReadMeta( vlc_object_t* p_this) ...@@ -329,16 +329,11 @@ static int ReadMeta( vlc_object_t* p_this)
#if defined(WIN32) || defined (UNDER_CE) #if defined(WIN32) || defined (UNDER_CE)
if(GetVersion() < 0x80000000)
{
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, p_demux->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
return VLC_EGENERIC;
#else #else
const char* local_name = ToLocale( p_demux->psz_path ); const char* local_name = ToLocale( p_demux->psz_path );
if( !local_name ) if( !local_name )
...@@ -538,19 +533,11 @@ static int WriteMeta( vlc_object_t *p_this ) ...@@ -538,19 +533,11 @@ static int WriteMeta( vlc_object_t *p_this )
} }
#if defined(WIN32) || defined (UNDER_CE) #if defined(WIN32) || defined (UNDER_CE)
if(GetVersion() < 0x80000000)
{
wchar_t wpath[MAX_PATH + 1]; wchar_t wpath[MAX_PATH + 1];
if( !MultiByteToWideChar( CP_UTF8, 0, export_file , -1, wpath, MAX_PATH) ) if( !MultiByteToWideChar( CP_UTF8, 0, export_file , -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
{
free( export_file );
return VLC_EGENERIC;
}
#else #else
const char* local_name = ToLocale( export_file ); const char* local_name = ToLocale( export_file );
if( !local_name ) if( !local_name )
......
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