Changeset 9a128b542b2d94a3b24c6a7d88d76644c989f948

Timestamp:

09/30/06 17:29:11 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1159630151 +0000

git-parent:

[242e2fc809c9dde96652e00094ca3f102b76261a]

git-author:

Clément Stenac <zorglub@videolan.org> 1159630151 +0000

Message:

Split the musicbrainz module : meta fetcher (to retrieve MB Album and Track id) and art finder (to retrieve Amazon art url)

Files:

• modules/meta_engine/musicbrainz.c (modified) (9 diffs)

modules/meta_engine/musicbrainz.c

@@ -36 +36 @@
- * Local prototypes
- *****************************************************************************/
-
+
+
-
-/*****************************************************************************
@@ -43 +44 @@
-
-vlc_module_begin();
-/*    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_CONTROL );*/
-    set_shortname( N_( "MusicBrainz" ) );
-    set_description( _("MusicBrainz meta data") );
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-vlc_module_end();
-
-/*****************************************************************************
- *****************************************************************************/
-
+
+
+
-{
-    meta_engine_t *p_me = (meta_engine_t *)p_this;
-    input_item_t *p_item = p_me->p_item;
-
-    char *psz_title = NULL;
-    char *psz_artist = NULL;
-    char *psz_album = NULL;
-
-    char psz_buf[256];
-    char psz_data[256];
@@ -68 +76 @@
-    char *ppsz_args[4];
-    uint32_t i_meta;
+
+    char *psz_title;
+    char *psz_artist;
+    char *psz_album;
-
-    if( !p_item->p_meta ) return VLC_EGENERIC;
@@ -76 +88 @@
-    if( !psz_artist || !psz_album )
-        return VLC_EGENERIC;
+
-    musicbrainz_t p_mb;
-
@@ -82 +95 @@
-    mb_WSAInit( p_mb );
-#endif
+
-    mb_SetDepth( p_mb, 2 );
-    ppsz_args[0] = psz_album;
@@ -95 +109 @@
-    {
-        mb_GetQueryError( p_mb, psz_buf, 256 );
-me
+obj
-        mb_Delete( p_mb );
-        return VLC_EGENERIC;
@@ -103 +117 @@
-    if( i_album_count < 1 )
-    {
-        msg_Err( p_me, "No albums found.\n" );
-        mb_Delete( p_mb );
-        return VLC_EGENERIC;
-    }
-
-
+
+
-
-    for( i = 1; i <= i_album_count; i++ )
@@ -117 +131 @@
-        mb_GetResultData( p_mb, MBE_AlbumGetAlbumId, psz_data, 256 );
-        mb_GetIDFromURL( p_mb, psz_data, psz_buf, 256 );
-
+
+
+
+
+
-
-        if( mb_GetResultData( p_mb, MBE_AlbumGetAmazonAsin, psz_buf, 256 ) )
-        {
-
-
+
+
+
+
-            vlc_meta_SetArtURL( p_item->p_meta, psz_data );
-            break;
@@ -130 +150 @@
-    mb_WSAInit( p_mb );
-#endif
-
-    mb_Delete( p_mb );
-
-
-
-
-
-
+
+
-    else
-
+
+
-}
+
+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, VLC_FALSE );
+
+    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;
+}
+
+static int FindArt( vlc_object_t *p_this )
+{
+    playlist_t *p_playlist;
+    input_item_t *p_item = (input_item_t *)p_playlist->p_private;
+    assert( p_item );
+
+    return GetData( p_playlist, p_item, VLC_TRUE );
+}