Fix xspf reading/writing

[vlc] / modules / meta_engine / taglib.cpp

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 9a73d7b5d219c13087cda2dea06e8019272a2cdd..43ac6974601bcc17d14532159eae7902e7411f9c 100644 (file)
--- 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-2008 the VideoLAN team
+ * Copyright (C) 2003-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -68,15 +68,11 @@
 
 // Local functions
 static int ReadMeta    ( vlc_object_t * );
-static int DownloadArt ( vlc_object_t * );
 static int WriteMeta   ( vlc_object_t * );
 
 vlc_module_begin ()
     set_capability( "meta reader", 1000 )
     set_callbacks( ReadMeta, NULL )
-    add_submodule ()
-        set_capability( "art downloader", 50 )
-        set_callbacks( DownloadArt, NULL )
     add_submodule ()
         set_capability( "meta writer", 50 )
         set_callbacks( WriteMeta, NULL )
@@ -554,7 +550,7 @@ static int WriteMeta( vlc_object_t *p_this )
 
     if( f.isNull() || !f.tag() || f.file()->readOnly() )
     {
-        msg_Err( p_this, "File %s can't be opened for tag writing\n",
+        msg_Err( p_this, "File %s can't be opened for tag writing",
             p_export->psz_file );
         return VLC_EGENERIC;
     }
@@ -575,8 +571,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 );
 
@@ -653,13 +648,3 @@ static int WriteMeta( vlc_object_t *p_this )
     return VLC_SUCCESS;
 }
 
-
-
-static int DownloadArt( vlc_object_t *p_this )
-{
-    /* We need to be passed the file name
-     * Fetch the thing from the file, save it to the cache folder
-     */
-    return VLC_EGENERIC;
-}
-