From 5d25a8c142df5af9db16eb351fc75c40e987d7aa Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Wed, 27 Jul 2016 10:53:25 +0200 Subject: [PATCH] vapi: Update GIR-based bindings --- vapi/gdk-3.0.vapi | 16 +++++++++++++ vapi/gio-2.0.vapi | 2 ++ vapi/gstreamer-1.0.vapi | 33 ++++++++++++++++++++++++++ vapi/gstreamer-app-1.0.vapi | 6 +++++ vapi/gstreamer-base-1.0.vapi | 8 +++---- vapi/gstreamer-player-1.0.vapi | 7 +++++- vapi/metadata/Gdk-3.0.metadata | 1 + vapi/webkit2gtk-web-extension-4.0.vapi | 18 +++++++++----- 8 files changed, 80 insertions(+), 11 deletions(-) diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi index 48406325b..09a1e3cdd 100644 --- a/vapi/gdk-3.0.vapi +++ b/vapi/gdk-3.0.vapi @@ -5836,6 +5836,8 @@ namespace Gdk { public virtual signal Cairo.Surface create_surface (int width, int height); [Version (since = "2.18")] public virtual signal void from_embedder (double embedder_x, double embedder_y, out double offscreen_x, out double offscreen_y); + [Version (since = "3.22")] + public signal void moved_to_rect ([CCode (type = "gpointer")] Gdk.Rectangle flipped_rect, [CCode (type = "gpointer")] Gdk.Rectangle final_rect, bool flipped_x, bool flipped_y); [Version (since = "2.18")] public signal unowned Gdk.Window? pick_embedded_child (double x, double y); [Version (since = "2.18")] @@ -5942,6 +5944,20 @@ namespace Gdk { public bool override_redirect; public Gdk.WindowTypeHint type_hint; } + [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_ANCHOR_", type_id = "gdk_anchor_hints_get_type ()")] + [Flags] + [Version (since = "3.22")] + public enum AnchorHints { + FLIP_X, + FLIP_Y, + SLIDE_X, + SLIDE_Y, + RESIZE_X, + RESIZE_Y, + FLIP, + SLIDE, + RESIZE + } [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_AXIS_FLAG_", type_id = "gdk_axis_flags_get_type ()")] [Flags] [Version (since = "3.22")] diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 228fd633a..6fe0545cb 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -3126,6 +3126,8 @@ namespace GLib { public abstract unowned string[] get_supported_types (); public abstract bool launch (GLib.List? files, GLib.AppLaunchContext? launch_context) throws GLib.Error; public static bool launch_default_for_uri (string uri, GLib.AppLaunchContext? launch_context) throws GLib.Error; + [Version (since = "2.50")] + public static async bool launch_default_for_uri_async (string uri, GLib.AppLaunchContext launch_context, GLib.Cancellable? cancellable = null) throws GLib.Error; public abstract bool launch_uris (GLib.List? uris, GLib.AppLaunchContext? launch_context) throws GLib.Error; public abstract bool remove_supports_type (string content_type) throws GLib.Error; [Version (since = "2.20")] diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi index ee71e5aa0..b5fc57ac8 100644 --- a/vapi/gstreamer-1.0.vapi +++ b/vapi/gstreamer-1.0.vapi @@ -1218,6 +1218,8 @@ namespace Gst { [CCode (returns_floating_reference = true)] public static Gst.Element make_from_uri (Gst.URIType type, string uri, string? elementname) throws GLib.Error; public void message_full (Gst.MessageType type, GLib.Quark domain, int code, owned string? text, owned string? debug, string file, string function, int line); + [Version (since = "1.10")] + public void message_full_with_details (Gst.MessageType type, GLib.Quark domain, int code, owned string? text, owned string? debug, string file, string function, int line, owned Gst.Structure structure); public virtual bool post_message (owned Gst.Message message); public virtual Gst.Clock? provide_clock (); public virtual bool query (Gst.Query query); @@ -1340,6 +1342,8 @@ namespace Gst { public void parse_stream_collection (out Gst.StreamCollection collection); [Version (since = "1.2")] public void parse_stream_flags (out Gst.StreamFlags flags); + [Version (since = "1.10")] + public void parse_stream_group_done (out uint group_id); public void parse_stream_start (out unowned string stream_id); public void parse_tag (out unowned Gst.TagList taglist); public void parse_toc (out Gst.Toc toc, out bool updated); @@ -1377,6 +1381,9 @@ namespace Gst { [Version (since = "1.10")] public Event.stream_collection (Gst.StreamCollection collection); [CCode (has_construct_function = false)] + [Version (since = "1.10")] + public Event.stream_group_done (uint group_id); + [CCode (has_construct_function = false)] public Event.stream_start (string stream_id); [CCode (has_construct_function = false)] public Event.tag (owned Gst.TagList taglist); @@ -1481,6 +1488,8 @@ namespace Gst { public weak Gst.Object src; public uint64 timestamp; public Gst.MessageType type; + [Version (since = "1.10")] + public void add_redirect_entry (string location, owned Gst.TagList? tag_list, owned Gst.Structure? entry_struct); [CCode (has_construct_function = false)] public Message.application (Gst.Object? src, owned Gst.Structure structure); [CCode (has_construct_function = false)] @@ -1509,6 +1518,11 @@ namespace Gst { public Message.eos (Gst.Object? src); [CCode (has_construct_function = false)] public Message.error (Gst.Object? src, GLib.Error error, string debug); + [CCode (has_construct_function = false)] + [Version (since = "1.10")] + public Message.error_with_details (Gst.Object? src, GLib.Error error, string debug, owned Gst.Structure details); + [Version (since = "1.10")] + public size_t get_num_redirect_entries (); public uint32 get_seqnum (); public unowned GLib.Value? get_stream_status_object (); public unowned Gst.Structure get_structure (); @@ -1519,6 +1533,9 @@ namespace Gst { [CCode (has_construct_function = false)] public Message.info (Gst.Object? src, GLib.Error error, string debug); [CCode (has_construct_function = false)] + [Version (since = "1.10")] + public Message.info_with_details (Gst.Object? src, GLib.Error error, string debug, owned Gst.Structure details); + [CCode (has_construct_function = false)] public Message.latency (Gst.Object? src); [CCode (has_construct_function = false)] [Version (since = "1.2")] @@ -1537,11 +1554,15 @@ namespace Gst { [Version (since = "1.4")] public void parse_device_removed (out Gst.Device device); public void parse_error (out GLib.Error gerror, out string debug); + [Version (since = "1.10")] + public void parse_error_details (out Gst.Structure structure); [Version (since = "1.2")] public bool parse_group_id (out uint group_id); [Version (since = "1.2")] public void parse_have_context (out Gst.Context context); public void parse_info (out GLib.Error gerror, out string debug); + [Version (since = "1.10")] + public void parse_info_details (out Gst.Structure structure); public void parse_new_clock (out unowned Gst.Clock clock); public void parse_progress (out Gst.ProgressType type, out string code, out string text); [Version (since = "1.10")] @@ -1549,6 +1570,8 @@ namespace Gst { public void parse_qos (out bool live, out uint64 running_time, out uint64 stream_time, out uint64 timestamp, out uint64 duration); public void parse_qos_stats (out Gst.Format format, out uint64 processed, out uint64 dropped); public void parse_qos_values (out int64 jitter, out double proportion, out int quality); + [Version (since = "1.10")] + public void parse_redirect_entry (size_t entry_index, out unowned string location, out unowned Gst.TagList tag_list, out unowned Gst.Structure entry_struct); public void parse_request_state (out Gst.State state); public void parse_reset_time (out Gst.ClockTime running_time); public void parse_segment_done (out Gst.Format format, out int64 position); @@ -1565,6 +1588,8 @@ namespace Gst { public void parse_tag (out Gst.TagList tag_list); public void parse_toc (out Gst.Toc toc, out bool updated); public void parse_warning (out GLib.Error gerror, out string debug); + [Version (since = "1.10")] + public void parse_warning_details (out Gst.Structure structure); [CCode (has_construct_function = false)] public Message.progress (Gst.Object src, Gst.ProgressType type, string code, string text); [CCode (has_construct_function = false)] @@ -1573,6 +1598,9 @@ namespace Gst { [CCode (has_construct_function = false)] public Message.qos (Gst.Object src, bool live, uint64 running_time, uint64 stream_time, uint64 timestamp, uint64 duration); [CCode (has_construct_function = false)] + [Version (since = "1.10")] + public Message.redirect (Gst.Object src, string location, owned Gst.TagList? tag_list, owned Gst.Structure? entry_struct); + [CCode (has_construct_function = false)] public Message.request_state (Gst.Object? src, Gst.State state); [CCode (has_construct_function = false)] public Message.reset_time (Gst.Object? src, Gst.ClockTime running_time); @@ -1619,6 +1647,9 @@ namespace Gst { public Message.toc (Gst.Object src, Gst.Toc toc, bool updated); [CCode (has_construct_function = false)] public Message.warning (Gst.Object? src, GLib.Error error, string debug); + [CCode (has_construct_function = false)] + [Version (since = "1.10")] + public Message.warning_with_details (Gst.Object? src, GLib.Error error, string debug, owned Gst.Structure details); } [CCode (cheader_filename = "gst/gst.h", get_value_function = "g_value_get_boxed", ref_function = "gst_mini_object_ref", set_value_function = "g_value_set_boxed", take_value_function = "g_value_take_boxed", unref_function = "gst_mini_object_unref")] [Compact] @@ -2959,6 +2990,7 @@ namespace Gst { TAG, BUFFERSIZE, SINK_MESSAGE, + STREAM_GROUP_DONE, EOS, TOC, PROTECTION, @@ -3106,6 +3138,7 @@ namespace Gst { PROPERTY_NOTIFY, STREAM_COLLECTION, STREAMS_SELECTED, + REDIRECT, ANY; public static unowned string get_name (Gst.MessageType type); public static GLib.Quark to_quark (Gst.MessageType type); diff --git a/vapi/gstreamer-app-1.0.vapi b/vapi/gstreamer-app-1.0.vapi index 698613f61..fe2ab69a1 100644 --- a/vapi/gstreamer-app-1.0.vapi +++ b/vapi/gstreamer-app-1.0.vapi @@ -32,6 +32,12 @@ namespace Gst { public virtual signal Gst.Sample pull_preroll (); [HasEmitter] public virtual signal Gst.Sample pull_sample (); + [HasEmitter] + [Version (since = "1.10")] + public virtual signal Gst.Sample try_pull_preroll (uint64 timeout); + [HasEmitter] + [Version (since = "1.10")] + public virtual signal Gst.Sample try_pull_sample (uint64 timeout); } [CCode (cheader_filename = "gst/app/app.h", type_id = "gst_app_src_get_type ()")] [GIR (name = "AppSrc")] diff --git a/vapi/gstreamer-base-1.0.vapi b/vapi/gstreamer-base-1.0.vapi index 35f08f721..f40ac914d 100644 --- a/vapi/gstreamer-base-1.0.vapi +++ b/vapi/gstreamer-base-1.0.vapi @@ -334,10 +334,10 @@ namespace Gst { public Gst.FlowReturn clip_running_time (Gst.Base.CollectData cdata, Gst.Buffer buf, Gst.Buffer? outbuf, void* user_data); public bool event_default (Gst.Base.CollectData data, Gst.Event event, bool discard); public uint flush (Gst.Base.CollectData data, uint size); - public Gst.Buffer peek (Gst.Base.CollectData data); - public Gst.Buffer pop (Gst.Base.CollectData data); + public Gst.Buffer? peek (Gst.Base.CollectData data); + public Gst.Buffer? pop (Gst.Base.CollectData data); public bool query_default (Gst.Base.CollectData data, Gst.Query query, bool discard); - public Gst.Buffer read_buffer (Gst.Base.CollectData data, uint size); + public Gst.Buffer? read_buffer (Gst.Base.CollectData data, uint size); public bool remove_pad (Gst.Pad pad); public void set_buffer_function (Gst.Base.CollectPadsBufferFunction func); public void set_clip_function (Gst.Base.CollectPadsClipFunction clipfunc); @@ -353,7 +353,7 @@ namespace Gst { public bool src_event_default (Gst.Pad pad, Gst.Event event); public void start (); public void stop (); - public Gst.Buffer take_buffer (Gst.Base.CollectData data, uint size); + public Gst.Buffer? take_buffer (Gst.Base.CollectData data, uint size); } [CCode (cheader_filename = "gst/base/base.h", cname = "GstDataQueue", lower_case_cprefix = "gst_data_queue_", type_id = "gst_data_queue_get_type ()")] [GIR (name = "DataQueue")] diff --git a/vapi/gstreamer-player-1.0.vapi b/vapi/gstreamer-player-1.0.vapi index 842e4d340..69b87506a 100644 --- a/vapi/gstreamer-player-1.0.vapi +++ b/vapi/gstreamer-player-1.0.vapi @@ -6,9 +6,14 @@ namespace Gst { public class Player : Gst.Object { [CCode (has_construct_function = false)] public Player (owned Gst.PlayerVideoRenderer? video_renderer, owned Gst.PlayerSignalDispatcher? signal_dispatcher); + public static uint config_get_position_update_interval (Gst.Structure config); + public static string config_get_user_agent (Gst.Structure config); + public static void config_set_position_update_interval (Gst.Structure config, uint interval); + public static void config_set_user_agent (Gst.Structure config, string agent); public static unowned GLib.List get_audio_streams (Gst.PlayerMediaInfo info); public int64 get_audio_video_offset (); public double get_color_balance (Gst.PlayerColorBalanceType type); + public Gst.Structure get_config (); public Gst.PlayerAudioInfo get_current_audio_track (); public unowned Gst.PlayerSubtitleInfo get_current_subtitle_track (); public Gst.PlayerVideoInfo get_current_video_track (); @@ -37,6 +42,7 @@ namespace Gst { public void set_audio_track_enabled (bool enabled); public void set_audio_video_offset (int64 offset); public void set_color_balance (Gst.PlayerColorBalanceType type, double value); + public bool set_config (owned Gst.Structure config); [Version (since = "1.10")] public void set_multiview_flags (Gst.Video.MultiviewFlags flags); [Version (since = "1.10")] @@ -66,7 +72,6 @@ namespace Gst { public bool mute { get; set; } public Gst.Element pipeline { owned get; } public uint64 position { get; } - public uint position_update_interval { get; set; } public double rate { get; set; } public Gst.PlayerSignalDispatcher signal_dispatcher { construct; } [NoAccessorMethod] diff --git a/vapi/metadata/Gdk-3.0.metadata b/vapi/metadata/Gdk-3.0.metadata index 827f7d5a3..b9d170c7a 100644 --- a/vapi/metadata/Gdk-3.0.metadata +++ b/vapi/metadata/Gdk-3.0.metadata @@ -17,6 +17,7 @@ Event Window .add_filter skip=false .remove_filter skip=false + .moved_to_rect.*_rect type="Gdk.Rectangle" WindowRedirect skip EventKey struct=false .string skip diff --git a/vapi/webkit2gtk-web-extension-4.0.vapi b/vapi/webkit2gtk-web-extension-4.0.vapi index 7513d5f03..88734ecfd 100644 --- a/vapi/webkit2gtk-web-extension-4.0.vapi +++ b/vapi/webkit2gtk-web-extension-4.0.vapi @@ -294,7 +294,10 @@ namespace WebKit { public void set_cookie (string value) throws GLib.Error; public void set_document_uri (string value); public void set_selected_stylesheet_set (string value); - public void set_title (string value); + [Version (deprecated = true, deprecated_since = "2.14")] + public void set_title (string title); + [Version (since = "2.14")] + public void set_title_with_error (string value) throws GLib.Error; public void set_xml_standalone (bool value) throws GLib.Error; public void set_xml_version (string value) throws GLib.Error; public WebKit.DOM.Element active_element { get; } @@ -528,17 +531,15 @@ namespace WebKit { public bool bubbles { get; } public bool cancel_bubble { get; set; } public bool cancelable { get; } + [NoAccessorMethod] + public bool composed { get; } public WebKit.DOM.EventTarget current_target { owned get; } [NoAccessorMethod] public bool default_prevented { get; } public uint event_phase { get; } [NoAccessorMethod] public bool is_trusted { get; } - [NoAccessorMethod] - public bool related_target_scoped { get; } public bool return_value { get; set; } - [NoAccessorMethod] - public bool scoped { get; } public WebKit.DOM.EventTarget src_element { owned get; } public WebKit.DOM.EventTarget target { owned get; } public uint time_stamp { get; } @@ -2109,7 +2110,10 @@ namespace WebKit { [CCode (has_construct_function = false)] protected HTMLTitleElement (); public string get_text (); - public void set_text (string value); + [Version (deprecated = true, deprecated_since = "2.14")] + public void set_text (string text); + [Version (since = "2.14")] + public void set_text_with_error (string value) throws GLib.Error; public string text { owned get; set; } } [CCode (cheader_filename = "webkit2/webkit-web-extension.h", lower_case_cprefix = "webkit_dom_html_u_list_element_", type_id = "webkit_dom_html_u_list_element_get_type ()")] @@ -2264,6 +2268,8 @@ namespace WebKit { public string base_uri { owned get; } public WebKit.DOM.NodeList child_nodes { owned get; } public WebKit.DOM.Node first_child { get; } + [NoAccessorMethod] + public bool is_connected { get; } public WebKit.DOM.Node last_child { get; } public string local_name { owned get; } public string namespace_uri { owned get; } -- 2.47.2