From 5988e1ad3955b77cc4f15fb0222bf138c28d2349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Thu, 7 May 2009 10:39:38 +0200
Subject: [PATCH] Update API fixups for the latest protected-fields patch

---
 doc/en/Gst/Element.xml             | 10 +--------
 doc/en/Gst/Pad.xml                 | 10 +--------
 doc/en/Gst/Task.xml                | 12 ++---------
 gstreamer-sharp/Gstreamer.metadata | 34 ++++++------------------------
 gstreamer-sharp/Task.custom        | 13 ------------
 gstreamer-sharp/glue/task.c        |  5 -----
 6 files changed, 11 insertions(+), 73 deletions(-)

diff --git a/doc/en/Gst/Element.xml b/doc/en/Gst/Element.xml
index 80a4c2719c..748c405afd 100644
--- a/doc/en/Gst/Element.xml
+++ b/doc/en/Gst/Element.xml
@@ -193,15 +193,7 @@
       <ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue>
       <Parameters />
       <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="CurrentState">
-      <MemberSignature Language="C#" Value="public Gst.State CurrentState { get; }" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>Gst.State</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Factory">
+    </Member><Member MemberName="CurrentState"><MemberSignature Language="C#" Value="public Gst.State CurrentState { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.State</ReturnType></ReturnValue><Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member><Member MemberName="Factory">
       <MemberSignature Language="C#" Value="public Gst.ElementFactory Factory { get; }" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
diff --git a/doc/en/Gst/Pad.xml b/doc/en/Gst/Pad.xml
index 677af73342..196f54b652 100644
--- a/doc/en/Gst/Pad.xml
+++ b/doc/en/Gst/Pad.xml
@@ -349,15 +349,7 @@
       </AssemblyInfo>
       <ReturnValue><ReturnType>Gst.PadLinkFunction</ReturnType></ReturnValue>
       <Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Mode">
-      <MemberSignature Language="C#" Value="public Gst.ActivateMode Mode { get; }" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>0.9.5.99</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue><ReturnType>Gst.ActivateMode</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="NegotiatedCaps">
+    </Member><Member MemberName="Mode"><MemberSignature Language="C#" Value="public Gst.ActivateMode Mode { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.ActivateMode</ReturnType></ReturnValue><Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member><Member MemberName="NegotiatedCaps">
       <MemberSignature Language="C#" Value="public Gst.Caps NegotiatedCaps { get; }" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
diff --git a/doc/en/Gst/Task.xml b/doc/en/Gst/Task.xml
index a97c3a77a3..78eb61c776 100644
--- a/doc/en/Gst/Task.xml
+++ b/doc/en/Gst/Task.xml
@@ -39,7 +39,7 @@
       </AssemblyInfo>
       <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>
-    </Member><Member MemberName="GType">
+    </Member><Member MemberName="Data"><MemberSignature Language="C#" Value="public System.Collections.Hashtable Data { get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion><AssemblyVersion>2.14.0.0</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Collections.Hashtable</ReturnType></ReturnValue><Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs></Member><Member MemberName="GType">
       <MemberSignature Language="C#" Value="public static GLib.GType GType { get; }" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
@@ -47,14 +47,6 @@
       </AssemblyInfo>
       <ReturnValue><ReturnType>GLib.GType</ReturnType></ReturnValue>
       <Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="IsRunning">
-      <MemberSignature Language="C#" Value="public bool IsRunning { 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="Join">
       <MemberSignature Language="C#" Value="public bool Join ();" />
       <MemberType>Method</MemberType>
@@ -73,7 +65,7 @@
       <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
       <Parameters />
       <Docs><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    </Member><Member MemberName="Signal">
+    </Member><Member MemberName="Running"><MemberSignature Language="C#" Value="public bool Running { 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="Signal">
       <MemberSignature Language="C#" Value="public void Signal ();" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
