From a23154fc2fc47c6664b0981780ac4324098fb4f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 21 Apr 2009 14:31:29 +0200
Subject: [PATCH] Complete/fix bindings for Gst.Tag and Gst.TagList

---
 doc/en/Gst/Structure.xml           |   2 +-
 doc/en/Gst/Tag.xml                 |  20 +-
 doc/en/Gst/TagForeachFunc.xml      |  23 --
 doc/en/Gst/TagList.xml             | 220 +------------
 doc/en/Gst/TagMergeFunc.xml        |   6 +-
 doc/en/Gst/Tags.xml                | 503 -----------------------------
 doc/en/index.xml                   |   2 -
 gstreamer-sharp/Gstreamer.metadata |  51 ++-
 gstreamer-sharp/Makefile.am        |   3 +-
 gstreamer-sharp/Tag.custom         |  11 +
 gstreamer-sharp/TagList.custom     | 112 +++++++
 gstreamer-sharp/glue/Makefile.am   |   1 +
 gstreamer-sharp/glue/taglist.c     |   6 +
 source/Makefile.am                 |   5 +
 14 files changed, 207 insertions(+), 758 deletions(-)
 delete mode 100644 doc/en/Gst/TagForeachFunc.xml
 delete mode 100644 doc/en/Gst/Tags.xml
 create mode 100644 gstreamer-sharp/TagList.custom
 create mode 100644 gstreamer-sharp/glue/taglist.c

diff --git a/doc/en/Gst/Structure.xml b/doc/en/Gst/Structure.xml
index 0ea00942e1..a4ab875d01 100644
--- a/doc/en/Gst/Structure.xml
+++ b/doc/en/Gst/Structure.xml
@@ -62,7 +62,7 @@
       <ReturnValue><ReturnType>Gst.Structure</ReturnType></ReturnValue>
       <Parameters />
       <Docs><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="Count"><MemberSignature Language="C#" Value="public int Count { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Int32</ReturnType></ReturnValue><Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member><Member MemberName="Fields"><MemberSignature Language="C#" Value="public System.Collections.IEnumerable Fields { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Collections.IEnumerable</ReturnType></ReturnValue><Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member><Member MemberName="FixateFieldBoolean">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="Count"><MemberSignature Language="C#" Value="public int Count { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Int32</ReturnType></ReturnValue><Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member><Member MemberName="Fields"><MemberSignature Language="C#" Value="public string[] Fields { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String[]</ReturnType></ReturnValue><Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member><Member MemberName="FixateFieldBoolean">
       <MemberSignature Language="C#" Value="public bool FixateFieldBoolean (string field_name, bool target);" />
       <MemberType>Method</MemberType>
       <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
diff --git a/doc/en/Gst/Tag.xml b/doc/en/Gst/Tag.xml
index 27a36c0c57..909f9c3248 100644
--- a/doc/en/Gst/Tag.xml
+++ b/doc/en/Gst/Tag.xml
@@ -28,13 +28,13 @@
       <MemberType>Constructor</MemberType>
       <Parameters />
       <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="Exists">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="Album"><MemberSignature Language="C#" Value="public const string Album;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="AlbumGain"><MemberSignature Language="C#" Value="public const string AlbumGain;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="AlbumPeak"><MemberSignature Language="C#" Value="public const string AlbumPeak;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="AlbumSortname"><MemberSignature Language="C#" Value="public const string AlbumSortname;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="AlbumVolumeCount"><MemberSignature Language="C#" Value="public const string AlbumVolumeCount;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="AlbumVolumeNumber"><MemberSignature Language="C#" Value="public const string AlbumVolumeNumber;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Artist"><MemberSignature Language="C#" Value="public const string Artist;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="ArtistSortname"><MemberSignature Language="C#" Value="public const string ArtistSortname;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Attachment"><MemberSignature Language="C#" Value="public const string Attachment;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="AudioCodec"><MemberSignature Language="C#" Value="public const string AudioCodec;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="BeatsPerMinute"><MemberSignature Language="C#" Value="public const string BeatsPerMinute;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Bitrate"><MemberSignature Language="C#" Value="public const string Bitrate;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Codec"><MemberSignature Language="C#" Value="public const string Codec;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Comment"><MemberSignature Language="C#" Value="public const string Comment;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Composer"><MemberSignature Language="C#" Value="public const string Composer;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Contact"><MemberSignature Language="C#" Value="public const string Contact;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Copyright"><MemberSignature Language="C#" Value="public const string Copyright;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="CopyrightUri"><MemberSignature Language="C#" Value="public const string CopyrightUri;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Date"><MemberSignature Language="C#" Value="public const string Date;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Description"><MemberSignature Language="C#" Value="public const string Description;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Duration"><MemberSignature Language="C#" Value="public const string Duration;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Encoder"><MemberSignature Language="C#" Value="public const string Encoder;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="EncoderVersion"><MemberSignature Language="C#" Value="public const string EncoderVersion;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Exists">
       <MemberSignature Language="C#" Value="public static bool Exists (string tag);" />
       <MemberType>Method</MemberType>
       <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
       <Parameters><Parameter Name="tag" Type="System.String" /></Parameters>
       <Docs><param name="tag">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetDescription">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="ExtendedComment"><MemberSignature Language="C#" Value="public const string ExtendedComment;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Genre"><MemberSignature Language="C#" Value="public const string Genre;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="GeoLocationElevation"><MemberSignature Language="C#" Value="public const string GeoLocationElevation;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="GeoLocationLatitude"><MemberSignature Language="C#" Value="public const string GeoLocationLatitude;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="GeoLocationLongitude"><MemberSignature Language="C#" Value="public const string GeoLocationLongitude;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="GeoLocationName"><MemberSignature Language="C#" Value="public const string GeoLocationName;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="GetDescription">
       <MemberSignature Language="C#" Value="public static string GetDescription (string tag);" />
       <MemberType>Method</MemberType>
       <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
