Mac OS X gui: Fix a crash when asking for fullscreen state when no p_real_vout is...

[vlc] / modules / meta_engine / id3tag.c

diff --git a/modules/meta_engine/id3tag.c b/modules/meta_engine/id3tag.c
index 9e11ddd8c1737064b110b9a9276db4c694ef323a..ec7c36bbf8d6b9cb88aea975f91784276574d639 100644 (file)
--- a/modules/meta_engine/id3tag.c
+++ b/modules/meta_engine/id3tag.c
@@ -24,16 +24,19 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include <config.h>
+
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/input.h>
+#include <vlc_interface.h>
+#include <vlc_demux.h>
+#include <vlc_playlist.h>
 
 #include <sys/types.h>
 
-#include "vlc_meta.h"
+#include <vlc_meta.h>
 
 #include <id3tag.h>
 #include "id3genres.h"
@@ -70,17 +73,66 @@ static void ParseID3Tag( demux_t *p_demux, uint8_t *p_data, int i_size )
 
     if( !p_demux->p_private ) p_demux->p_private = (void *)vlc_meta_New();
 
+    vlc_meta_t *p_meta = (vlc_meta_t *)(p_demux->p_private);
 #define ID_IS( a ) (!strcmp(  p_frame->id, a ))
 #define DESCR_IS( a) strstr( (char*)p_frame->description, a )
 
+    while ( ( p_frame = id3_tag_findframe( p_id3_tag, "UFID", i ) ) )
+    {
+        char *psz_owner = id3_field_getlatin1( &p_frame->fields[0] );
+
+        if( !strncmp( psz_owner, "http://musicbrainz.org", 22 ) )
+        {
+            id3_byte_t const * p_ufid;
+            id3_length_t i_ufidlen;
+
+            p_ufid = (id3_byte_t const *)
+                        id3_field_getbinarydata(
+                                &p_frame->fields[1],
+                                &i_ufidlen );
+            char *psz_ufid = strndup( p_ufid, i_ufidlen );
+
+            vlc_meta_SetTrackID( p_meta, psz_ufid );
+            free( psz_ufid );
+        }
+        i++;
+    }
+#if 0 //not used
+    i = 0;
+
+    while( ( p_frame = id3_tag_findframe( p_id3_tag, "TXXX", i ) ) )
+    {
+        char *psz_desc = id3_ucs4_latin1duplicate(
+                id3_field_getstring( &p_frame->fields[1] ) );
+
+        if ( ! strncmp( psz_desc, "MusicBrainz Artist Id", 21 ) )
+        {
+            char *psz_artistid = id3_ucs4_latin1duplicate(
+                    id3_field_getstring( &p_frame->fields[2] ) );
+            vlc_meta_SetArtistID( p_meta, psz_artistid );
+            free( psz_artistid );
+        }
+
+        if ( ! strncmp( psz_desc, "MusicBrainz Album Id", 20 ) )
+        {
+            char *psz_albumid = id3_ucs4_latin1duplicate(
+                    id3_field_getstring( &p_frame->fields[2] ) );
+            vlc_meta_SetAlbumID( p_meta, psz_albumid );
+            free( psz_albumid );
+        }
+
+        free( psz_desc );
+        i++;
+    }
+#endif
+    i = 0;
+
     while( ( p_frame = id3_tag_findframe( p_id3_tag , "T", i ) ) )
     {
         int i_strings = id3_field_getnstrings( &p_frame->fields[1] );
 
         while( i_strings > 0 )
         {
-            vlc_meta_t *p_meta = (vlc_meta_t *)(p_demux->p_private);
-
             char *psz_temp = id3_ucs4_utf8duplicate(
                 id3_field_getstrings( &p_frame->fields[1], --i_strings ) );
 
@@ -138,7 +190,7 @@ static void ParseID3Tag( demux_t *p_demux, uint8_t *p_data, int i_size )
             }
             else if( ID_IS ( "APIC" ) )
             {
-                fprintf( stderr, "** Has APIC **\n" );
+                msg_Dbg( p_demux, "** Has APIC **" );
             }
             else if( p_frame->description )
             { /* Unhandled meta*/