From 77dabfba681a3f5cc803ae862e0de0290d9a3588 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sat, 15 Oct 2016 21:05:10 +0200 Subject: [PATCH] Regenerate for GIR-based bindings including array-related metadata fixes https://bugzilla.gnome.org/show_bug.cgi?id=772902 --- vapi/gio-2.0.vapi | 45 +++++++++++++++--------------- vapi/gstreamer-base-1.0.vapi | 6 ++-- vapi/metadata/Gio-2.0.metadata | 7 +++++ vapi/metadata/GstBase-1.0.metadata | 4 --- 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index ce836031a..3580aa5f1 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -583,7 +583,7 @@ namespace GLib { [Compact] [Version (since = "2.26")] public class DBusAnnotationInfo { - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusAnnotationInfo[] annotations; public string key; public int ref_count; @@ -595,7 +595,7 @@ namespace GLib { [Compact] [Version (since = "2.26")] public class DBusArgInfo { - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusAnnotationInfo[] annotations; public string name; public int ref_count; @@ -684,15 +684,15 @@ namespace GLib { [Compact] [Version (since = "2.26")] public class DBusInterfaceInfo { - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusAnnotationInfo[] annotations; - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusMethodInfo[] methods; public string name; - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusPropertyInfo[] properties; public int ref_count; - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusSignalInfo[] signals; [Version (since = "2.30")] public void cache_build (); @@ -806,12 +806,12 @@ namespace GLib { [Compact] [Version (since = "2.26")] public class DBusMethodInfo { - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusAnnotationInfo[] annotations; - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusArgInfo[] in_args; public string name; - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusArgInfo[] out_args; public int ref_count; public GLib.DBusMethodInfo @ref (); @@ -848,11 +848,11 @@ namespace GLib { [Compact] [Version (since = "2.26")] public class DBusNodeInfo { - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusAnnotationInfo[] annotations; - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusInterfaceInfo[] interfaces; - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusNodeInfo[] nodes; public string path; public int ref_count; @@ -939,7 +939,7 @@ namespace GLib { [Compact] [Version (since = "2.26")] public class DBusPropertyInfo { - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusAnnotationInfo[] annotations; public GLib.DBusPropertyInfoFlags flags; public string name; @@ -1027,9 +1027,9 @@ namespace GLib { [Compact] [Version (since = "2.26")] public class DBusSignalInfo { - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusAnnotationInfo[] annotations; - [CCode (array_length = false)] + [CCode (array_length = false, array_null_terminated = true)] public GLib.DBusArgInfo[] args; public string name; public int ref_count; @@ -3802,14 +3802,13 @@ namespace GLib { [Version (since = "2.48")] public struct InputMessage { public weak GLib.SocketAddress address; - [CCode (array_length = false)] + [CCode (array_length_cname = "num_vectors", array_length_type = "guint")] public weak GLib.InputVector[] vectors; public uint num_vectors; public size_t bytes_received; public int flags; - [CCode (array_length = false)] - public weak GLib.SocketControlMessage[] control_messages; - public uint num_control_messages; + public GLib.SocketControlMessage*** control_messages; + public uint* num_control_messages; } [CCode (cheader_filename = "gio/gio.h", has_type_id = false)] [Version (since = "2.22")] @@ -3821,12 +3820,12 @@ namespace GLib { [Version (since = "2.44")] public struct OutputMessage { public weak GLib.SocketAddress address; - public GLib.OutputVector vectors; + [CCode (array_length_cname = "num_vectors", array_length_type = "guint")] + public weak GLib.OutputVector[] vectors; public uint num_vectors; public uint bytes_sent; - [CCode (array_length = false)] - public weak GLib.SocketControlMessage[] control_messages; - public uint num_control_messages; + public GLib.SocketControlMessage*** control_messages; + public uint* num_control_messages; } [CCode (cheader_filename = "gio/gio.h", has_type_id = false)] [Version (since = "2.22")] diff --git a/vapi/gstreamer-base-1.0.vapi b/vapi/gstreamer-base-1.0.vapi index ad1741268..8b0bb0225 100644 --- a/vapi/gstreamer-base-1.0.vapi +++ b/vapi/gstreamer-base-1.0.vapi @@ -59,8 +59,9 @@ namespace Gst { public class BitReader { public uint bit; public uint byte; - [CCode (array_length = false)] + [CCode (array_length_cname = "size", array_length_type = "guint")] public weak uint8[] data; + public uint size; public BitReader ([CCode (array_length_type = "guint")] uint8[] data); [CCode (cname = "gst_bit_reader_free")] public void free (); @@ -100,8 +101,9 @@ namespace Gst { [GIR (name = "ByteReader")] public class ByteReader { public uint byte; - [CCode (array_length = false)] + [CCode (array_length_cname = "size", array_length_type = "guint")] public weak uint8[] data; + public uint size; public ByteReader ([CCode (array_length_type = "guint")] uint8[] data); [CCode (cname = "gst_byte_reader_dup_data")] public bool dup_data ([CCode (array_length_cname = "size", array_length_pos = 0.5, array_length_type = "guint")] out uint8[] val); diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata index bdb01aec9..c9552e43e 100644 --- a/vapi/metadata/Gio-2.0.metadata +++ b/vapi/metadata/Gio-2.0.metadata @@ -276,6 +276,13 @@ TlsFileDatabase .new nullable TlsServerConnection .new nullable +InputMessage + .control_messages type="GLib.SocketControlMessage***" + .num_control_messages type="uint*" +OutputMessage + .vectors array + .control_messages type="GLib.SocketControlMessage***" + .num_control_messages type="uint*" DBusError errordomain DBusSubtreeEnumerateFunc unowned=false skip=false ReallocFunc skip=false diff --git a/vapi/metadata/GstBase-1.0.metadata b/vapi/metadata/GstBase-1.0.metadata index 24c7b97c2..a87606838 100644 --- a/vapi/metadata/GstBase-1.0.metadata +++ b/vapi/metadata/GstBase-1.0.metadata @@ -7,10 +7,6 @@ PushSrc .alloc.buf out unowned=false // Fields -BitReader - .size skip -ByteReader - .size skip ByteWriter struct=false .new* skip=false -- 2.47.2