diff --git a/gstreamer-sharp/Gstreamer.metadata b/gstreamer-sharp/Gstreamer.metadata
index fcde966fc8..1b14a3fea8 100644
--- a/gstreamer-sharp/Gstreamer.metadata
+++ b/gstreamer-sharp/Gstreamer.metadata
@@ -27,9 +27,9 @@
   <attr path="/api/namespace/*/field[@array_len='GST_PADDING - 3']" name="array_len">3</attr>
   <attr path="/api/namespace/*/field[@array_len='GST_PADDING - 4']" name="array_len">0</attr>
 
+  <attr path="/api/namespace/object[@name='Bin']/field" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Bin']/method[@cname='gst_bin_add_many']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Bin']/method[@cname='gst_bin_remove_many']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@name='Bin']/field" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Bin']/method[@cname='gst_bin_add']" name="hidden">1</attr> 
   <attr path="/api/namespace/object[@name='Bin']/method[@cname='gst_bin_find_unconnected_pad']" name="hidden">1</attr> 
   <attr path="/api/namespace/object[@name='Bin']/method[@cname='gst_bin_get_by_name']/return-type" name="owned">true</attr> 
@@ -79,8 +79,6 @@
   <attr path="/api/namespace/enum[@name='BufferFlags']/member[@cname='GST_BUFFER_FLAG_MEDIA3']" name="value">MiniObjectFlags.Last &lt;&lt; 7</attr>
   <attr path="/api/namespace/enum[@name='BufferFlags']/member[@cname='GST_BUFFER_FLAG_LAST']" name="value">MiniObjectFlags.Last &lt;&lt; 8</attr>
 
-  <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
-  <attr path="/api/namespace/object[@name='Bus']/field" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Bus']/method[@cname='gst_bus_post']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Bus']/method[@cname='gst_bus_peek']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/object[@name='Bus']/method[@cname='gst_bus_pop']/return-type" name="owned">true</attr>
@@ -189,8 +187,6 @@
   <attr path="/api/namespace/object[@name='Clock']/field[@name='ClockID']" name="readable">true</attr>
   <attr path="/api/namespace/object[@name='Clock']/field[@name='ClockID']" name="writeable">true</attr>
   <attr path="/api/namespace/object[@name='Clock']/field[@name='Times']" name="hidden">1</attr>
-  <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
-  <attr path="/api/namespace/object[@name='Clock']/field[@name='Resolution']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Clock']/virtual_method[@name='Wait']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Clock']/method[@cname='gst_clock_set_master']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Clock']/method[@cname='gst_clock_get_master']" name="hidden">1</attr>
@@ -267,8 +263,9 @@
 
   <attr path="/api/namespace/class[@name='Debug']" name="hidden">1</attr>
 
-  <attr path="/api/namespace/object[@name='Element']/method[@cname='gst_element_link_many']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Element']/field" name="hidden">1</attr>
+  <remove-attr path="/api/namespace/object[@name='Element']/field[@name='CurrentState']" name="hidden" />
+  <attr path="/api/namespace/object[@name='Element']/method[@cname='gst_element_link_many']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Element']/method[@cname='gst_element_unlink_many']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Element']/method[@cname='gst_element_add_pad']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Element']/method[@cname='gst_element_get_pad']" name="hidden">1</attr>
@@ -309,10 +306,6 @@
   <attr path="/api/namespace/object[@name='ElementFactory']/method[@cname='gst_element_factory_get_static_pad_templates']/return-type" name="element_type">GstStaticPadTemplate</attr>
   <attr path="/api/namespace/object[@name='ElementFactory']/method[@cname='gst_element_factory_get_static_pad_templates']/return-type" name="elements_owned">false</attr>
   <attr path="/api/namespace/object[@name='ElementFactory']/method[@cname='gst_element_factory_get_static_pad_templates']/return-type" name="owned">false</attr>
