]> git.sesse.net Git - vlc/commitdiff
input_item_WriteMeta: use make_path()
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 30 Jan 2010 16:38:10 +0000 (18:38 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 30 Jan 2010 16:38:10 +0000 (18:38 +0200)
src/input/meta.c

index 3e43899d4f3b0bb7496187593b7c0b7dda742286..52b27c1ac3ddbe3740bcb51e5853456ee4cbb71c 100644 (file)
@@ -277,30 +277,24 @@ int input_item_WriteMeta( vlc_object_t *obj, input_item_t *p_item )
     vlc_mutex_lock( &p_item->lock );
     type = p_item->i_type;
     vlc_mutex_unlock( &p_item->lock );
-    if( type == ITEM_TYPE_FILE )
-    {
-        char *psz_uri = input_item_GetURI( p_item );
+    if( type != ITEM_TYPE_FILE )
+        goto error;
 
-#warning FIXME: function for URI->path conversion!
-        decode_URI( psz_uri );
-        if( !strncmp( psz_uri, "file://", 7 ) )
-        {
-            p_export->psz_file = strdup( psz_uri + 7 );
-            free( psz_uri );
-        }
-        else
-#warning This should not happen!
-            p_export->psz_file = psz_uri;
-    }
-    else
-    {
-        vlc_object_release( p_export );
-        return VLC_EGENERIC;
-    }
+    char *psz_uri = input_item_GetURI( p_item );
+    p_export->psz_file = make_path( psz_uri );
+    if( p_export->psz_file == NULL )
+        msg_Err( p_export, "cannot write meta to remote media %s", psz_uri );
+    free( psz_uri );
+    if( p_export->psz_file == NULL )
+        goto error;
 
     module_t *p_mod = module_need( p_export, "meta writer", NULL, false );
     if( p_mod )
         module_unneed( p_export, p_mod );
     vlc_object_release( p_export );
     return VLC_SUCCESS;
+
+error:
+    vlc_object_release( p_export );
+    return VLC_EGENERIC;
 }