Replace the button to the right place.

[vlc] / modules / meta_engine / musicbrainz.c

diff --git a/modules/meta_engine/musicbrainz.c b/modules/meta_engine/musicbrainz.c
index 3365d7dd6a56839891e5c1f14b40ad470e46eab6..47eba8f2b7b728d8cfeedab758fad894ecde0636 100644 (file)
--- a/modules/meta_engine/musicbrainz.c
+++ b/modules/meta_engine/musicbrainz.c
@@ -24,7 +24,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
@@ -76,6 +79,7 @@ static int GetData( vlc_object_t *p_obj, input_item_t *p_item,
     char psz_data[256];
     char i_album_count, i;
     char *ppsz_args[4];
+    vlc_bool_t b_art_found = VLC_FALSE;
 
     char *psz_artist;
     char *psz_album;
@@ -89,8 +93,6 @@ static int GetData( vlc_object_t *p_obj, input_item_t *p_item,
         free( psz_album );
         return VLC_EGENERIC;
     }
-    free( psz_artist );
-    free( psz_album );
 
     musicbrainz_t p_mb;
 
@@ -112,10 +114,14 @@ static int GetData( vlc_object_t *p_obj, input_item_t *p_item,
         "</mq:FindAlbum>\n", ppsz_args ) )
     {
         mb_GetQueryError( p_mb, psz_buf, 256 );
-        msg_Err( p_obj, "Query failed: %s\n", psz_buf );
+        msg_Err( p_obj, "Query failed: %s", psz_buf );
         mb_Delete( p_mb );
+        free( psz_artist );
+        free( psz_album );
         return VLC_EGENERIC;
     }
+    free( psz_artist );
+    free( psz_album );
 
     i_album_count = mb_GetResultInt( p_mb, MBE_GetNumAlbums );
     if( i_album_count < 1 )
@@ -146,7 +152,9 @@ static int GetData( vlc_object_t *p_obj, input_item_t *p_item,
             snprintf( psz_data, 255,
                     "http://images.amazon.com/images/P/%s.01._SCLZZZZZZZ_.jpg",
                     psz_buf );
+            msg_Dbg( p_obj, "Album art URL: %s", psz_data );
             input_item_SetArtURL( p_item, psz_data );
+            b_art_found = VLC_TRUE;
             break;
         }
     }
@@ -158,14 +166,7 @@ static int GetData( vlc_object_t *p_obj, input_item_t *p_item,
     if( !b_art )
         return VLC_SUCCESS;
     else
-    {
-        char *psz_arturl;
-        psz_arturl = input_item_GetArtURL( p_item );
-        int i_ret;
-        i_ret = EMPTY_STR( psz_arturl ) ? VLC_SUCCESS : VLC_EGENERIC ;
-        free( psz_arturl );
-        return i_ret;
-    }
+        return b_art_found ? VLC_SUCCESS : VLC_EGENERIC;
 }
 
 static int FindMetaMBId( vlc_object_t *p_this )