-  <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
-  <attr path="/api/namespace/object[@name='ElementFactory']/field[@name='UriProtocols']" name="hidden">1</attr>
-  <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
-  <attr path="/api/namespace/object[@name='ElementFactory']/field[@name='UriType']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='ElementFactory']/method[@cname='gst_element_factory_get_uri_type']/return-type" name="type">GstURIType</attr>
 
   <attr path="/api/namespace/enum[@name='ElementFlags']/member[@cname='GST_ELEMENT_FLAG_LAST']" name="name">Last</attr>
@@ -430,8 +423,6 @@
     </method>
   </add-node>
 
-  <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
-  <attr path="/api/namespace/object[@name='Index']/field" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Index']/virtual_method[@cname='get_assoc_entry']/parameters/parameter[@name='func']" name="type">gpointer</attr>
   <attr path="/api/namespace/object[@name='Index']/property[@cname='resolver']" name="name">Method</attr>
   <attr path="/api/namespace/object[@name='Index']/property[@cname='resolver']" name="type">GstIndexResolverMethod</attr>
@@ -525,9 +516,11 @@
   <attr path="/api/namespace/enum[@name='ObjectFlags']/member[@cname='GST_OBJECT_FLAG_LAST']" name="name">Last</attr>
 
   <attr path="/api/namespace/object[@name='Pipeline']/method[@name='GetBus']/return-type" name="owned">true</attr>
+  <attr path="/api/namespace/object[@name='Pipeline']/field[@name='FixedClock']" name="hidden">1</attr>
 
+  <attr path="/api/namespace/object[@name='Pad']/field" name="hidden">1</attr>
+  <remove-attr path="/api/namespace/object[@name='Pad']/field[@name='mode']" name="hidden" />
   <attr path="/api/namespace/object[@name='Pad']/method[@name='GetAllowedCaps']/return-type" name="owned">true</attr>
-
   <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_add_data_probe_full']" name="name">AddDataProbe</attr>
   <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_add_data_probe_full']/parameters/parameter[@name='handler']" name="type">GstPadDataProbeCallback</attr>
   <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_add_buffer_probe_full']" name="name">AddBufferProbe</attr>
@@ -565,8 +558,6 @@
   <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_alloc_buffer_and_set_caps']/parameters/parameter[@name='buf']" name="owned">true</attr>
   <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_pull_range']/parameters/parameter[@name='buffer']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_pull_range']/parameters/parameter[@name='buffer']" name="owned">true</attr>
-  <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
-  <attr path="/api/namespace/object[@name='Pad']/field" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_set_bufferalloc_function']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_set_chain_function']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_set_checkgetrange_function']" name="hidden">1</attr>
@@ -706,7 +697,6 @@
   <attr path="/api/namespace/struct[@name='ParseContext']/method[@cname='gst_parse_context_get_missing_elements']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/struct[@name='ParseContext']/method[@cname='gst_parse_context_get_missing_elements']/return-type" name="elements_owned">true</attr>
 
-  <attr path="/api/namespace/object[@name='Pipeline']/field" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Pipeline']/method[@cname='gst_pipeline_set_new_stream_time']" name="name">SetStreamTime</attr>
   <attr path="/api/namespace/object[@name='Pipeline']/method[@cname='gst_pipeline_get_last_stream_time']" name="name">GetStreamTime</attr>
   <attr path="/api/namespace/object[@name='Pipeline']/method[@cname='gst_pipeline_get_bus']/return-type" name="owned">true</attr>
@@ -715,8 +705,6 @@
   <attr path="/api/namespace/enum[@name='PipelineFlags']/member[@cname='GST_PIPELINE_FLAG_FIXED_CLOCK']" name="value">BinFlags.Last &lt;&lt; 0</attr>
   <attr path="/api/namespace/enum[@name='PipelineFlags']/member[@cname='GST_PIPELINE_FLAG_LAST']" name="value">BinFlags.Last &lt;&lt; 4</attr>
 