@@ -52,23 +52,11 @@
       <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
       <Parameters><Parameter Name="tag" Type="System.String" /></Parameters>
       <Docs><param name="tag">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="IsFixed">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetType"><MemberSignature Language="C#" Value="public static Type GetType (string tag);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Type</ReturnType></ReturnValue><Parameters><Parameter Name="tag" Type="System.String" /></Parameters><Docs><param name="tag">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="Homepage"><MemberSignature Language="C#" Value="public const string Homepage;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Image"><MemberSignature Language="C#" Value="public const string Image;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="IsFixed">
       <MemberSignature Language="C#" Value="public static bool IsFixed (string tag);" />
       <MemberType>Method</MemberType>
       <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
       <Parameters><Parameter Name="tag" Type="System.String" /></Parameters>
       <Docs><param name="tag">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="MergeStringsWithComma">
-      <MemberSignature Language="C#" Value="public static void MergeStringsWithComma (GLib.Value dest, GLib.Value src);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="dest" Type="GLib.Value" /><Parameter Name="src" Type="GLib.Value" /></Parameters>
-      <Docs><param name="dest">To be added.</param><param name="src">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="MergeUseFirst">
-      <MemberSignature Language="C#" Value="public static void MergeUseFirst (GLib.Value dest, GLib.Value src);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="dest" Type="GLib.Value" /><Parameter Name="src" Type="GLib.Value" /></Parameters>
-      <Docs><param name="dest">To be added.</param><param name="src">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="Register"><MemberSignature Language="C#" Value="public static void Register (string name, Gst.TagFlags flag, GLib.GType type, string nick, string blurb, Gst.TagMergeFunc func);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue><Parameters><Parameter Name="name" Type="System.String" /><Parameter Name="flag" Type="Gst.TagFlags" /><Parameter Name="type" Type="GLib.GType" /><Parameter Name="nick" Type="System.String" /><Parameter Name="blurb" Type="System.String" /><Parameter Name="func" Type="Gst.TagMergeFunc" /></Parameters><Docs><param name="name">To be added.</param><param name="flag">To be added.</param><param name="type">To be added.</param><param name="nick">To be added.</param><param name="blurb">To be added.</param><param name="func">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member></Members>
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="Isrc"><MemberSignature Language="C#" Value="public const string Isrc;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Keywords"><MemberSignature Language="C#" Value="public const string Keywords;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="LanguageCode"><MemberSignature Language="C#" Value="public const string LanguageCode;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="License"><MemberSignature Language="C#" Value="public const string License;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="LicenseUri"><MemberSignature Language="C#" Value="public const string LicenseUri;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Location"><MemberSignature Language="C#" Value="public const string Location;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="MaximumBitrate"><MemberSignature Language="C#" Value="public const string MaximumBitrate;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="MergeStringsWithComma"><MemberSignature Language="C#" Value="public static void MergeStringsWithComma (ref GLib.Value dest, ref GLib.Value src);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue><Parameters><Parameter Name="dest" Type="GLib.Value&amp;" RefType="ref" /><Parameter Name="src" Type="GLib.Value&amp;" RefType="ref" /></Parameters><Docs><param name="dest">To be added.</param><param name="src">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="MergeUseFirst"><MemberSignature Language="C#" Value="public static void MergeUseFirst (ref GLib.Value dest, ref GLib.Value src);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue><Parameters><Parameter Name="dest" Type="GLib.Value&amp;" RefType="ref" /><Parameter Name="src" Type="GLib.Value&amp;" RefType="ref" /></Parameters><Docs><param name="dest">To be added.</param><param name="src">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="MinimumBitrate"><MemberSignature Language="C#" Value="public const string MinimumBitrate;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="NominalBitrate"><MemberSignature Language="C#" Value="public const string NominalBitrate;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Organization"><MemberSignature Language="C#" Value="public const string Organization;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Performer"><MemberSignature Language="C#" Value="public const string Performer;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="PreviewImage"><MemberSignature Language="C#" Value="public const string PreviewImage;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="ReferenceLevel"><MemberSignature Language="C#" Value="public const string ReferenceLevel;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Register"><MemberSignature Language="C#" Value="public static void Register (string name, Gst.TagFlags flag, GLib.GType type, string nick, string blurb, Gst.TagMergeFunc func);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue><Parameters><Parameter Name="name" Type="System.String" /><Parameter Name="flag" Type="Gst.TagFlags" /><Parameter Name="type" Type="GLib.GType" /><Parameter Name="nick" Type="System.String" /><Parameter Name="blurb" Type="System.String" /><Parameter Name="func" Type="Gst.TagMergeFunc" /></Parameters><Docs><param name="name">To be added.</param><param name="flag">To be added.</param><param name="type">To be added.</param><param name="nick">To be added.</param><param name="blurb">To be added.</param><param name="func">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Register"><MemberSignature Language="C#" Value="public static void Register (string name, Gst.TagFlags flag, Type type, string nick, string blurb, Gst.TagMergeFunc func);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue><Parameters><Parameter Name="name" Type="System.String" /><Parameter Name="flag" Type="Gst.TagFlags" /><Parameter Name="type" Type="System.Type" /><Parameter Name="nick" Type="System.String" /><Parameter Name="blurb" Type="System.String" /><Parameter Name="func" Type="Gst.TagMergeFunc" /></Parameters><Docs><param name="name">To be added.</param><param name="flag">To be added.</param><param name="type">To be added.</param><param name="nick">To be added.</param><param name="blurb">To be added.</param><param name="func">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Serial"><MemberSignature Language="C#" Value="public const string Serial;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="SubtitleCodec"><MemberSignature Language="C#" Value="public const string SubtitleCodec;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Title"><MemberSignature Language="C#" Value="public const string Title;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="TitleSortname"><MemberSignature Language="C#" Value="public const string TitleSortname;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="TrackCount"><MemberSignature Language="C#" Value="public const string TrackCount;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="TrackGain"><MemberSignature Language="C#" Value="public const string TrackGain;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="TrackNumber"><MemberSignature Language="C#" Value="public const string TrackNumber;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="TrackPeak"><MemberSignature Language="C#" Value="public const string TrackPeak;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Version"><MemberSignature Language="C#" Value="public const string Version;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="VideoCodec"><MemberSignature Language="C#" Value="public const string VideoCodec;" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String</ReturnType></ReturnValue><Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member></Members>
 </Type>
