From 8f927de4c8c98a4dd8fd1795f107345c1d2fef9a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 22 Sep 2010 18:24:12 +0200 Subject: [PATCH] Update Vala bindings --- bindings/vala/gst-rtsp-server-0.10.vapi | 86 ++++++++++---- bindings/vala/packages/gst-rtsp-server-0.10.gi | 124 +++++++++++++++++++-- .../vala/packages/gst-rtsp-server-0.10.metadata | 4 +- 3 files changed, 181 insertions(+), 33 deletions(-) diff --git a/bindings/vala/gst-rtsp-server-0.10.vapi b/bindings/vala/gst-rtsp-server-0.10.vapi index 46a8ed4..45b0fb5 100644 --- a/bindings/vala/gst-rtsp-server-0.10.vapi +++ b/bindings/vala/gst-rtsp-server-0.10.vapi @@ -5,17 +5,19 @@ namespace Gst { [CCode (cheader_filename = "gst/rtsp-server/rtsp-client.h")] public class RTSPClient : GLib.Object { public weak Gst.RTSPConnection connection; + public bool is_ipv6; public weak Gst.RTSPMedia media; + public weak string server_ip; public weak GLib.List sessions; public weak GLib.List streams; public weak Gst.RTSPUrl uri; public weak Gst.RTSPWatch watch; public uint watchid; + [CCode (has_construct_function = false)] + public RTSPClient (); public bool accept (GLib.IOChannel channel); public Gst.RTSPMediaMapping get_media_mapping (); public Gst.RTSPSessionPool get_session_pool (); - [CCode (has_construct_function = false)] - public RTSPClient (); public void set_media_mapping (Gst.RTSPMediaMapping mapping); public void set_session_pool (Gst.RTSPSessionPool pool); public Gst.RTSPMediaMapping media_mapping { get; set; } @@ -25,36 +27,47 @@ namespace Gst { public class RTSPMedia : GLib.Object { public int active; public bool buffering; + public weak GLib.Cond cond; public weak GLib.List @dynamic; public weak Gst.Element element; + public bool eos_pending; public weak Gst.Element fakesink; public uint id; + public bool is_ipv6; public bool is_live; - public Gst.Element pipeline; - public bool prepared; + public weak GLib.Mutex @lock; + public weak Gst.Element pipeline; public weak Gst.RTSPTimeRange range; public bool reused; public weak Gst.Element rtpbin; public weak GLib.TimeoutSource source; + public Gst.RTSPMediaStatus status; public weak GLib.Array streams; public Gst.State target_state; + [CCode (has_construct_function = false)] + public RTSPMedia (); + public Gst.RTSPLowerTrans get_protocols (); public unowned Gst.RTSPMediaStream get_stream (uint idx); [NoWrapper] public virtual bool handle_message (Gst.Message message); + public bool is_eos_shutdown (); public bool is_prepared (); public bool is_reusable (); public bool is_shared (); public uint n_streams (); - [CCode (has_construct_function = false)] - public RTSPMedia (); public bool prepare (); public void remove_elements (); public bool seek (Gst.RTSPTimeRange range); + public void set_eos_shutdown (bool eos_shutdown); + public void set_protocols (Gst.RTSPLowerTrans protocols); public void set_reusable (bool reusable); public void set_shared (bool shared); public bool set_state (Gst.State state, GLib.Array trans); public virtual bool unprepare (); [NoAccessorMethod] + public bool eos_shutdown { get; set; } + public Gst.RTSPLowerTrans protocols { get; set; } + [NoAccessorMethod] public bool reusable { get; set; } [NoAccessorMethod] public bool shared { get; set; } @@ -65,6 +78,8 @@ namespace Gst { public weak GLib.Mutex @lock; public weak GLib.HashTable medias; public weak GLib.Mutex medias_lock; + [CCode (has_construct_function = false)] + public RTSPMediaFactory (); public void collect_streams (Gst.RTSPUrl url, Gst.RTSPMedia media); [NoWrapper] public virtual void configure (Gst.RTSPMedia media); @@ -76,11 +91,13 @@ namespace Gst { [NoWrapper] public virtual Gst.Element? get_element (Gst.RTSPUrl url); public string get_launch (); + public bool is_eos_shutdown (); public bool is_shared (); - [CCode (has_construct_function = false)] - public RTSPMediaFactory (); + public void set_eos_shutdown (bool eos_shutdown); public void set_launch (string launch); public void set_shared (bool shared); + [NoAccessorMethod] + public bool eos_shutdown { get; set; } public string launch { get; set; } [NoAccessorMethod] public bool shared { get; set; } @@ -88,12 +105,12 @@ namespace Gst { [CCode (cheader_filename = "gst/rtsp-server/rtsp-media-mapping.h")] public class RTSPMediaMapping : GLib.Object { public weak GLib.HashTable mappings; + [CCode (has_construct_function = false)] + public RTSPMediaMapping (); public void add_factory (string path, Gst.RTSPMediaFactory factory); public Gst.RTSPMediaFactory? find_factory (Gst.RTSPUrl url); [NoWrapper] public virtual Gst.RTSPMediaFactory? find_media (Gst.RTSPUrl url); - [CCode (has_construct_function = false)] - public RTSPMediaMapping (); public void remove_factory (string path); } [Compact] @@ -105,6 +122,8 @@ namespace Gst { public weak Gst.Element[] appsrc; public weak Gst.Caps caps; public ulong caps_sig; + public weak GLib.List destinations; + public bool filter_duplicates; public weak Gst.Element payloader; public bool prepared; public weak Gst.Pad recv_rtcp_sink; @@ -142,48 +161,54 @@ namespace Gst { public bool timeout; public weak Gst.RTSPTransport transport; public void* user_data; + public void cleanup (); } [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h")] public class RTSPServer : GLib.Object { - public weak string host; public weak GLib.IOChannel io_channel; public weak GLib.TimeoutSource io_watch; public void* server_sin; - public weak Gst.PollFD server_sock; + public Gst.PollFD server_sock; + [CCode (has_construct_function = false)] + public RTSPServer (); [NoWrapper] public virtual Gst.RTSPClient? accept_client (GLib.IOChannel channel); public uint attach (GLib.MainContext? context); public GLib.TimeoutSource? create_watch (); + public string get_address (); public int get_backlog (); public GLib.IOChannel? get_io_channel (); public Gst.RTSPMediaMapping get_media_mapping (); - public int get_port (); + public string get_service (); public Gst.RTSPSessionPool get_session_pool (); public static bool io_func (GLib.IOChannel channel, GLib.IOCondition condition, Gst.RTSPServer server); - [CCode (has_construct_function = false)] - public RTSPServer (); + public void set_address (string address); public void set_backlog (int backlog); public void set_media_mapping (Gst.RTSPMediaMapping mapping); - public void set_port (int port); + public void set_service (string service); public void set_session_pool (Gst.RTSPSessionPool pool); + public string address { get; set; } public int backlog { get; set; } public Gst.RTSPMediaMapping media_mapping { get; set; } - public int port { get; set; } + public string service { get; set; } public Gst.RTSPSessionPool session_pool { get; set; } } [CCode (cheader_filename = "gst/rtsp-server/rtsp-session.h")] public class RTSPSession : GLib.Object { public GLib.TimeVal create_time; + public int expire_count; public GLib.TimeVal last_access; public weak GLib.List medias; + [CCode (has_construct_function = false)] + public RTSPSession (string sessionid); + public void allow_expire (); public unowned Gst.RTSPSessionMedia get_media (Gst.RTSPUrl uri); public unowned string get_sessionid (); public uint get_timeout (); public bool is_expired (GLib.TimeVal now); public unowned Gst.RTSPSessionMedia manage_media (Gst.RTSPUrl uri, owned Gst.RTSPMedia media); - [CCode (has_construct_function = false)] - public RTSPSession (string sessionid); public int next_timeout (GLib.TimeVal now); + public void prevent_expire (); public bool release_media (Gst.RTSPSessionMedia media); public void set_timeout (uint timeout); public void touch (); @@ -193,10 +218,12 @@ namespace Gst { [Compact] [CCode (cheader_filename = "gst/rtsp-server/rtsp-session.h")] public class RTSPSessionMedia { + public uint counter; public weak Gst.RTSPMedia media; public Gst.RTSPState state; public weak GLib.Array streams; public weak Gst.RTSPUrl url; + public bool alloc_channels (Gst.RTSPRange range); public unowned Gst.RTSPSessionStream get_stream (uint idx); public bool set_state (Gst.State state); } @@ -204,6 +231,8 @@ namespace Gst { public class RTSPSessionPool : GLib.Object { public weak GLib.Mutex @lock; public weak GLib.HashTable sessions; + [CCode (has_construct_function = false)] + public RTSPSessionPool (); public uint cleanup (); public Gst.RTSPSession create (); [NoWrapper] @@ -213,8 +242,6 @@ namespace Gst { public Gst.RTSPSession? find (string sessionid); public uint get_max_sessions (); public uint get_n_sessions (); - [CCode (has_construct_function = false)] - public RTSPSessionPool (); public bool remove (Gst.RTSPSession sess); public void set_max_sessions (uint max); public uint max_sessions { get; set; } @@ -228,12 +255,25 @@ namespace Gst { public void set_keepalive (Gst.RTSPKeepAliveFunc keep_alive, GLib.DestroyNotify notify); public Gst.RTSPTransport set_transport (Gst.RTSPTransport ct); } - [CCode (cprefix = "GST_RTSP_FILTER_", has_type_id = "0", cheader_filename = "gst/gst.h")] + [Compact] + [CCode (cheader_filename = "gst/gst.h")] + public class SDPInfo { + public weak string server_ip; + public weak string server_proto; + } + [CCode (cprefix = "GST_RTSP_FILTER_", has_type_id = false, cheader_filename = "gst/gst.h")] public enum RTSPFilterResult { REMOVE, KEEP, REF } + [CCode (cprefix = "GST_RTSP_MEDIA_STATUS_", has_type_id = false, cheader_filename = "gst/gst.h")] + public enum RTSPMediaStatus { + UNPREPARED, + PREPARING, + PREPARED, + ERROR + } [CCode (cheader_filename = "gst/rtsp-server/rtsp-media.h")] public delegate void RTSPKeepAliveFunc (); [CCode (cheader_filename = "gst/rtsp-server/rtsp-media.h")] @@ -247,5 +287,5 @@ namespace Gst { [CCode (cheader_filename = "gst/gst.h")] public static Gst.RTSPResult rtsp_params_set (Gst.RTSPClient client, Gst.RTSPUrl uri, Gst.RTSPSession session, Gst.RTSPMessage request, Gst.RTSPMessage response); [CCode (cheader_filename = "gst/rtsp-server/rtsp-sdp.h")] - public static unowned Gst.SDPMessage rtsp_sdp_from_media (Gst.RTSPMedia media); + public static bool rtsp_sdp_from_media (ref unowned Gst.SDPMessage sdp, Gst.SDPInfo info, Gst.RTSPMedia media); } diff --git a/bindings/vala/packages/gst-rtsp-server-0.10.gi b/bindings/vala/packages/gst-rtsp-server-0.10.gi index 76671d9..8933d3b 100644 --- a/bindings/vala/packages/gst-rtsp-server-0.10.gi +++ b/bindings/vala/packages/gst-rtsp-server-0.10.gi @@ -22,8 +22,10 @@ - + + + @@ -90,8 +92,16 @@ + + + + + + + + @@ -106,6 +116,13 @@ + + + + + + + @@ -123,6 +140,7 @@ + @@ -155,11 +173,21 @@ + + + + + + + + + + @@ -202,6 +230,8 @@ + + @@ -210,6 +240,12 @@ + + + + + + @@ -217,6 +253,12 @@ + + + + + + @@ -263,6 +305,20 @@ + + + + + + + + + + + + + + @@ -291,6 +347,8 @@ + + @@ -312,14 +370,20 @@ + + + + + - + + @@ -352,6 +416,12 @@ + + + + + + @@ -361,6 +431,13 @@ + + + + + + + @@ -375,6 +452,7 @@ + @@ -415,6 +493,7 @@ + @@ -467,6 +546,12 @@ + + + + + + @@ -485,8 +570,8 @@ - - + + @@ -508,6 +593,13 @@ + + + + + + + @@ -522,11 +614,11 @@ - + - + @@ -536,9 +628,10 @@ + - + @@ -547,9 +640,9 @@ - + + - @@ -558,6 +651,12 @@ + + + + + + @@ -605,6 +704,12 @@ + + + + + + @@ -631,6 +736,7 @@ + diff --git a/bindings/vala/packages/gst-rtsp-server-0.10.metadata b/bindings/vala/packages/gst-rtsp-server-0.10.metadata index 861e11e..10c1592 100644 --- a/bindings/vala/packages/gst-rtsp-server-0.10.metadata +++ b/bindings/vala/packages/gst-rtsp-server-0.10.metadata @@ -20,12 +20,14 @@ gst_rtsp_media_factory_get_element transfer_ownership="1" nullable="1" gst_rtsp_media_factory_create_pipeline transfer_ownership="1" gst_rtsp_media_mapping_find_factory transfer_ownership="1" nullable="1" gst_rtsp_media_mapping_find_media transfer_ownership="1" nullable="1" -gst_rtsp_sdp_from_media transfer_ownership="1" +gst_rtsp_sdp_from_media.sdp is_ref="1" gst_rtsp_server_accept_client transfer_ownership="1" nullable="1" gst_rtsp_server_create_watch transfer_ownership="1" nullable="1" +gst_rtsp_server_get_address transfer_ownership="1" gst_rtsp_server_get_io_channel transfer_ownership="1" nullable="1" gst_rtsp_server_get_media_mapping transfer_ownership="1" gst_rtsp_server_get_session_pool transfer_ownership="1" +gst_rtsp_server_get_service transfer_ownership="1" gst_rtsp_server_attach.context nullable="1" gst_rtsp_session_manage_media.media takes_ownership="1" gst_rtsp_session_pool_create transfer_ownership="1" -- 2.7.4