-  <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
-  <attr path="/api/namespace/object[@name='Plugin']/field" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Plugin']/method[@cname='gst_plugin_error_quark']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Plugin']/method[@cname='gst_plugin_get_name']" name="name">GetPluginName</attr>
   <attr path="/api/namespace/object[@name='Plugin']/method[@cname='gst_plugin_add_dependency']/parameters/parameter[@type='const-gchar**']" name="null_term_array">true</attr>
@@ -732,8 +720,6 @@
 
   <attr path="/api/namespace/object[@name='PluginFeature']/method[@cname='gst_plugin_feature_set_name']" name="name">SetFeatureName</attr>
   <attr path="/api/namespace/object[@name='PluginFeature']/method[@cname='gst_plugin_feature_get_name']" name="name">GetFeatureName</attr>
-  <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
-  <attr path="/api/namespace/object[@name='PluginFeature']/field[@name='Rank']" name="hidden">1</attr>
   <add-node path="/api/namespace/object[@name='PluginFeature']">
         <method cname="gst_plugin_feature_load" name="Load">
         <return-type type="GstPluginFeature*" owned="true" />
@@ -883,6 +869,7 @@
   <attr path="/api/namespace/object[@name='SystemClock']/method[@cname='gst_system_clock_obtain']/return-type" name="owned">true</attr>
 
   <attr path="/api/namespace/object[@name='Task']/field[@name='Func']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@name='Task']/field[@name='Data']" 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']" name="hidden">1</attr>
@@ -951,8 +938,6 @@
   <attr path="/api/namespace/object[@name='TypeFindFactory']/method[@cname='gst_type_find_factory_get_list']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/object[@name='TypeFindFactory']/method[@cname='gst_type_find_factory_get_extensions']/return-type" name="null_term_array">true</attr>
 
-  <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
-  <attr path="/api/namespace/object[@name='Task']/field" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Task']/method[@cname='gst_task_cleanup_all']" name="hidden">1</attr>
   <remove-node path="/api/namespace/object[@name='Task']/method[@cname='gst_task_create']" />>
   <add-node path="/api/namespace/object[@name='Task']">
@@ -964,11 +949,6 @@
       </constructor>
   </add-node>
 
-  <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
-  <attr path="/api/namespace/object[@name='TypeFindFactory']/field[@name='Caps']" name="hidden">1</attr>
-  <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
-  <attr path="/api/namespace/object[@name='TypeFindFactory']/field[@name='Extensions']" name="hidden">1</attr>
-
   <attr path="/api/namespace/struct[@name='TypeNameData']" name="hidden">1</attr>
 
   <move-node path="/api/namespace/class[@name='Uri']/method[@cname='gst_uri_protocol_is_supported']">/api/namespace/class[@name='Util']</move-node>
diff --git a/gstreamer-sharp/Task.custom b/gstreamer-sharp/Task.custom
index fd842badf1..8e762c12f2 100644
--- a/gstreamer-sharp/Task.custom
+++ b/gstreamer-sharp/Task.custom
@@ -24,16 +24,3 @@ public void Signal () {
   g_cond_signal (CondPtr);
 }
 
-[DllImport ("gstreamersharpglue-0.10") ]
-extern static uint gstsharp_gst_task_get_running_offset ();
-
-static uint running_offset = gstsharp_gst_task_get_running_offset ();
-public bool IsRunning {
-  get {
-    unsafe {
-      bool* raw_ptr = (bool*) ( ( (byte*) Handle) + running_offset);
-      return (*raw_ptr);
-    }
-  }
-}
-
diff --git a/gstreamer-sharp/glue/task.c b/gstreamer-sharp/glue/task.c
index 18b8ba5189..ec3d665e85 100644
--- a/gstreamer-sharp/glue/task.c
+++ b/gstreamer-sharp/glue/task.c
@@ -6,8 +6,3 @@ gstsharp_gst_task_get_cond_offset (void)
   return (uint) G_STRUCT_OFFSET (GstTask, cond);
 }
 
-uint
-gstsharp_gst_task_get_running_offset (void)
-{
-  return (uint) G_STRUCT_OFFSET (GstTask, running);
-}