Merge branch 'work_tag' of git://github.com/loujine/MPD

NEWS

@@ -6,7 +6,7 @@ ver 0.21 (not yet released)
   - "outputset" sets runtime attributes
   - close connection when client sends HTTP request
 * tags
-  - new tag "OriginalDate"
+  - new tags "OriginalDate", "MUSICBRAINZ_WORKID"
 * decoder
   - gme: try loading m3u sidecar files
   - pcm: support audio/L24 (RFC 3190)

doc/include/tags.xml

@@ -153,4 +153,13 @@
       database.
     </para>
   </listitem>
+
+  <listitem>
+    <para>
+      <varname>musicbrainz_workid</varname>: the work id in the
+      <ulink
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
+      database.
+    </para>
+  </listitem>
 </itemizedlist>

src/output/plugins/RoarOutputPlugin.cxx

@@ -280,6 +280,7 @@ roar_tag_convert(TagType type, bool *is_uuid)
 		case TAG_MUSICBRAINZ_ALBUMARTISTID:
 		case TAG_MUSICBRAINZ_TRACKID:
 		case TAG_MUSICBRAINZ_RELEASETRACKID:
+		case TAG_MUSICBRAINZ_WORKID:
 			*is_uuid = true;
 			return "HASH";
 

src/tag/Id3MusicBrainz.cxx

@@ -30,5 +30,6 @@ const struct tag_table musicbrainz_txxx_tags[] = {
 	{ "MusicBrainz Track Id", TAG_MUSICBRAINZ_TRACKID },
 	{ "MusicBrainz Release Track Id",
 	  TAG_MUSICBRAINZ_RELEASETRACKID },
+	{ "MusicBrainz Work Id", TAG_MUSICBRAINZ_WORKID },
 	{ nullptr, TAG_NUM_OF_ITEM_TYPES }
 };

src/tag/Names.c

@@ -44,4 +44,5 @@ const char *const tag_item_names[TAG_NUM_OF_ITEM_TYPES] = {
 	[TAG_MUSICBRAINZ_ALBUMARTISTID] = "MUSICBRAINZ_ALBUMARTISTID",
 	[TAG_MUSICBRAINZ_TRACKID] = "MUSICBRAINZ_TRACKID",
 	[TAG_MUSICBRAINZ_RELEASETRACKID] = "MUSICBRAINZ_RELEASETRACKID",
+	[TAG_MUSICBRAINZ_WORKID] = "MUSICBRAINZ_WORKID",
 };

src/tag/Type.h

@@ -57,6 +57,7 @@ enum TagType
 	TAG_MUSICBRAINZ_ALBUMARTISTID,
 	TAG_MUSICBRAINZ_TRACKID,
 	TAG_MUSICBRAINZ_RELEASETRACKID,
+	TAG_MUSICBRAINZ_WORKID,
 
 	TAG_NUM_OF_ITEM_TYPES
 };