From 28caaf85ca6eb13f9d38cc4863f86f0fea397440 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 18 Aug 2009 20:21:54 +0300 Subject: [PATCH] Taglib: assume Windows NT for filesystem access --- modules/meta_engine/taglib.cpp | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp index 56d7be7bc2..227ed04f75 100644 --- a/modules/meta_engine/taglib.cpp +++ b/modules/meta_engine/taglib.cpp @@ -329,16 +329,11 @@ static int ReadMeta( vlc_object_t* p_this) #if defined(WIN32) || defined (UNDER_CE) - if(GetVersion() < 0x80000000) - { - wchar_t wpath[MAX_PATH + 1]; - if( !MultiByteToWideChar( CP_UTF8, 0, p_demux->psz_path, -1, wpath, MAX_PATH) ) - return VLC_EGENERIC; - wpath[MAX_PATH] = L'\0'; - f = FileRef( wpath ); - } - else + wchar_t wpath[MAX_PATH + 1]; + if( !MultiByteToWideChar( CP_UTF8, 0, p_demux->psz_path, -1, wpath, MAX_PATH) ) return VLC_EGENERIC; + wpath[MAX_PATH] = L'\0'; + f = FileRef( wpath ); #else const char* local_name = ToLocale( p_demux->psz_path ); if( !local_name ) @@ -538,19 +533,11 @@ static int WriteMeta( vlc_object_t *p_this ) } #if defined(WIN32) || defined (UNDER_CE) - if(GetVersion() < 0x80000000) - { - wchar_t wpath[MAX_PATH + 1]; - if( !MultiByteToWideChar( CP_UTF8, 0, export_file , -1, wpath, MAX_PATH) ) - return VLC_EGENERIC; - wpath[MAX_PATH] = L'\0'; - f = FileRef( wpath ); - } - else - { - free( export_file ); + wchar_t wpath[MAX_PATH + 1]; + if( !MultiByteToWideChar( CP_UTF8, 0, export_file , -1, wpath, MAX_PATH) ) return VLC_EGENERIC; - } + wpath[MAX_PATH] = L'\0'; + f = FileRef( wpath ); #else const char* local_name = ToLocale( export_file ); if( !local_name ) -- 2.39.5