id3tag: code cosmetic and warning killing

[vlc] / modules / meta_engine / taglib.cpp

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 504835a602ba8abd7f19bccf624ed9345177836e..227ed04f758b626fd8378c084f7be0a341b932a8 100644 (file)
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -34,6 +34,7 @@
 #include <vlc_demux.h>
 #include <vlc_strings.h>
 #include <vlc_charset.h>
+#include <vlc_url.h>
 
 #ifdef WIN32
 # include <io.h>
@@ -328,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 )
@@ -529,33 +525,40 @@ static int WriteMeta( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-#if defined(WIN32) || defined (UNDER_CE)
-    if(GetVersion() < 0x80000000)
+    char *export_file = strdup(p_export->psz_file);
+    if( decode_URI( export_file ) == NULL )
     {
-        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 );
+        free( export_file );
+        return VLC_EGENERIC;
     }
-    else
+
+#if defined(WIN32) || defined (UNDER_CE)
+    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( p_export->psz_file );
+    const char* local_name = ToLocale( export_file );
     if( !local_name )
+    {
+        free( export_file );
         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",
-            p_export->psz_file );
+        msg_Err( p_this, "File %s can't be opened for tag writing",
+            export_file );
+        free( export_file );
         return VLC_EGENERIC;
     }
 
-    msg_Dbg( p_this, "Writing metadata for %s", p_export->psz_file );
+    msg_Dbg( p_this, "Writing metadata for %s", export_file );
+    free( export_file );
 
     Tag *p_tag = f.tag();
 
@@ -571,8 +574,7 @@ static int WriteMeta( vlc_object_t *p_this )
 
     // Saving all common fields
     // If the title is empty, use the name
-    psz_meta = input_item_GetTitle( p_item );
-    if( !psz_meta ) psz_meta = input_item_GetName( p_item );
+    psz_meta = input_item_GetTitleFbName( p_item );
     SET( Title, psz_meta );
     free( psz_meta );