vcdx: Fix memleaks.

[vlc] / modules / meta_engine / musicbrainz.c

diff --git a/modules/meta_engine/musicbrainz.c b/modules/meta_engine/musicbrainz.c
index 26525acb22f3af3e0dfec7570fabf383717bfd4c..33077a4fd3a349f107b8ed5d8f92d1460bef28bd 100644 (file)
--- a/modules/meta_engine/musicbrainz.c
+++ b/modules/meta_engine/musicbrainz.c
@@ -24,9 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_input.h>
 #include <vlc_playlist.h>
@@ -34,11 +38,12 @@
 
 #include "musicbrainz/mb_c.h"
 
+#include <assert.h>
+
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
 static int FindArt( vlc_object_t * );
-static int FindMetaMBId( vlc_object_t *p_this );
 
 /*****************************************************************************
  * Module descriptor
@@ -46,37 +51,28 @@ static int FindMetaMBId( vlc_object_t *p_this );
 
 vlc_module_begin();
     set_shortname( N_( "MusicBrainz" ) );
-    set_description( _("MusicBrainz meta data") );
-
-    set_capability( "meta fetcher", 10 );
-        /* This meta fetcher module only retrieves the musicbrainz track id
-         * and stores it
-         * TODO:
-         *  - Actually do it
-         *  - Also store the album id
-         * */
-        set_callbacks( FindMetaMBId, NULL );
-    add_submodule();
-        /* This art finder module fetches the album ID from musicbrainz and
-         * uses it to fetch the amazon ASIN from musicbrainz.
-         * TODO:
-         *  - Add ability to reuse MB album ID if we already have it
-         */
-        set_capability( "art finder", 80 );
-        set_callbacks( FindArt, NULL );
+    set_description( N_("MusicBrainz meta data") );
+
+    /* This art finder module fetches the album ID from musicbrainz and
+     * uses it to fetch the amazon ASIN from musicbrainz.
+     * TODO:
+     *  - Add ability to reuse MB album ID if we already have it
+     */
+    set_capability( "art finder", 80 );
+    set_callbacks( FindArt, NULL );
 vlc_module_end();
 
 /*****************************************************************************
  *****************************************************************************/
 
 static int GetData( vlc_object_t *p_obj, input_item_t *p_item,
-                    vlc_bool_t b_art )
+                    bool b_art )
 {
     char psz_buf[256];
     char psz_data[256];
     char i_album_count, i;
     char *ppsz_args[4];
-    vlc_bool_t b_art_found = VLC_FALSE;
+    bool b_art_found = false;
 
     char *psz_artist;
     char *psz_album;
@@ -151,7 +147,7 @@ static int GetData( vlc_object_t *p_obj, input_item_t *p_item,
                     psz_buf );
             msg_Dbg( p_obj, "Album art URL: %s", psz_data );
             input_item_SetArtURL( p_item, psz_data );
-            b_art_found = VLC_TRUE;
+            b_art_found = true;
             break;
         }
     }
@@ -166,28 +162,11 @@ static int GetData( vlc_object_t *p_obj, input_item_t *p_item,
         return b_art_found ? VLC_SUCCESS : VLC_EGENERIC;
 }
 
-static int FindMetaMBId( vlc_object_t *p_this )
-{
-    meta_engine_t *p_me = (meta_engine_t *)p_this;
-    input_item_t *p_item = p_me->p_item;
-    int i_ret = GetData( VLC_OBJECT(p_me), p_item,
-                         p_me->i_mandatory & VLC_META_ENGINE_ART_URL );
-
-    if( !i_ret )
-    {
-        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;
-    }
-    return VLC_EGENERIC;
-}
-
 static int FindArt( vlc_object_t *p_this )
 {
     playlist_t *p_playlist = (playlist_t *)p_this;
     input_item_t *p_item = (input_item_t *)(p_playlist->p_private);
     assert( p_item );
 
-    return GetData( VLC_OBJECT(p_playlist), p_item, VLC_TRUE );
+    return GetData( VLC_OBJECT(p_playlist), p_item, true );
 }