diff --git a/doc/en/Gst/TagForeachFunc.xml b/doc/en/Gst/TagForeachFunc.xml
deleted file mode 100644
index 282f261666..0000000000
--- a/doc/en/Gst/TagForeachFunc.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Type Name="TagForeachFunc" FullName="Gst.TagForeachFunc">
-  <TypeSignature Language="C#" Value="public delegate void TagForeachFunc(TagList list, string tag);" />
-  <AssemblyInfo>
-    <AssemblyName>gstreamer-sharp</AssemblyName>
-    <AssemblyVersion>0.9.5.99</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="list" Type="Gst.TagList" />
-    <Parameter Name="tag" Type="System.String" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="list">To be added.</param>
-    <param name="tag">To be added.</param>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gst/TagList.xml b/doc/en/Gst/TagList.xml
index bf0d9bb46c..14eda60125 100644
--- a/doc/en/Gst/TagList.xml
+++ b/doc/en/Gst/TagList.xml
@@ -46,7 +46,14 @@
     
     
     
-    <Member MemberName=".ctor">
+    
+    
+    
+    
+    
+    
+    
+  <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public TagList ();" />
       <MemberType>Constructor</MemberType>
       <Parameters />
@@ -56,204 +63,18 @@
       <MemberType>Constructor</MemberType>
       <Parameters><Parameter Name="raw" Type="System.IntPtr" /></Parameters>
       <Docs><param name="raw">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="AddValist">
-      <MemberSignature Language="C#" Value="public void AddValist (Gst.TagMergeMode mode, string tag, IntPtr var_args);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="mode" Type="Gst.TagMergeMode" /><Parameter Name="tag" Type="System.String" /><Parameter Name="var_args" Type="System.IntPtr" /></Parameters>
-      <Docs><param name="mode">To be added.</param><param name="tag">To be added.</param><param name="var_args">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="AddValistValues">
-      <MemberSignature Language="C#" Value="public void AddValistValues (Gst.TagMergeMode mode, string tag, IntPtr var_args);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="mode" Type="Gst.TagMergeMode" /><Parameter Name="tag" Type="System.String" /><Parameter Name="var_args" Type="System.IntPtr" /></Parameters>
-      <Docs><param name="mode">To be added.</param><param name="tag">To be added.</param><param name="var_args">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="Copy">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="Add"><MemberSignature Language="C#" Value="public void Add (Gst.TagMergeMode mode, object[] parameters);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue><Parameters><Parameter Name="mode" Type="Gst.TagMergeMode" /><Parameter Name="parameters" Type="System.Object[]"><Attributes><Attribute><AttributeName>System.ParamArray</AttributeName></Attribute></Attributes></Parameter></Parameters><Docs><param name="mode">To be added.</param><param name="parameters">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Add"><MemberSignature Language="C#" Value="public void Add (Gst.TagMergeMode mode, string tag, object value);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue><Parameters><Parameter Name="mode" Type="Gst.TagMergeMode" /><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.Object" /></Parameters><Docs><param name="mode">To be added.</param><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="Copy">
       <MemberSignature Language="C#" Value="public Gst.TagList Copy ();" />
       <MemberType>Method</MemberType>
       <ReturnValue><ReturnType>Gst.TagList</ReturnType></ReturnValue>
       <Parameters />
       <Docs><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="CopyValue">
