From bdda44d84958e6c66b4123ca34ad265ab5c889ba 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 19:27:35 +0200
Subject: [PATCH] Fix bindings of the tag merge functions

---
 gstreamer-sharp/Gstreamer.metadata |  7 ++++---
 gstreamer-sharp/Tag.custom         | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/gstreamer-sharp/Gstreamer.metadata b/gstreamer-sharp/Gstreamer.metadata
index 3b649087d4..06e85bd39c 100644
--- a/gstreamer-sharp/Gstreamer.metadata
+++ b/gstreamer-sharp/Gstreamer.metadata
@@ -451,8 +451,8 @@
   <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/class[@name='Tag']/method[@cname='gst_tag_merge_strings_with_comma']" name="hidden">1</attr>
+  <attr path="/api/namespace/class[@name='Tag']/method[@cname='gst_tag_merge_use_first']" name="hidden">1</attr>
   
   <attr path="/api/namespace/callback[@name='TagForeachFunc']" name="hidden">1</attr>
 
@@ -498,7 +498,8 @@
   <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/callback[@name='TagMergeFunc']/parameters/parameter[@name='dest']" name="pass_as">out</attr>
+  <attr path="/api/namespace/callback[@name='TagMergeFunc']/parameters/parameter[@name='src']" name="pass_as">ref</attr>
 
   <attr path="/api/namespace/struct[@name='TypeFind']/method[@name='Register']" name="hidden">1</attr>
 
diff --git a/gstreamer-sharp/Tag.custom b/gstreamer-sharp/Tag.custom
index 08ae51d172..aac51e121b 100644
--- a/gstreamer-sharp/Tag.custom
+++ b/gstreamer-sharp/Tag.custom
@@ -9,6 +9,20 @@ public static void Register (string name, Gst.TagFlags flag, System.Type type, s
   Register (name, flag, gt, nick, blurb, func);
 }
 
+		[DllImport("gstreamer-0.10.dll")]
+		static extern void gst_tag_merge_strings_with_comma(out GLib.Value dest, ref GLib.Value src);
+
+		public static void MergeStringsWithComma(out GLib.Value dest, ref GLib.Value src) {
+			gst_tag_merge_strings_with_comma(out dest, ref src);
+		}
+
+		[DllImport("gstreamer-0.10.dll")]
+		static extern void gst_tag_merge_use_first(out GLib.Value dest, ref GLib.Value src);
+
+		public static void MergeUseFirst(out GLib.Value dest, ref GLib.Value src) {
+			gst_tag_merge_use_first(out dest, ref src);
+		}
+
 public const string Title = "title";
 public const string TitleSortname = "title-sortname";
 public const string Artist = "artist";