[vlc-devel] commit: taglib: manualy backport 5e567ccf38689401d366e0479cd8373aa44e6fa6 ( and normally fix #2280) ( Rémi Duraffort )

[git version control]

vlc | branch: 0.9-bugfix | Rémi Duraffort <ivoire at videolan.org> | Tue Feb 10 20:55:59 2009 +0100| [3b61028e3e8b78173dd542b29aad5c2996055e44] | committer: Rémi Duraffort 

taglib: manualy backport 5e567ccf38689401d366e0479cd8373aa44e6fa6 (and normally fix #2280)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3b61028e3e8b78173dd542b29aad5c2996055e44
---

 modules/meta_engine/taglib.cpp |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index e08f5e7..2b39059 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * taglib.cpp: Taglib tag parser/writer
  *****************************************************************************
- * Copyright (C) 2003-2006 the VideoLAN team
+ * Copyright (C) 2003-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub at videolan.org>
@@ -437,6 +437,7 @@ static int WriteMeta( vlc_object_t *p_this )
     playlist_t *p_playlist = (playlist_t *)p_this;
     meta_export_t *p_export = (meta_export_t *)p_playlist->p_private;
     input_item_t *p_item = p_export->p_item;
+    FileRef f;
 
     if( p_item == NULL )
     {
@@ -444,7 +445,25 @@ static int WriteMeta( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    FileRef f( p_export->psz_file );
+#if defined(WIN32) || defined (UNDER_CE)
+    if(GetVersion() < 0x80000000)
+    {
+        wchar_t wpath[MAX_PATH + 1];
+        if( !MultiByteToWideChar( CP_UTF8, 0, p_export->psz_file, -1, wpath, MAX_PATH) )
+            return VLC_EGENERIC;
+        wpath[MAX_PATH] = L'\0';
+        f = FileRef( wpath );
+    }
+    else
+        return VLC_EGENERIC;
+#else
+    const char* local_name = ToLocale( p_export->psz_file );
+    if( !local_name )
+        return VLC_EGENERIC;
+    f = FileRef( local_name );
+    LocaleFree( local_name );
+#endif
+
     if( f.isNull() || !f.tag() || f.file()->readOnly() )
     {
         msg_Err( p_this, "File %s can't be opened for tag writing\n",