-      <MemberSignature Language="C#" Value="public static bool CopyValue (ref GLib.Value dest, Gst.TagList list, string tag);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="dest" Type="GLib.Value&amp;" RefType="ref" /><Parameter Name="list" Type="Gst.TagList" /><Parameter Name="tag" Type="System.String" /></Parameters>
-      <Docs><param name="dest">To be added.</param><param name="list">To be added.</param><param name="tag">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="Foreach">
-      <MemberSignature Language="C#" Value="public void Foreach (Gst.TagForeachFunc func);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="func" Type="Gst.TagForeachFunc" /></Parameters>
-      <Docs><param name="func">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetBoolean">
-      <MemberSignature Language="C#" Value="public bool GetBoolean (string tag, out bool value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.Boolean&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetBooleanIndex">
-      <MemberSignature Language="C#" Value="public bool GetBooleanIndex (string tag, uint index, out bool value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.Boolean&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetBuffer"><MemberSignature Language="C#" Value="public bool GetBuffer (string tag, Gst.Buffer value);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue><Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="Gst.Buffer" /></Parameters><Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="GetBufferIndex"><MemberSignature Language="C#" Value="public bool GetBufferIndex (string tag, uint index, Gst.Buffer value);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue><Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="Gst.Buffer" /></Parameters><Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="GetChar">
-      <MemberSignature Language="C#" Value="public bool GetChar (string tag, out string value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.String&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetCharIndex">
-      <MemberSignature Language="C#" Value="public bool GetCharIndex (string tag, uint index, out string value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.String&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetDouble">
-      <MemberSignature Language="C#" Value="public bool GetDouble (string tag, out double value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.Double&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetDoubleIndex">
-      <MemberSignature Language="C#" Value="public bool GetDoubleIndex (string tag, uint index, out double value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.Double&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetFloat">
-      <MemberSignature Language="C#" Value="public bool GetFloat (string tag, out float value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.Single&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetFloatIndex">
-      <MemberSignature Language="C#" Value="public bool GetFloatIndex (string tag, uint index, out float value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.Single&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetInt">
-      <MemberSignature Language="C#" Value="public bool GetInt (string tag, out int value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.Int32&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetInt64">
-      <MemberSignature Language="C#" Value="public bool GetInt64 (string tag, out long value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.Int64&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetInt64Index">
-      <MemberSignature Language="C#" Value="public bool GetInt64Index (string tag, uint index, out long value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.Int64&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetIntIndex">
-      <MemberSignature Language="C#" Value="public bool GetIntIndex (string tag, uint index, out int value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.Int32&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetLong">
-      <MemberSignature Language="C#" Value="public bool GetLong (string tag, out long value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.Int64&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetLongIndex">
-      <MemberSignature Language="C#" Value="public bool GetLongIndex (string tag, uint index, out long value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.Int64&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetPointer">
-      <MemberSignature Language="C#" Value="public bool GetPointer (string tag, IntPtr value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.IntPtr" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetPointerIndex">
-      <MemberSignature Language="C#" Value="public bool GetPointerIndex (string tag, uint index, IntPtr value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.IntPtr" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetString">
-      <MemberSignature Language="C#" Value="public bool GetString (string tag, out string value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.String&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetStringIndex">
-      <MemberSignature Language="C#" Value="public bool GetStringIndex (string tag, uint index, out string value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.String&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetTagSize">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetTag"><MemberSignature Language="C#" Value="public Gst.List GetTag (string tag);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.List</ReturnType></ReturnValue><Parameters><Parameter Name="tag" Type="System.String" /></Parameters><Docs><param name="tag">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="GetTagSize">
       <MemberSignature Language="C#" Value="public uint GetTagSize (string tag);" />
       <MemberType>Method</MemberType>
       <ReturnValue><ReturnType>System.UInt32</ReturnType></ReturnValue>
       <Parameters><Parameter Name="tag" Type="System.String" /></Parameters>
       <Docs><param name="tag">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetUchar">
-      <MemberSignature Language="C#" Value="public bool GetUchar (string tag, out byte value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.Byte&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetUcharIndex">
-      <MemberSignature Language="C#" Value="public bool GetUcharIndex (string tag, uint index, out byte value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.Byte&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetUint">
-      <MemberSignature Language="C#" Value="public bool GetUint (string tag, out uint value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.UInt32&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetUint64">
-      <MemberSignature Language="C#" Value="public bool GetUint64 (string tag, out ulong value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.UInt64&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetUint64Index">
-      <MemberSignature Language="C#" Value="public bool GetUint64Index (string tag, uint index, out ulong value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.UInt64&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetUintIndex">
-      <MemberSignature Language="C#" Value="public bool GetUintIndex (string tag, uint index, out uint value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.UInt32&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetUlong">
-      <MemberSignature Language="C#" Value="public bool GetUlong (string tag, out ulong value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="System.UInt64&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetUlongIndex">
-      <MemberSignature Language="C#" Value="public bool GetUlongIndex (string tag, uint index, out ulong value);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.UInt64&amp;" RefType="out" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetValueIndex">
-      <MemberSignature Language="C#" Value="public GLib.Value GetValueIndex (string tag, uint index);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>GLib.Value</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /></Parameters>
-      <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GType">
       <MemberSignature Language="C#" Value="public static GLib.GType GType { get; }" />
       <MemberType>Property</MemberType>
