Taglib: use an extradata to store MB releases

diff --git a/include/vlc_meta.h b/include/vlc_meta.h
index 5dc8b1947330887b7a722b2b50997d97498248cb..bd7b3190915604b25a4ab554880806538b52ea68 100644 (file)
--- a/include/vlc_meta.h
+++ b/include/vlc_meta.h
@@ -160,5 +160,6 @@ VLC_API int input_item_WriteMeta(vlc_object_t *, input_item_t *);
 #define VLC_META_SHOW_NAME          vlc_meta_TypeToLocalizedString( vlc_meta_ShowName )
 #define VLC_META_ACTORS             vlc_meta_TypeToLocalizedString( vlc_meta_Actors )
 
+#define VLC_META_EXTRA_MB_ALBUMID   "MB_ALBUMID"
 
 #endif

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index f64c5dba300ed6ab844270ab449e2338f62a6094..c6e78de25be9cc391dfb531eb3c2a94f1a5979ac 100644 (file)
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -167,7 +167,11 @@ static void ReadMetaFromAPE( APE::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
 
 #define SET( keyName, metaName ) \
     item = tag->itemListMap()[keyName]; \
-    if( !item.isEmpty() ) vlc_meta_Set##metaName( p_meta, item.toString().toCString( true ) ); \
+    if( !item.isEmpty() ) vlc_meta_Set##metaName( p_meta, item.toString().toCString( true ) );
+
+#define SET_EXTRA( keyName, metaName ) \
+    item = tag->itemListMap()[keyName]; \
+    if( !item.isEmpty() ) vlc_meta_AddExtra( p_meta, metaName, item.toString().toCString( true ) );
 
     SET( "ALBUM", Album );
     SET( "ARTIST", Artist );
@@ -179,7 +183,10 @@ static void ReadMetaFromAPE( APE::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
     SET( "PUBLISHER", Publisher );
     SET( "MUSICBRAINZ_TRACKID", TrackID );
 
+    SET_EXTRA( "MUSICBRAINZ_ALBUMID", VLC_META_EXTRA_MB_ALBUMID );
+
 #undef SET
+#undef SET_EXTRA
 
     /* */
     item = tag->itemListMap()["TRACK"];
@@ -207,9 +214,18 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
         vlc_meta_Set##metaName( p_meta, list.front().toString().toCString( true ) ); \
     }
 
+#define SET_EXTRA( keyName, metaName )                                                     \
+    if( tag->attributeListMap().contains(keyName) )                                  \
+    {                                                                                \
+        list = tag->attributeListMap()[keyName];                                     \
+        vlc_meta_AddExtra( p_meta, metaName, list.front().toString().toCString( true ) ); \
+    }
+
     SET("MusicBrainz/Track Id", TrackID );
+    SET_EXTRA("MusicBrainz/Album Id", VLC_META_EXTRA_MB_ALBUMID );
 
 #undef SET
+#undef SET_EXTRA
 
 #ifdef TAGLIB_HAVE_ASFPICTURE_H
     // List the pictures
@@ -299,6 +315,11 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_meta_t* p_demux_meta, vlc_
             vlc_meta_Set( p_meta, vlc_meta_TrackTotal, p_txxx->fieldList().back().toCString( true ) );
             continue;
         }
+        if( !strcmp( p_txxx->description().toCString( true ), "MusicBrainz Album Id" ) )
+        {
+            vlc_meta_AddExtra( p_meta, VLC_META_EXTRA_MB_ALBUMID, p_txxx->fieldList().back().toCString( true ) );
+            continue;
+        }
         vlc_meta_AddExtra( p_meta, p_txxx->description().toCString( true ),
                            p_txxx->fieldList().back().toCString( true ) );
     }
@@ -449,6 +470,11 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_meta_t* p_demux_meta,
     if( !list.isEmpty() )                                                      \
         vlc_meta_Set##metaName( p_meta, (*list.begin()).toCString( true ) );
 
+#define SET_EXTRA( keyName, metaName ) \
+    list = tag->fieldListMap()[keyName]; \
+    if( !list.isEmpty() ) \
+        vlc_meta_AddExtra( p_meta, keyName, (*list.begin()).toCString( true ) );
+
     SET( "COPYRIGHT", Copyright );
     SET( "ORGANIZATION", Publisher );
     SET( "DATE", Date );
@@ -456,7 +482,10 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_meta_t* p_demux_meta,
     SET( "RATING", Rating );
     SET( "LANGUAGE", Language );
     SET( "MUSICBRAINZ_TRACKID", TrackID );
+
+    SET_EXTRA( "MUSICBRAINZ_ALBUMID", VLC_META_EXTRA_MB_ALBUMID );
 #undef SET
+#undef SET_EXTRA
 
     list = tag->fieldListMap()["TRACKNUMBER"];
     if( !list.isEmpty() )
@@ -560,10 +589,18 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
         list = tag->itemListMap()[keyName];                                                  \
         vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) );     \
     }
+#define SET_EXTRA( keyName, metaName )                                                   \
+    if( tag->itemListMap().contains(keyName) )                                  \
+    {                                                                                \
+        list = tag->itemListMap()[keyName];                                     \
+        vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+    }
 
     SET("----:com.apple.iTunes:MusicBrainz Track Id", TrackID );
+    SET_EXTRA("----:com.apple.iTunes:MusicBrainz Album Id", VLC_META_EXTRA_MB_ALBUMID );
 
 #undef SET
+#undef SET_EXTRA
 
     if( tag->itemListMap().contains("covr") )
     {