From a7fd8d6cb5836824e4a6bfcf6bc98700fbe52321 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <thibault.saunier@osg.samsung.com>
Date: Fri, 29 Sep 2017 11:43:48 -0300
Subject: [PATCH] Do not ever try to generate managed structures

---
 generate_code.py                 |  4 +++-
 sources/gstreamer-sharp.metadata | 11 ++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/generate_code.py b/generate_code.py
index 3c36254da9..8a3bc10ea4 100644
--- a/generate_code.py
+++ b/generate_code.py
@@ -55,7 +55,9 @@ if __name__ == "__main__":
         '--glue-filename=' + opts.glue_file,
         '--gluelib-name=' + opts.glue_libname,
         '--glue-includes=' + opts.glue_includes,
-        '--assembly-name=' + opts.assembly_name,]
+        '--assembly-name=' + opts.assembly_name,
+        '--all-opaque',
+    ]
 
     if opts.schema:
         cmd += ['--schema=' + opts.schema]
diff --git a/sources/gstreamer-sharp.metadata b/sources/gstreamer-sharp.metadata
index af6a41e33d..8249af956f 100644
--- a/sources/gstreamer-sharp.metadata
+++ b/sources/gstreamer-sharp.metadata
@@ -87,10 +87,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 	</add-node>
 	<attr path="/api/namespace/boxed[@cname='GstIterator']/method[@cname='gst_iterator_next']" name="hidden">true</attr>
 	<attr path="/api/namespace/boxed[@cname='GstIterator']/field[@cname='master_cookie']" name="type">guint32*</attr>
-	<remove-node path="/api/namespace/boxed[@cname='GstStructure']/field[@cname='name']"/>
+	<attr path="/api/namespace/boxed[@cname='GstStructure']/field[@cname='name']" name="hidden">true</attr>
 	<!-- Fix for GstChildProxy -->
 	<attr path="/api/namespace/interface[@cname='GstChildProxy']/method[@cname='gst_child_proxy_get_property']" name="hidden">1</attr>
 	<attr path="/api/namespace/interface[@cname='GstChildProxy']/method[@cname='gst_child_proxy_set_property']" name="hidden">1</attr>
+
 	<!-- FIXME: array handling -->
 	<attr path="/api/namespace/struct[@cname='GstRTCPPacket']/method[@cname='gst_rtcp_packet_sdes_copy_entry']" name="hidden">true</attr>
 	<attr path="/api/namespace/struct[@cname='GstRTCPPacket']/method[@cname='gst_rtcp_packet_sdes_get_entry']" name="hidden">true</attr>
@@ -101,6 +102,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 	<attr path="/api/namespace/struct[@cname='GstFFTF32']/method[@cname='gst_fft_f32_fft']" name="hidden">true</attr>
 	<attr path="/api/namespace/struct[@cname='GstFFTF32']/method[@cname='gst_fft_f32_window']" name="hidden">true</attr>
 	<attr path="//virtual_method[@cname='get_g_value_array']" name="hidden">true</attr>
+
 	<!-- Maybe some problems with the name -->
 	<remove-node path="/api/namespace/interface[@cname='GstURIHandler']/class_struct/method[@vm='get_type']" name="vm"/>
 	<remove-node path="/api/namespace/interface[@cname='GstURIHandler']/virtual_method[@cname='get_type']" name="hidden"/>
@@ -115,12 +117,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 		</parameters>
 		</method>
 	</add-node>
+
 	<!-- Some glue problems -->
 	<attr path="/api/namespace/object[@cname='GstObject']/field[@cname='object']" name="hidden">true</attr>
 	<attr path="/api/namespace/struct[@cname='GstClockEntry']/field[@cname='func']" name="hidden">true</attr>
 	<attr path="/api/namespace/struct[@cname='GstClockEntry']/field[@cname='destroy_data']" name="hidden">true</attr>
 	<attr path="/api/namespace/object[@cname='GstTask']/field[@cname='notify']" name="hidden">true</attr>
 
+	<!-- Hide structure callbacks -->
+	<attr path="/api/namespace/struct[@cname='GstDataQueueItem']/field[@cname='destroy']" name="hidden">true</attr>
+
 	<!-- hide user data; FIXME: already removed in 1.2 GIR file, remove when we update to this version -->
 	<attr path="/api/namespace/object[@cname='GstBus']/method[@cname='gst_bus_sync_signal_handler']/parameters/parameter[@name='data']" name="hidden">1</attr>
 
@@ -275,8 +281,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 	<attr path="//constant[@name='SECOND']" name="ctype">gint64</attr>
 	<attr path="//constant[@name='MSECOND']" name="ctype">gint64</attr>
 	<attr path="//method[parameters/parameter[contains(@type, 'Class*')]]" name="hidden">true</attr>
-	<attr path="//struct[@cname='GstMapInfo']/field[@name='Data']" name="type">gpointer</attr>
-	<attr path="//struct[@cname='GstMapInfo']/field[@name='Data']" name="array">false</attr>
+	<attr path="//struct[@cname='GstMapInfo']/field[@name='Data']" name="hidden">true</attr>
 	<attr path="//method[@cname='gst_tag_list_copy_value']/parameters/parameter[@name='dest']" name="pass_as">ref</attr>
 	<attr path="//object/field[@cname='parent']" name="hidden">true</attr>
     <!-- buffer fixes -->