@@ -265,7 +86,7 @@
       <ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue>
       <Parameters><Parameter Name="from" Type="Gst.TagList" /><Parameter Name="mode" Type="Gst.TagMergeMode" /></Parameters>
       <Docs><param name="from">To be added.</param><param name="mode">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="IsEmpty"><MemberSignature Language="C#" Value="public bool IsEmpty { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue><Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member><Member MemberName="Merge">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="IsEmpty"><MemberSignature Language="C#" Value="public bool IsEmpty { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue><Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member><Member MemberName="Item"><MemberSignature Language="C#" Value="public object this[string tag] { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Object</ReturnType></ReturnValue><Parameters><Parameter Name="tag" Type="System.String" /></Parameters><Docs><param name="tag">To be added.</param><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member><Member MemberName="Item"><MemberSignature Language="C#" Value="public object this[string tag, uint index] { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Object</ReturnType></ReturnValue><Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /></Parameters><Docs><param name="tag">To be added.</param><param name="index">To be added.</param><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member><Member MemberName="Merge">
       <MemberSignature Language="C#" Value="public Gst.TagList Merge (Gst.TagList list2, Gst.TagMergeMode mode);" />
       <MemberType>Method</MemberType>
       <ReturnValue><ReturnType>Gst.TagList</ReturnType></ReturnValue>
@@ -277,17 +98,10 @@
       <ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue>
       <Parameters><Parameter Name="tag" Type="System.String" /></Parameters>
       <Docs><param name="tag">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="Type">
-      <MemberSignature Language="C#" Value="public GLib.GType Type { set; get; }" />
-      <MemberType>Property</MemberType>
-      <ReturnValue><ReturnType>GLib.GType</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member>
-    
-    
-    
-    
-    
-    
-  </Members>
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="Size"><MemberSignature Language="C#" Value="public int Size { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Int32</ReturnType></ReturnValue><Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member><Member MemberName="Tags"><MemberSignature Language="C#" Value="public string[] Tags { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.String[]</ReturnType></ReturnValue><Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member></Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>System.Reflection.DefaultMember("Item")</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/TagMergeFunc.xml b/doc/en/Gst/TagMergeFunc.xml
index add0ddf005..ad29cf6d13 100644
--- a/doc/en/Gst/TagMergeFunc.xml
+++ b/doc/en/Gst/TagMergeFunc.xml
@@ -1,5 +1,5 @@
 <Type Name="TagMergeFunc" FullName="Gst.TagMergeFunc">
-  <TypeSignature Language="C#" Value="public delegate void TagMergeFunc(Value dest, Value src);" />
+  <TypeSignature Language="C#" Value="public delegate void TagMergeFunc(ref Value dest, ref Value src);" />
   <AssemblyInfo>
     <AssemblyName>gstreamer-sharp</AssemblyName>
     <AssemblyVersion>0.9.5.99</AssemblyVersion>
@@ -8,8 +8,8 @@
     <BaseTypeName>System.Delegate</BaseTypeName>
   </Base>
   <Parameters>
-    <Parameter Name="dest" Type="GLib.Value" />
-    <Parameter Name="src" Type="GLib.Value" />
+    <Parameter Name="dest" Type="GLib.Value&amp;" RefType="ref" />
+    <Parameter Name="src" Type="GLib.Value&amp;" RefType="ref" />
   </Parameters>
   <ReturnValue>
     <ReturnType>System.Void</ReturnType>
