[vala/staging: 3/3] vapi: Regenerate for girparser changes



commit b055f3fc0219d4d25e4b75d3c9f119f23f887e4a
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Fri Oct 14 09:36:14 2016 +0200

    vapi: Regenerate for girparser changes
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772902

 vapi/gio-2.0.vapi                  |   30 +++++++++++++++---------------
 vapi/gstreamer-base-1.0.vapi       |    6 ++++--
 vapi/metadata/Gio-2.0.metadata     |    3 +--
 vapi/metadata/GstBase-1.0.metadata |    4 ----
 4 files changed, 20 insertions(+), 23 deletions(-)
---
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 69b057d..49d749e 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;
diff --git a/vapi/gstreamer-base-1.0.vapi b/vapi/gstreamer-base-1.0.vapi
index ad17412..8b0bb02 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 6929586..302401f 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -277,13 +277,12 @@ TlsFileDatabase
 TlsServerConnection
   .new nullable
 InputMessage
-  .vectors array_length_field="num_vectors"
   .control_messages type="GLib.SocketControlMessage***"
   .num_control_messages type="uint*"
 InputVector
   .buffer type="uint8[]" array_length_field="size"
 OutputMessage
-  .vectors array array_length_field="num_vectors"
+  .vectors array
   .control_messages type="GLib.SocketControlMessage***"
   .num_control_messages type="uint*"
 OutputVector
diff --git a/vapi/metadata/GstBase-1.0.metadata b/vapi/metadata/GstBase-1.0.metadata
index 24c7b97..a876068 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
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]