/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
-#include <vlc/intf.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>
#include <vlc_meta.h>
#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
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];
- uint32_t i_meta;
+ bool b_art_found = 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;
"</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 )
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 = true;
break;
}
}
if( !b_art )
return VLC_SUCCESS;
else
- return p_item->p_meta->psz_arturl && *p_item->p_meta->psz_arturl ?
- 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( p_item->p_meta );
- p_me->i_mandatory &= ~i_meta;
- p_me->i_optional &= ~i_meta;
- return p_me->i_mandatory ? VLC_EGENERIC : VLC_SUCCESS;
- }
- return VLC_EGENERIC;
+ return b_art_found ? VLC_SUCCESS : VLC_EGENERIC;
}
static int FindArt( vlc_object_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 );
}