diff --git a/doc/en/Gst/Tags.xml b/doc/en/Gst/Tags.xml
deleted file mode 100644
index 6311f4a7b2..0000000000
--- a/doc/en/Gst/Tags.xml
+++ /dev/null
@@ -1,503 +0,0 @@
-<Type Name="Tags" FullName="Gst.Tags">
-  <TypeSignature Language="C#" Value="public static class Tags" />
-  <AssemblyInfo>
-    <AssemblyName>gstreamer-sharp</AssemblyName>
-    <AssemblyVersion>0.9.5.99</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-  <Members>
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    <Member MemberName="Album">
-      <MemberSignature Language="C#" Value="public const string Album;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="AlbumGain">
-      <MemberSignature Language="C#" Value="public const string AlbumGain;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="AlbumPeak">
-      <MemberSignature Language="C#" Value="public const string AlbumPeak;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="AlbumSortname">
-      <MemberSignature Language="C#" Value="public const string AlbumSortname;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="AlbumVolumeCount">
-      <MemberSignature Language="C#" Value="public const string AlbumVolumeCount;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="AlbumVolumeNumber">
-      <MemberSignature Language="C#" Value="public const string AlbumVolumeNumber;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Artist">
-      <MemberSignature Language="C#" Value="public const string Artist;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="ArtistSortname">
-      <MemberSignature Language="C#" Value="public const string ArtistSortname;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Attachment">
-      <MemberSignature Language="C#" Value="public const string Attachment;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="AudioCodec">
-      <MemberSignature Language="C#" Value="public const string AudioCodec;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="BeatsPerMinute">
-      <MemberSignature Language="C#" Value="public const string BeatsPerMinute;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Bitrate">
-      <MemberSignature Language="C#" Value="public const string Bitrate;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Codec">
-      <MemberSignature Language="C#" Value="public const string Codec;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Comment">
-      <MemberSignature Language="C#" Value="public const string Comment;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Composer">
-      <MemberSignature Language="C#" Value="public const string Composer;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Contact">
-      <MemberSignature Language="C#" Value="public const string Contact;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Copyright">
-      <MemberSignature Language="C#" Value="public const string Copyright;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="CopyrightUri">
-      <MemberSignature Language="C#" Value="public const string CopyrightUri;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Date">
-      <MemberSignature Language="C#" Value="public const string Date;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Description">
-      <MemberSignature Language="C#" Value="public const string Description;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Duration">
-      <MemberSignature Language="C#" Value="public const string Duration;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Encoder">
-      <MemberSignature Language="C#" Value="public const string Encoder;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="EncoderVersion">
-      <MemberSignature Language="C#" Value="public const string EncoderVersion;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="ExtendedComment">
-      <MemberSignature Language="C#" Value="public const string ExtendedComment;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Genre">
-      <MemberSignature Language="C#" Value="public const string Genre;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="GeoLocationElevation">
-      <MemberSignature Language="C#" Value="public const string GeoLocationElevation;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="GeoLocationLatitude">
-      <MemberSignature Language="C#" Value="public const string GeoLocationLatitude;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="GeoLocationLongitude">
-      <MemberSignature Language="C#" Value="public const string GeoLocationLongitude;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="GeoLocationName">
-      <MemberSignature Language="C#" Value="public const string GeoLocationName;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Homepage">
-      <MemberSignature Language="C#" Value="public const string Homepage;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Image">
-      <MemberSignature Language="C#" Value="public const string Image;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Isrc">
-      <MemberSignature Language="C#" Value="public const string Isrc;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Keywords">
-      <MemberSignature Language="C#" Value="public const string Keywords;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="LanguageCode">
-      <MemberSignature Language="C#" Value="public const string LanguageCode;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="License">
-      <MemberSignature Language="C#" Value="public const string License;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="LicenseUri">
-      <MemberSignature Language="C#" Value="public const string LicenseUri;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Location">
-      <MemberSignature Language="C#" Value="public const string Location;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="MaximumBitrate">
-      <MemberSignature Language="C#" Value="public const string MaximumBitrate;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="MinimumBitrate">
-      <MemberSignature Language="C#" Value="public const string MinimumBitrate;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="NominalBitrate">
-      <MemberSignature Language="C#" Value="public const string NominalBitrate;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Organization">
-      <MemberSignature Language="C#" Value="public const string Organization;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Performer">
-      <MemberSignature Language="C#" Value="public const string Performer;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="PreviewImage">
-      <MemberSignature Language="C#" Value="public const string PreviewImage;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="ReferenceLevel">
-      <MemberSignature Language="C#" Value="public const string ReferenceLevel;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Serial">
-      <MemberSignature Language="C#" Value="public const string Serial;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="SubtitleCodec">
-      <MemberSignature Language="C#" Value="public const string SubtitleCodec;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Title">
-      <MemberSignature Language="C#" Value="public const string Title;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="TitleSortname">
-      <MemberSignature Language="C#" Value="public const string TitleSortname;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="TrackCount">
-      <MemberSignature Language="C#" Value="public const string TrackCount;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="TrackGain">
-      <MemberSignature Language="C#" Value="public const string TrackGain;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="TrackNumber">
-      <MemberSignature Language="C#" Value="public const string TrackNumber;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="TrackPeak">
-      <MemberSignature Language="C#" Value="public const string TrackPeak;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Version">
-      <MemberSignature Language="C#" Value="public const string Version;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="VideoCodec">
-      <MemberSignature Language="C#" Value="public const string VideoCodec;" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>System.String</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/doc/en/index.xml b/doc/en/index.xml
index f4f1a40769..fe5aaab8a8 100644
--- a/doc/en/index.xml
+++ b/doc/en/index.xml
@@ -179,11 +179,9 @@
       <Type Name="SystemClock" Kind="Class" />
       <Type Name="Tag" Kind="Class" />
       <Type Name="TagFlags" Kind="Enumeration" />
-      <Type Name="TagForeachFunc" Kind="Delegate" />
       <Type Name="TagList" Kind="Class" />
       <Type Name="TagMergeFunc" Kind="Delegate" />
       <Type Name="TagMergeMode" Kind="Enumeration" />
-      <Type Name="Tags" Kind="Class" />
       <Type Name="TagSetter" Kind="Interface" />
       <Type Name="TagSetterAdapter" Kind="Class" />
       <Type Name="TagSetterImplementor" Kind="Interface" />
