Reads more metadata from ID3v2 tags

[vlc] / modules / meta_engine / musicbrainz.c

diff --git a/modules/meta_engine/musicbrainz.c b/modules/meta_engine/musicbrainz.c
index d0db9d85e258240272e2b242ae85e1cce8723e96..26525acb22f3af3e0dfec7570fabf383717bfd4c 100644 (file)
--- a/modules/meta_engine/musicbrainz.c
+++ b/modules/meta_engine/musicbrainz.c
@@ -27,7 +27,9 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_interface.h>
+#include <vlc_input.h>
+#include <vlc_playlist.h>
 #include <vlc_meta.h>
 
 #include "musicbrainz/mb_c.h"
@@ -74,19 +76,20 @@ 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];
-    uint32_t i_meta;
+    vlc_bool_t b_art_found = VLC_FALSE;
 
-    char *psz_title;
     char *psz_artist;
     char *psz_album;
 
-    if( !p_item->p_meta ) return VLC_EGENERIC;
-    psz_artist = p_item->p_meta->psz_artist;
-    psz_album = p_item->p_meta->psz_album;
-    psz_title = p_item->psz_name;
+    psz_artist = input_item_GetArtist( p_item );
+    psz_album = input_item_GetAlbum( p_item );
 
     if( !psz_artist || !psz_album )
+    {
+        free( psz_artist );
+        free( psz_album );
         return VLC_EGENERIC;
+    }
 
     musicbrainz_t p_mb;
 
@@ -108,10 +111,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 )
@@ -142,7 +149,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 );
-            vlc_meta_SetArtURL( p_item->p_meta, psz_data );
+            msg_Dbg( p_obj, "Album art URL: %s", psz_data );
+            input_item_SetArtURL( p_item, psz_data );
+            b_art_found = VLC_TRUE;
             break;
         }
     }
@@ -154,8 +163,7 @@ static int GetData( vlc_object_t *p_obj, input_item_t *p_item,
     if( !b_art )
         return VLC_SUCCESS;
     else
-        return p_item->p_meta->psz_arturl && *p_item->p_meta->psz_arturl ?
-               VLC_SUCCESS : VLC_EGENERIC;
+        return b_art_found ? VLC_SUCCESS : VLC_EGENERIC;
 }
 
 static int FindMetaMBId( vlc_object_t *p_this )
@@ -167,7 +175,7 @@ static int FindMetaMBId( vlc_object_t *p_this )
 
     if( !i_ret )
     {
-        uint32_t i_meta = input_CurrentMetaFlags( p_item->p_meta );
+        uint32_t i_meta = input_CurrentMetaFlags( input_item_GetMetaObject( p_item ) );
         p_me->i_mandatory &= ~i_meta;
         p_me->i_optional &= ~i_meta;
         return p_me->i_mandatory ? VLC_EGENERIC : VLC_SUCCESS;