[vlc-devel] [PATCH 3/3] meta_engine/taglib: Write MusicBrainz IDs

[Wieland Hoffmann]

---
 modules/meta_engine/taglib.cpp | 65 ++++++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 74f78b6..3e81a87 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -765,6 +765,8 @@ static void WriteMetaToAPE( APE::Tag* tag, input_item_t* p_item )
     WRITE( Copyright, "COPYRIGHT" );
     WRITE( Language, "LANGUAGE" );
     WRITE( Publisher, "PUBLISHER" );
+    WRITE( TrackID, "MUSICBRAINZ_TRACKID" );
+    WRITE( MusicBrainzAlbumID, "MUSICBRAINZ_ALBUMID" );
 
 #undef WRITE
 }
@@ -797,35 +799,42 @@ static void WriteMetaToId3v2( ID3v2::Tag* tag, input_item_t* p_item )
     WRITE( Publisher, "TPUB" );
 
 #undef WRITE
-    /* Track Total as Custom Field */
-    psz_meta = input_item_GetTrackTotal( p_item );
-    if ( psz_meta )
-    {
-        ID3v2::FrameList list = tag->frameListMap()["TXXX"];
-        ID3v2::UserTextIdentificationFrame *p_txxx;
-        for( ID3v2::FrameList::Iterator iter = list.begin(); iter != list.end(); iter++ )
-        {
-            p_txxx = dynamic_cast<ID3v2::UserTextIdentificationFrame*>(*iter);
-            if( !p_txxx )
-                continue;
-            if( !strcmp( p_txxx->description().toCString( true ), "TRACKTOTAL" ) )
-            {
-                p_txxx->setText( psz_meta );
-                FREENULL( psz_meta );
-                break;
-            }
-        }
-        if( psz_meta ) /* not found in existing custom fields */
-        {
-            ByteVector p_byte( "TXXX", 4 );
-            p_txxx = new ID3v2::UserTextIdentificationFrame( p_byte );
-            p_txxx->setDescription( "TRACKTOTAL" );
-            p_txxx->setText( psz_meta );
-            free( psz_meta );
-            tag->addFrame( p_txxx );
-        }
+    /* Known TXXX frames */
+    ID3v2::FrameList list = tag->frameListMap()["TXXX"];
+
+#define WRITETXXX( metaName, txxName )\
+    psz_meta = input_item_Get##metaName( p_item );                                       \
+    if ( psz_meta )                                                                      \
+    {                                                                                    \
+        ID3v2::UserTextIdentificationFrame *p_txxx;                                      \
+        for( ID3v2::FrameList::Iterator iter = list.begin(); iter != list.end(); iter++ )\
+        {                                                                                \
+            p_txxx = dynamic_cast<ID3v2::UserTextIdentificationFrame*>(*iter);           \
+            if( !p_txxx )                                                                \
+                continue;                                                                \
+            if( !strcmp( p_txxx->description().toCString( true ), txxName ) )            \
+            {                                                                            \
+                p_txxx->setText( psz_meta );                                             \
+                FREENULL( psz_meta );                                                    \
+                break;                                                                   \
+            }                                                                            \
+        }                                                                                \
+        if( psz_meta ) /* not found in existing custom fields */                         \
+        {                                                                                \
+            ByteVector p_byte( "TXXX", 4 );                                              \
+            p_txxx = new ID3v2::UserTextIdentificationFrame( p_byte );                   \
+            p_txxx->setDescription( txxName );                                           \
+            p_txxx->setText( psz_meta );                                                 \
+            free( psz_meta );                                                            \
+            tag->addFrame( p_txxx );                                                     \
+        }                                                                                \
     }
 
+    WRITETXXX( MusicBrainzAlbumID, "MusicBrainz Album Id");
+    WRITETXXX( TrackTotal, "TRACKTOTAL" );
+
+#undef WRITETXXX
+
     /* Write album art */
     char *psz_url = input_item_GetArtworkURL( p_item );
     if( psz_url == NULL )
@@ -924,6 +933,8 @@ static void WriteMetaToXiph( Ogg::XiphComment* tag, input_item_t* p_item )
     WRITE( EncodedBy, "ENCODER" );
     WRITE( Rating, "RATING" );
     WRITE( Language, "LANGUAGE" );
+    WRITE( TrackID, "MUSICBRAINZ_TRACKID" );
+    WRITE( MusicBrainzAlbumID, "MUSICBRAINZ_ALBUMID" );
 
 #undef WRITE
 }
-- 
1.8.5.3