diff --git a/gstreamer-sharp/Gstreamer.metadata b/gstreamer-sharp/Gstreamer.metadata
index f92421806c..3b649087d4 100644
--- a/gstreamer-sharp/Gstreamer.metadata
+++ b/gstreamer-sharp/Gstreamer.metadata
@@ -451,15 +451,54 @@
   <attr path="/api/namespace/object[@name='Task']/field[@name='Func']" name="hidden">1</attr>
 
   <attr path="/api/namespace/class[@name='Tag']" name="disable_void_ctor">1</attr>
+  <attr path="/api/namespace/class[@name='Tag']/method[@cname='gst_tag_merge_strings_with_comma']/parameters/parameter" name="pass_as">ref</attr>
+  <attr path="/api/namespace/class[@name='Tag']/method[@cname='gst_tag_merge_use_first']/parameters/parameter" name="pass_as">ref</attr>
+  
+  <attr path="/api/namespace/callback[@name='TagForeachFunc']" name="hidden">1</attr>
 
   <attr path="/api/namespace/enum[@name='TagFlag']" name="name">TagFlags</attr>
 
-  <attr path="/api/namespace/boxed[@name='TagList']/method[@name='CopyValue']/*/*[@name='dest']" name="pass_as">ref</attr>
-  <attr path="/api/namespace/boxed[@name='TagList']/method[@name='GetString']/*/*[@name='value']" name="pass_as">out</attr>
-  <attr path="/api/namespace/boxed[@name='TagList']/method[@name='GetStringIndex']/*/*[@name='value']" name="pass_as">out</attr>
-  <attr path="/api/namespace/boxed[@name='TagList']/method[@name='GetChar']/*/*[@name='value']" name="pass_as">out</attr>
-  <attr path="/api/namespace/boxed[@name='TagList']/method[@name='GetCharIndex']/*/*[@name='value']" name="pass_as">out</attr>
-  <attr path="/api/namespace/boxed[@name='TagList']/method[@name='GetUlong']/*/*[@name='value']" name="pass_as">out</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/field[@name='Type']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_add']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_add_valist']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_add_values']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_add_valist_values']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_foreach']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_char']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_char_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_uchar']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_uchar_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_boolean']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_boolean_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_int']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_int_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_uint']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_uint_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_long']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_long_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_ulong']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_ulong_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_int64']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_int64_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_uint64']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_uint64_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_float']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_float_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_double']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_double_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_string']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_string_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_pointer']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_pointer_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_date']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_date_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_buffer']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_buffer_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_get_value_index']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_copy_value']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@name='TagList']/method[@cname='gst_tag_list_merge']/return-type" name="owned">true</attr>
+
+  <attr path="/api/namespace/callback[@name='TagMergeFunc']/parameters/parameter" name="pass_as">ref</attr>
 
   <attr path="/api/namespace/struct[@name='TypeFind']/method[@name='Register']" name="hidden">1</attr>
 
diff --git a/gstreamer-sharp/Makefile.am b/gstreamer-sharp/Makefile.am
index 21b178543d..ca6259ce8b 100644
--- a/gstreamer-sharp/Makefile.am
+++ b/gstreamer-sharp/Makefile.am
@@ -66,7 +66,8 @@ customs = 			\
 	MiniObject.custom       \
 	Registry.custom         \
 	Structure.custom        \
-	Tag.custom
+	Tag.custom		\
+	TagList.custom
 
 build_customs = $(addprefix $(srcdir)/, $(customs))
 
diff --git a/gstreamer-sharp/Tag.custom b/gstreamer-sharp/Tag.custom
index 62c19c7856..08ae51d172 100644
--- a/gstreamer-sharp/Tag.custom
+++ b/gstreamer-sharp/Tag.custom
@@ -1,3 +1,14 @@
+public static System.Type GetType (string tag) {
+  GLib.GType gt = GetGType (tag);
+  return (Type) gt;
+}
+
+public static void Register (string name, Gst.TagFlags flag, System.Type type, string nick, string blurb, Gst.TagMergeFunc func) {
+  GLib.GType gt = (GLib.GType) (type);
+
+  Register (name, flag, gt, nick, blurb, func);
+}
+
 public const string Title = "title";
 public const string TitleSortname = "title-sortname";
 public const string Artist = "artist";
