Input access locking. Part one

[vlc] / modules / meta_engine / musicbrainz.c

diff --git a/modules/meta_engine/musicbrainz.c b/modules/meta_engine/musicbrainz.c
index b33186ceecd5d640e70a3ca3e5add1e2e1a47e4b..c3ee1df99f23fe60ba022e9345419b4415f468eb 100644 (file)
--- a/modules/meta_engine/musicbrainz.c
+++ b/modules/meta_engine/musicbrainz.c
@@ -77,17 +77,20 @@ static int GetData( vlc_object_t *p_obj, input_item_t *p_item,
     char i_album_count, i;
     char *ppsz_args[4];
 
-    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;
+    }
+    free( psz_artist );
+    free( psz_album );
 
     musicbrainz_t p_mb;
 
@@ -143,7 +146,7 @@ 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 );
+            input_item_SetArtURL( p_item, psz_data );
             break;
         }
     }
@@ -155,8 +158,13 @@ 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;
+    {
+        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;
 }
 
 static int FindMetaMBId( vlc_object_t *p_this )
@@ -168,7 +176,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;