diff --git a/gstreamer-sharp/TagList.custom b/gstreamer-sharp/TagList.custom
new file mode 100644
index 0000000000..7f1f0d2f0a
--- /dev/null
+++ b/gstreamer-sharp/TagList.custom
@@ -0,0 +1,112 @@
+[DllImport ("gstreamer-0.10.dll") ]
+static extern IntPtr gst_structure_to_string (IntPtr handle);
+
+public override string ToString () {
+  IntPtr raw_ret = gst_structure_to_string (Handle);
+  string ret = GLib.Marshaller.PtrToStringGFree (raw_ret);
+  return ret;
+}
+
+[DllImport ("gstreamer-0.10.dll") ]
+static extern int gst_structure_n_fields (IntPtr raw);
+
+public int Size {
+  get {
+    int raw_ret = gst_structure_n_fields (Handle);
+    int ret = raw_ret;
+    return ret;
+  }
+}
+
+[DllImport ("gstreamer-0.10.dll") ]
+static extern bool gst_tag_list_copy_value (ref GLib.Value dest, IntPtr list, string tag);
+[DllImport ("gstreamer-0.10.dll") ]
+static extern IntPtr gst_tag_list_get_value_index (IntPtr raw, string tag, uint index);
+
+public object this[string tag, uint index] {
+  get {
+    IntPtr raw_ret = gst_tag_list_get_value_index (Handle, tag, index);
+    if (raw_ret == IntPtr.Zero)
+      return null;
+
+    GLib.Value v = (GLib.Value) Marshal.PtrToStructure (raw_ret, typeof (GLib.Value));
+
+    return (object) v.Val;
+  }
+}
+
+public object this[string tag] {
+  get {
+    GLib.Value v = GLib.Value.Empty;
+    bool success;
+
+    success = gst_tag_list_copy_value (ref v, Handle, tag);
+
+    if (!success)
+      return null;
+
+    object ret = (object) v.Val;
+    v.Dispose ();
+
+    return ret;
+  }
+}
+
+[DllImport ("gstreamersharpglue-0.10") ]
+static extern void gstsharp_gst_tag_list_add_value (IntPtr list, Gst.TagMergeMode mode, string tag, ref GLib.Value v);
+
+public void Add (Gst.TagMergeMode mode, string tag, object value) {
+  if (!Tag.Exists (tag))
+    throw new ArgumentException (String.Format ("Invalid tag name '{0}'", tag));
+
+  GLib.Value v = new GLib.Value (value);
+
+  gstsharp_gst_tag_list_add_value (Handle, mode, tag, ref v);
+}
+
+public void Add (Gst.TagMergeMode mode, params object[] parameters) {
+  if (parameters.Length % 2 != 0)
+    throw new ArgumentException ();
+
+  for (int i = 0; i < parameters.Length; i += 2) {
+    if (parameters[i].GetType () != typeof (string))
+      throw new ArgumentException ();
+
+    Add (mode, parameters[i] as string, parameters[i+1]);
+  }
+}
+
+[DllImport ("gstreamer-0.10.dll") ]
+static extern IntPtr gst_structure_nth_field_name (IntPtr raw, uint index);
+
+private string NthFieldName (uint index) {
+  IntPtr raw_ret = gst_structure_nth_field_name (Handle, index);
+  string ret = GLib.Marshaller.Utf8PtrToString (raw_ret);
+  return ret;
+}
+
+public string[] Tags {
+  get {
+    string[] tags = new string[Size];
+    for (uint i = 0; i < Size; i++)
+      tags[i] = NthFieldName (i);
+
+    return tags;
+  }
+}
+
+[DllImport ("gstreamer-0.10.dll") ]
+static extern IntPtr gst_structure_get_value (IntPtr raw, string fieldname);
+
+public Gst.List GetTag (string tag) {
+  IntPtr raw_ret = gst_structure_get_value (Handle, tag);
+  GLib.Value ret = (GLib.Value) Marshal.PtrToStructure (raw_ret, typeof (GLib.Value));
+
+  object o = ret.Val;
+
+  if (o.GetType () == typeof (Gst.List))
+    return (Gst.List) o;
+
+  return new Gst.List (new object[] { o });
+}
+
diff --git a/gstreamer-sharp/glue/Makefile.am b/gstreamer-sharp/glue/Makefile.am
index 505c5487a9..776488bece 100644
--- a/gstreamer-sharp/glue/Makefile.am
+++ b/gstreamer-sharp/glue/Makefile.am
@@ -7,6 +7,7 @@ libgstreamersharpglue_0_10_la_SOURCES =	\
 	message.c \
 	bin.c \
 	structure.c \
+	taglist.c \
 	gobject.c
 
 nodist_libgstreamersharpglue_0_10_la_SOURCES = generated.c 
diff --git a/gstreamer-sharp/glue/taglist.c b/gstreamer-sharp/glue/taglist.c
new file mode 100644
index 0000000000..db6aa603ce
--- /dev/null
+++ b/gstreamer-sharp/glue/taglist.c
@@ -0,0 +1,6 @@
+#include <gst/gst.h>
+
+void
+gstsharp_gst_tag_list_add_value (GstTagList *list, GstTagMergeMode mode, const gchar * tag, const GValue *v) {
+  gst_tag_list_add_values (list, mode, tag, v, NULL);
+}
diff --git a/source/Makefile.am b/source/Makefile.am
index 9944dbb672..4855603457 100644
--- a/source/Makefile.am
+++ b/source/Makefile.am
@@ -2,6 +2,11 @@ MAINTAINERCLEANFILES = Makefile.in
 
 api:
 	$(GAPI_PARSER) gstreamer-sharp-source.xml
+	grep -v "public const string " \
+		$(top_srcdir)/gstreamer-sharp/Tag.custom \
+		> $(top_srcdir)/gstreamer-sharp/Tag.custom.tmp
+	mv $(top_srcdir)/gstreamer-sharp/Tag.custom.tmp \
+		$(top_srcdir)/gstreamer-sharp/Tag.custom
 	$(MONO) $(top_builddir)/parser/gst-generate-tags.exe \
 		--header=../../gstreamer/gst/gsttaglist.h \
 		--namespace=Gst \