From 458494c8e55bee227b79b29d0fbad8566d9a1e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 23 Feb 2025 18:24:38 +0000 Subject: [PATCH] csharp: gstreamer: update for 1.26 API Part-of: --- .../ges/generated/GES/DiscovererManager.cs | 81 +- .../ges/generated/GES/Global.cs | 18 + .../sources/generated/Gst.App/AppSink.cs | 36 + .../Gst.Audio/AudioChannelPosition.cs | 2 + .../generated/Gst.Audio/AudioRingBuffer.cs | 59 +- .../sources/generated/Gst.Audio/Constants.cs | 1 + .../sources/generated/Gst.Audio/Global.cs | 9 + .../sources/generated/Gst.Base/Aggregator.cs | 10 + .../sources/generated/Gst.Base/BaseSrc.cs | 25 +- .../sources/generated/Gst.Base/QueueArray.cs | 1 + .../sources/generated/Gst.Net/Global.cs | 9 + .../generated/Gst.PbUtils/EncodingProfile.cs | 20 + .../sources/generated/Gst.PbUtils/Global.cs | 107 ++ .../sources/generated/Gst.Rtp/Constants.cs | 2 +- .../generated/Gst.Rtp/RTPBaseDepayload.cs | 10 + .../generated/Gst.Rtp/RTPBasePayload.cs | 10 + .../generated/Gst.Rtsp/RTSPConnection.cs | 11 + .../sources/generated/Gst.Rtsp/RTSPResult.cs | 1 + .../generated/Gst.Rtsp/RTSPStatusCode.cs | 2 + .../Gst.RtspServer/RTSPOnvifMediaFactory.cs | 72 +- .../sources/generated/Gst.Tags/Constants.cs | 1 + .../generated/Gst.Video/AncillaryMeta.cs | 65 + .../generated/Gst.Video/AncillaryMetaField.cs | 29 + .../sources/generated/Gst.Video/Constants.cs | 5 +- .../sources/generated/Gst.Video/Global.cs | 62 + .../generated/Gst.Video/NavigationAdapter.cs | 9 + .../Gst.Video/NavigationEventType.cs | 1 + .../generated/Gst.Video/VideoEncoder.cs | 18 + .../generated/Gst.Video/VideoFormat.cs | 22 + .../Gst/AllocationMetaParamsAggregator.cs | 10 + .../sources/generated/Gst/AllocatorFlags.cs | 1 + .../generated/Gst/ByteArrayInterface.cs | 57 + .../sources/generated/Gst/Caps.cs | 43 + .../sources/generated/Gst/CapsFeatures.cs | 82 ++ .../sources/generated/Gst/Clock.cs | 12 +- .../sources/generated/Gst/Constants.cs | 1 + .../sources/generated/Gst/CustomMeta.cs | 28 +- .../sources/generated/Gst/Debug.cs | 28 + .../sources/generated/Gst/Event.cs | 1 + .../sources/generated/Gst/Global.cs | 54 +- ...rp.AllocationMetaParamsAggregatorNative.cs | 95 ++ .../Gst/GstSharp.MetaClearFunctionNative.cs | 94 ++ .../GstSharp.MetaDeserializeFunctionNative.cs | 98 ++ .../GstSharp.MetaSerializeFunctionNative.cs | 100 ++ ...Sharp.StructureFilterMapIdStrFuncNative.cs | 99 ++ ...stSharp.StructureForeachIdStrFuncNative.cs | 99 ++ .../GstSharp.StructureMapIdStrFuncNative.cs | 99 ++ .../sources/generated/Gst/IdStr.cs | 260 ++++ .../sources/generated/Gst/Message.cs | 60 + .../sources/generated/Gst/Meta.cs | 82 +- .../generated/Gst/MetaClearFunction.cs | 10 + .../generated/Gst/MetaDeserializeFunction.cs | 10 + .../sources/generated/Gst/MetaInfo.cs | 35 +- .../generated/Gst/MetaSerializeFunction.cs | 10 + .../sources/generated/Gst/ObjectFlags.cs | 1 + .../sources/generated/Gst/Pipeline.cs | 22 + .../sources/generated/Gst/Plugin.cs | 60 + .../sources/generated/Gst/SerializeFlags.cs | 1 + .../sources/generated/Gst/StreamCollection.cs | 14 +- .../generated/Gst/StreamNotifyHandler.cs | 4 +- .../sources/generated/Gst/Structure.cs | 203 +++ .../Gst/StructureFilterMapIdStrFunc.cs | 10 + .../Gst/StructureForeachIdStrFunc.cs | 10 + .../generated/Gst/StructureMapIdStrFunc.cs | 10 + .../sources/generated/Gst/Tracer.cs | 18 + .../sources/generated/Gst/Util.cs | 40 + .../sources/generated/Gst/VecDeque.cs | 34 + .../sources/generated/gstreamer-sharp-abi.c | 2 + .../sources/generated/gstreamer-sharp-abi.cs | 2 + .../sources/generated/gstreamer-sharp-api.xml | 1093 ++++++++++++++++- .../sources/generated/meson.build | 19 + .../sources/gstreamer-sharp-api.raw | 1089 +++++++++++++++- 72 files changed, 4562 insertions(+), 236 deletions(-) create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst.Video/AncillaryMeta.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst.Video/AncillaryMetaField.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/AllocationMetaParamsAggregator.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/ByteArrayInterface.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.AllocationMetaParamsAggregatorNative.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.MetaClearFunctionNative.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.MetaDeserializeFunctionNative.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.MetaSerializeFunctionNative.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.StructureFilterMapIdStrFuncNative.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.StructureForeachIdStrFuncNative.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.StructureMapIdStrFuncNative.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/IdStr.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/MetaClearFunction.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/MetaDeserializeFunction.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/MetaSerializeFunction.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/StructureFilterMapIdStrFunc.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/StructureForeachIdStrFunc.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/StructureMapIdStrFunc.cs create mode 100644 subprojects/gstreamer-sharp/sources/generated/Gst/VecDeque.cs diff --git a/subprojects/gstreamer-sharp/ges/generated/GES/DiscovererManager.cs b/subprojects/gstreamer-sharp/ges/generated/GES/DiscovererManager.cs index dd888cb0f5..6b806d7f42 100644 --- a/subprojects/gstreamer-sharp/ges/generated/GES/DiscovererManager.cs +++ b/subprojects/gstreamer-sharp/ges/generated/GES/DiscovererManager.cs @@ -54,16 +54,6 @@ namespace GES { } } - [GLib.Signal("load-serialized-info")] - public event GES.LoadSerializedInfoHandler LoadSerializedInfo { - add { - this.AddSignalHandler ("load-serialized-info", value, typeof (GES.LoadSerializedInfoArgs)); - } - remove { - this.RemoveSignalHandler ("load-serialized-info", value); - } - } - [GLib.Signal("discovered")] public event GES.DiscoveredHandler Discovered { add { @@ -74,6 +64,26 @@ namespace GES { } } + [GLib.Signal("source-setup")] + public event GES.SourceSetupHandler SourceSetup { + add { + this.AddSignalHandler ("source-setup", value, typeof (GES.SourceSetupArgs)); + } + remove { + this.RemoveSignalHandler ("source-setup", value); + } + } + + [GLib.Signal("load-serialized-info")] + public event GES.LoadSerializedInfoHandler LoadSerializedInfo { + add { + this.AddSignalHandler ("load-serialized-info", value, typeof (GES.LoadSerializedInfoArgs)); + } + remove { + this.RemoveSignalHandler ("load-serialized-info", value); + } + } + static DiscoveredNativeDelegate Discovered_cb_delegate; static DiscoveredNativeDelegate DiscoveredVMCallback { get { @@ -185,6 +195,57 @@ namespace GES { return result; } + static SourceSetupNativeDelegate SourceSetup_cb_delegate; + static SourceSetupNativeDelegate SourceSetupVMCallback { + get { + if (SourceSetup_cb_delegate == null) + SourceSetup_cb_delegate = new SourceSetupNativeDelegate (SourceSetup_cb); + return SourceSetup_cb_delegate; + } + } + + static void OverrideSourceSetup (GLib.GType gtype) + { + OverrideSourceSetup (gtype, SourceSetupVMCallback); + } + + static void OverrideSourceSetup (GLib.GType gtype, SourceSetupNativeDelegate callback) + { + OverrideVirtualMethod (gtype, "source-setup", callback); + } + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + delegate void SourceSetupNativeDelegate (IntPtr inst, IntPtr source); + + static void SourceSetup_cb (IntPtr inst, IntPtr source) + { + try { + DiscovererManager __obj = GLib.Object.GetObject (inst, false) as DiscovererManager; + __obj.OnSourceSetup (GLib.Object.GetObject(source) as Gst.Element); + } catch (Exception e) { + GLib.ExceptionManager.RaiseUnhandledException (e, false); + } + } + + [GLib.DefaultSignalHandler(Type=typeof(GES.DiscovererManager), ConnectionMethod="OverrideSourceSetup")] + protected virtual void OnSourceSetup (Gst.Element source) + { + InternalSourceSetup (source); + } + + private void InternalSourceSetup (Gst.Element source) + { + GLib.Value ret = GLib.Value.Empty; + GLib.ValueArray inst_and_params = new GLib.ValueArray (2); + GLib.Value[] vals = new GLib.Value [2]; + vals [0] = new GLib.Value (this); + inst_and_params.Append (vals [0]); + vals [1] = new GLib.Value (source); + inst_and_params.Append (vals [1]); + g_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret); + foreach (GLib.Value v in vals) + v.Dispose (); + } + // Internal representation of the wrapped structure ABI. static GLib.AbiStruct _class_abi = null; diff --git a/subprojects/gstreamer-sharp/ges/generated/GES/Global.cs b/subprojects/gstreamer-sharp/ges/generated/GES/Global.cs index 1ed283c8e3..9acd13acef 100644 --- a/subprojects/gstreamer-sharp/ges/generated/GES/Global.cs +++ b/subprojects/gstreamer-sharp/ges/generated/GES/Global.cs @@ -22,6 +22,15 @@ namespace GES { return ret; } + [DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr ges_buffer_add_frame_composition_meta(IntPtr buffer); + + public static GES.FrameCompositionMeta BufferAddFrameCompositionMeta(Gst.Buffer buffer) { + IntPtr raw_ret = ges_buffer_add_frame_composition_meta(buffer == null ? IntPtr.Zero : buffer.Handle); + GES.FrameCompositionMeta ret = GES.FrameCompositionMeta.New (raw_ret); + return ret; + } + [DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)] static extern void ges_deinit(); @@ -58,6 +67,15 @@ namespace GES { return ret; } + [DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr ges_frame_composition_meta_api_get_type(); + + public static GLib.GType FrameCompositionMetaApiGetType() { + IntPtr raw_ret = ges_frame_composition_meta_api_get_type(); + GLib.GType ret = new GLib.GType(raw_ret); + return ret; + } + [DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)] static extern bool ges_init(); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.App/AppSink.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.App/AppSink.cs index 1e3465cf06..d86db44784 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.App/AppSink.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.App/AppSink.cs @@ -116,6 +116,42 @@ namespace Gst.App { } } + [DllImport("gstapp-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern ulong gst_app_sink_get_max_bytes(IntPtr raw); + + [DllImport("gstapp-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_app_sink_set_max_bytes(IntPtr raw, ulong max); + + [GLib.Property ("max-bytes")] + public ulong MaxBytes { + get { + ulong raw_ret = gst_app_sink_get_max_bytes(Handle); + ulong ret = raw_ret; + return ret; + } + set { + gst_app_sink_set_max_bytes(Handle, value); + } + } + + [DllImport("gstapp-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern ulong gst_app_sink_get_max_time(IntPtr raw); + + [DllImport("gstapp-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_app_sink_set_max_time(IntPtr raw, ulong max); + + [GLib.Property ("max-time")] + public ulong MaxTime { + get { + ulong raw_ret = gst_app_sink_get_max_time(Handle); + ulong ret = raw_ret; + return ret; + } + set { + gst_app_sink_set_max_time(Handle, value); + } + } + [DllImport("gstapp-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_app_sink_get_wait_on_eos(IntPtr raw); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/AudioChannelPosition.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/AudioChannelPosition.cs index 8eb793d2a5..fa05e91ccb 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/AudioChannelPosition.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/AudioChannelPosition.cs @@ -41,6 +41,8 @@ namespace Gst.Audio { WideRight = 25, SurroundLeft = 26, SurroundRight = 27, + TopSurroundLeft = 28, + TopSurroundRight = 29, } internal class AudioChannelPositionGType { diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/AudioRingBuffer.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/AudioRingBuffer.cs index 3143dfd0aa..116201c6fb 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/AudioRingBuffer.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/AudioRingBuffer.cs @@ -99,21 +99,31 @@ namespace Gst.Audio { } } - public int Segdone { - get { - unsafe { - int* raw_ptr = (int*)(((byte*)Handle) + abi_info.GetFieldOffset("segdone")); - return (*raw_ptr); - } + [DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern ulong gst_audio_ring_buffer_get_segdone(IntPtr raw); + + [DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_audio_ring_buffer_set_segdone(IntPtr raw, ulong segdone); + + public ulong Segdone { + get { + ulong raw_ret = gst_audio_ring_buffer_get_segdone(Handle); + ulong ret = raw_ret; + return ret; + } + set { + gst_audio_ring_buffer_set_segdone(Handle, value); } } - public int Segbase { - get { - unsafe { - int* raw_ptr = (int*)(((byte*)Handle) + abi_info.GetFieldOffset("segbase")); - return (*raw_ptr); - } + [DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern ulong gst_audio_ring_buffer_get_segbase(IntPtr raw); + + public ulong Segbase { + get { + ulong raw_ret = gst_audio_ring_buffer_get_segbase(Handle); + ulong ret = raw_ret; + return ret; } } @@ -1184,6 +1194,13 @@ namespace Gst.Audio { } } + [DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_audio_ring_buffer_set_errored(IntPtr raw); + + public void SetErrored() { + gst_audio_ring_buffer_set_errored(Handle); + } + [DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_audio_ring_buffer_set_sample(IntPtr raw, ulong sample); @@ -1394,14 +1411,22 @@ namespace Gst.Audio { , -1 , (uint) Marshal.SizeOf(typeof(IntPtr)) // cb_data_notify , "active" - , "_gst_reserved" + , "priv" , (long) Marshal.OffsetOf(typeof(GstAudioRingBuffer_cb_data_notifyAlign), "cb_data_notify") , 0 ), + new GLib.AbiField("priv" + , -1 + , (uint) Marshal.SizeOf(typeof(IntPtr)) // priv + , "cb_data_notify" + , "_gst_reserved" + , (uint) Marshal.SizeOf(typeof(IntPtr)) + , 0 + ), new GLib.AbiField("_gst_reserved" , -1 - , (uint) Marshal.SizeOf(typeof(IntPtr)) * 3 // _gst_reserved - , "cb_data_notify" + , (uint) Marshal.SizeOf(typeof(IntPtr)) * 2 // _gst_reserved + , "priv" , null , (uint) Marshal.SizeOf(typeof(IntPtr)) , 0 @@ -1472,14 +1497,14 @@ namespace Gst.Audio { public struct GstAudioRingBuffer_segdoneAlign { sbyte f1; - private int segdone; + private ulong segdone; } [StructLayout(LayoutKind.Sequential)] public struct GstAudioRingBuffer_segbaseAlign { sbyte f1; - private int segbase; + private ulong segbase; } [StructLayout(LayoutKind.Sequential)] diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/Constants.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/Constants.cs index 68e854b2fe..e7fd3b98f5 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/Constants.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/Constants.cs @@ -27,6 +27,7 @@ namespace Gst.Audio { public const string AUDIO_ENCODER_SINK_NAME = @"sink"; public const string AUDIO_ENCODER_SRC_NAME = @"src"; public const string AUDIO_FORMATS_ALL = @"{ F64BE, F64LE, F32BE, F32LE, S32BE, S32LE, U32BE, U32LE, S24_32BE, S24_32LE, U24_32BE, U24_32LE, S24BE, S24LE, U24BE, U24LE, S20BE, S20LE, U20BE, U20LE, S18BE, S18LE, U18BE, U18LE, S16BE, S16LE, U16BE, U16LE, S8, U8 }"; + public const int AUDIO_FORMAT_LAST = 32; public const string AUDIO_RATE_RANGE = @"(int) [ 1, max ]"; public const string AUDIO_RESAMPLER_OPT_CUBIC_B = @"GstAudioResampler.cubic-b"; public const string AUDIO_RESAMPLER_OPT_CUBIC_C = @"GstAudioResampler.cubic-c"; diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/Global.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/Global.cs index 8eefab4c06..9b403143d0 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/Global.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/Global.cs @@ -357,6 +357,15 @@ namespace Gst.Audio { return ret; } + [DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_audio_reorder_channels_with_reorder_map([MarshalAs(UnmanagedType.LPArray, SizeParamIndex=1)]IntPtr[] data, UIntPtr size, int bps, int channels, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex=3)]int[] reorder_map); + + public static void AudioReorderChannelsWithReorderMap(IntPtr[] data, int bps, int[] reorder_map) { + ulong size = (ulong)(data == null ? 0 : data.Length); + int channels = (reorder_map == null ? 0 : reorder_map.Length); + gst_audio_reorder_channels_with_reorder_map(data, new UIntPtr ((uint)size), bps, channels, reorder_map); + } + [DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_audio_resampler_new(int method, int flags, int format, int channels, int in_rate, int out_rate, IntPtr options); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Base/Aggregator.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Base/Aggregator.cs index 7b423c7822..894a6dea35 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Base/Aggregator.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Base/Aggregator.cs @@ -1769,6 +1769,16 @@ namespace Gst.Base { return ret; } + [DllImport("gstbase-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_aggregator_push_src_event(IntPtr raw, IntPtr evnt); + + public bool PushSrcEvent(Gst.Event evnt) { + evnt.Owned = false; + bool raw_ret = gst_aggregator_push_src_event(Handle, evnt == null ? IntPtr.Zero : evnt.Handle); + bool ret = raw_ret; + return ret; + } + [DllImport("gstbase-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_aggregator_selected_samples(IntPtr raw, ulong pts, ulong dts, ulong duration, IntPtr info); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Base/BaseSrc.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Base/BaseSrc.cs index 3bd128deb5..f1b97331a2 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Base/BaseSrc.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Base/BaseSrc.cs @@ -18,6 +18,22 @@ namespace Gst.Base { CreateNativeObject (new string [0], new GLib.Value [0]); } + [DllImport("gstbase-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_base_src_set_automatic_eos(IntPtr raw, bool automatic_eos); + + [GLib.Property ("automatic-eos")] + public bool AutomaticEos { + get { + GLib.Value val = GetProperty ("automatic-eos"); + bool ret = (bool) val; + val.Dispose (); + return ret; + } + set { + gst_base_src_set_automatic_eos(Handle, value); + } + } + [DllImport("gstbase-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint gst_base_src_get_blocksize(IntPtr raw); @@ -1631,15 +1647,6 @@ namespace Gst.Base { } } - [DllImport("gstbase-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void gst_base_src_set_automatic_eos(IntPtr raw, bool automatic_eos); - - public bool AutomaticEos { - set { - gst_base_src_set_automatic_eos(Handle, value); - } - } - [DllImport("gstbase-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_base_src_set_caps(IntPtr raw, IntPtr caps); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Base/QueueArray.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Base/QueueArray.cs index 28ae2c4010..f41de51470 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Base/QueueArray.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Base/QueueArray.cs @@ -9,6 +9,7 @@ namespace Gst.Base { using System.Runtime.InteropServices; #region Autogenerated code + [Obsolete] public partial class QueueArray : GLib.Opaque { [DllImport("gstbase-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Net/Global.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Net/Global.cs index 18ee3c3af3..e29ddda2b0 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Net/Global.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Net/Global.cs @@ -118,6 +118,15 @@ namespace Gst.Net { return PtpInit (clock_id, null); } + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_ptp_init_full(IntPtr config); + + public static bool PtpInitFull(Gst.Structure config) { + bool raw_ret = gst_ptp_init_full(config == null ? IntPtr.Zero : config.Handle); + bool ret = raw_ret; + return ret; + } + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_ptp_is_initialized(); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/EncodingProfile.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/EncodingProfile.cs index 0463b48cff..74c3295e63 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/EncodingProfile.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/EncodingProfile.cs @@ -106,6 +106,17 @@ namespace Gst.PbUtils { return ret; } + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_encoding_profile_from_string(IntPtr str1ng); + + public static Gst.PbUtils.EncodingProfile FromString(string str1ng) { + IntPtr native_str1ng = GLib.Marshaller.StringToPtrGStrdup (str1ng); + IntPtr raw_ret = gst_encoding_profile_from_string(native_str1ng); + Gst.PbUtils.EncodingProfile ret = GLib.Object.GetObject(raw_ret, true) as Gst.PbUtils.EncodingProfile; + GLib.Marshaller.Free (native_str1ng); + return ret; + } + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_encoding_profile_copy(IntPtr raw); @@ -339,6 +350,15 @@ namespace Gst.PbUtils { } } + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_encoding_profile_to_string(IntPtr raw); + + public override string ToString() { + IntPtr raw_ret = gst_encoding_profile_to_string(Handle); + string ret = GLib.Marshaller.PtrToStringGFree(raw_ret); + return ret; + } + static EncodingProfile () { diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Global.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Global.cs index d4536d1d73..c6d6f397b0 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Global.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Global.cs @@ -79,6 +79,44 @@ namespace Gst.PbUtils { return ret; } + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_codec_utils_av1_create_av1c_from_caps(IntPtr caps); + + public static Gst.Buffer CodecUtilsAv1CreateAv1cFromCaps(Gst.Caps caps) { + IntPtr raw_ret = gst_codec_utils_av1_create_av1c_from_caps(caps == null ? IntPtr.Zero : caps.Handle); + Gst.Buffer ret = raw_ret == IntPtr.Zero ? null : (Gst.Buffer) GLib.Opaque.GetOpaque (raw_ret, typeof (Gst.Buffer), true); + return ret; + } + + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_codec_utils_av1_create_caps_from_av1c(IntPtr av1c); + + public static Gst.Caps CodecUtilsAv1CreateCapsFromAv1c(Gst.Buffer av1c) { + IntPtr raw_ret = gst_codec_utils_av1_create_caps_from_av1c(av1c == null ? IntPtr.Zero : av1c.Handle); + Gst.Caps ret = raw_ret == IntPtr.Zero ? null : (Gst.Caps) GLib.Opaque.GetOpaque (raw_ret, typeof (Gst.Caps), true); + return ret; + } + + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_codec_utils_av1_get_level(byte seq_level_idx); + + public static string CodecUtilsAv1GetLevel(byte seq_level_idx) { + IntPtr raw_ret = gst_codec_utils_av1_get_level(seq_level_idx); + string ret = GLib.Marshaller.Utf8PtrToString (raw_ret); + return ret; + } + + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern byte gst_codec_utils_av1_get_seq_level_idx(IntPtr level); + + public static byte CodecUtilsAv1GetSeqLevelIdx(string level) { + IntPtr native_level = GLib.Marshaller.StringToPtrGStrdup (level); + byte raw_ret = gst_codec_utils_av1_get_seq_level_idx(native_level); + byte ret = raw_ret; + GLib.Marshaller.Free (native_level); + return ret; + } + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_codec_utils_caps_from_mime_codec(IntPtr codecs_field); @@ -201,6 +239,57 @@ namespace Gst.PbUtils { return ret; } + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_codec_utils_h266_caps_set_level_tier_and_profile(IntPtr caps, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex=2)]byte[] decoder_configuration, uint len); + + public static bool CodecUtilsH266CapsSetLevelTierAndProfile(Gst.Caps caps, byte[] decoder_configuration) { + uint len = (uint)(decoder_configuration == null ? 0 : decoder_configuration.Length); + bool raw_ret = gst_codec_utils_h266_caps_set_level_tier_and_profile(caps == null ? IntPtr.Zero : caps.Handle, decoder_configuration, len); + bool ret = raw_ret; + return ret; + } + + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_codec_utils_h266_get_level([MarshalAs(UnmanagedType.LPArray, SizeParamIndex=1)]byte[] ptl_record, uint len); + + public static string CodecUtilsH266GetLevel(byte[] ptl_record) { + uint len = (uint)(ptl_record == null ? 0 : ptl_record.Length); + IntPtr raw_ret = gst_codec_utils_h266_get_level(ptl_record, len); + string ret = GLib.Marshaller.Utf8PtrToString (raw_ret); + return ret; + } + + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern byte gst_codec_utils_h266_get_level_idc(IntPtr level); + + public static byte CodecUtilsH266GetLevelIdc(string level) { + IntPtr native_level = GLib.Marshaller.StringToPtrGStrdup (level); + byte raw_ret = gst_codec_utils_h266_get_level_idc(native_level); + byte ret = raw_ret; + GLib.Marshaller.Free (native_level); + return ret; + } + + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_codec_utils_h266_get_profile([MarshalAs(UnmanagedType.LPArray, SizeParamIndex=1)]byte[] ptl_record, uint len); + + public static string CodecUtilsH266GetProfile(byte[] ptl_record) { + uint len = (uint)(ptl_record == null ? 0 : ptl_record.Length); + IntPtr raw_ret = gst_codec_utils_h266_get_profile(ptl_record, len); + string ret = GLib.Marshaller.Utf8PtrToString (raw_ret); + return ret; + } + + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_codec_utils_h266_get_tier([MarshalAs(UnmanagedType.LPArray, SizeParamIndex=1)]byte[] ptl_record, uint len); + + public static string CodecUtilsH266GetTier(byte[] ptl_record) { + uint len = (uint)(ptl_record == null ? 0 : ptl_record.Length); + IntPtr raw_ret = gst_codec_utils_h266_get_tier(ptl_record, len); + string ret = GLib.Marshaller.Utf8PtrToString (raw_ret); + return ret; + } + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_codec_utils_mpeg4video_caps_set_level_and_profile(IntPtr caps, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex=2)]byte[] vis_obj_seq, uint len); @@ -424,6 +513,24 @@ namespace Gst.PbUtils { return ret; } + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_missing_plugin_message_get_stream_id(IntPtr msg); + + public static string MissingPluginMessageGetStreamId(Gst.Message msg) { + IntPtr raw_ret = gst_missing_plugin_message_get_stream_id(msg == null ? IntPtr.Zero : msg.Handle); + string ret = GLib.Marshaller.Utf8PtrToString (raw_ret); + return ret; + } + + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_missing_plugin_message_set_stream_id(IntPtr msg, IntPtr stream_id); + + public static void MissingPluginMessageSetStreamId(Gst.Message msg, string stream_id) { + IntPtr native_stream_id = GLib.Marshaller.StringToPtrGStrdup (stream_id); + gst_missing_plugin_message_set_stream_id(msg == null ? IntPtr.Zero : msg.Handle, native_stream_id); + GLib.Marshaller.Free (native_stream_id); + } + [DllImport("gstpbutils-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_missing_uri_sink_installer_detail_new(IntPtr protocol); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Rtp/Constants.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Rtp/Constants.cs index 249f145a54..ce1d7040e0 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Rtp/Constants.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Rtp/Constants.cs @@ -17,7 +17,7 @@ namespace Gst.Rtp { public const int RTCP_MAX_SDES_ITEM_COUNT = 31; public const int RTCP_REDUCED_SIZE_VALID_MASK = 49400; public const int RTCP_VALID_MASK = 57598; - public const int RTCP_VALID_VALUE = 200; + public const int RTCP_VALID_VALUE = 32968; public const int RTCP_VERSION = 2; public const string RTP_HDREXT_BASE = @"urn:ietf:params:rtp-hdrext:"; public const string RTP_HDREXT_ELEMENT_CLASS = @"Network/Extension/RTPHeader"; diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Rtp/RTPBaseDepayload.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Rtp/RTPBaseDepayload.cs index d183a5017a..a943cf5512 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Rtp/RTPBaseDepayload.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Rtp/RTPBaseDepayload.cs @@ -33,6 +33,16 @@ namespace Gst.Rtp { } } + [GLib.Property ("extensions")] + public Gst.ValueArray Extensions { + get { + GLib.Value val = GetProperty ("extensions"); + Gst.ValueArray ret = (Gst.ValueArray) val; + val.Dispose (); + return ret; + } + } + [GLib.Property ("max-reorder")] public int MaxReorder { get { diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Rtp/RTPBasePayload.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Rtp/RTPBasePayload.cs index 4f08a2ad14..61da63c68c 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Rtp/RTPBasePayload.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Rtp/RTPBasePayload.cs @@ -33,6 +33,16 @@ namespace Gst.Rtp { } } + [GLib.Property ("extensions")] + public Gst.ValueArray Extensions { + get { + GLib.Value val = GetProperty ("extensions"); + Gst.ValueArray ret = (Gst.ValueArray) val; + val.Dispose (); + return ret; + } + } + [GLib.Property ("max-ptime")] public long MaxPtime { get { diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Rtsp/RTSPConnection.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Rtsp/RTSPConnection.cs index 319d748c86..5bf48551f0 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Rtsp/RTSPConnection.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Rtsp/RTSPConnection.cs @@ -11,6 +11,17 @@ namespace Gst.Rtsp { #region Autogenerated code public partial class RTSPConnection : GLib.Opaque { + [DllImport("gstrtsp-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_rtsp_connection_add_extra_http_request_header(IntPtr raw, IntPtr key, IntPtr value); + + public void AddExtraHttpRequestHeader(string key, string value) { + IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key); + IntPtr native_value = GLib.Marshaller.StringToPtrGStrdup (value); + gst_rtsp_connection_add_extra_http_request_header(Handle, native_key, native_value); + GLib.Marshaller.Free (native_key); + GLib.Marshaller.Free (native_value); + } + [DllImport("gstrtsp-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_rtsp_connection_clear_auth_params(IntPtr raw); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Rtsp/RTSPResult.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Rtsp/RTSPResult.cs index 495de43f62..f085b8dc6a 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Rtsp/RTSPResult.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Rtsp/RTSPResult.cs @@ -28,6 +28,7 @@ namespace Gst.Rtsp { Einval = -2, Error = -1, Ok = 0, + OkRedirect = 1, } internal class RTSPResultGType { diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Rtsp/RTSPStatusCode.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Rtsp/RTSPStatusCode.cs index 51fa41af83..bc5bda06d2 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Rtsp/RTSPStatusCode.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Rtsp/RTSPStatusCode.cs @@ -21,6 +21,8 @@ namespace Gst.Rtsp { SeeOther = 303, NotModified = 304, UseProxy = 305, + RedirectTemporarily = 307, + RedirectPermanently = 308, BadRequest = 400, Unauthorized = 401, PaymentRequired = 402, diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.RtspServer/RTSPOnvifMediaFactory.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.RtspServer/RTSPOnvifMediaFactory.cs index a38c9c8d2b..70b3912369 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.RtspServer/RTSPOnvifMediaFactory.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.RtspServer/RTSPOnvifMediaFactory.cs @@ -83,6 +83,66 @@ namespace Gst.RtspServer { return __result; } + static CreateBackchannelStreamNativeDelegate CreateBackchannelStream_cb_delegate; + static CreateBackchannelStreamNativeDelegate CreateBackchannelStreamVMCallback { + get { + if (CreateBackchannelStream_cb_delegate == null) + CreateBackchannelStream_cb_delegate = new CreateBackchannelStreamNativeDelegate (CreateBackchannelStream_cb); + return CreateBackchannelStream_cb_delegate; + } + } + + static void OverrideCreateBackchannelStream (GLib.GType gtype) + { + OverrideCreateBackchannelStream (gtype, CreateBackchannelStreamVMCallback); + } + + static void OverrideCreateBackchannelStream (GLib.GType gtype, CreateBackchannelStreamNativeDelegate callback) + { + unsafe { + IntPtr* raw_ptr = (IntPtr*)(((long) gtype.GetClassPtr()) + (long) class_abi.GetFieldOffset("create_backchannel_stream")); + *raw_ptr = Marshal.GetFunctionPointerForDelegate((Delegate) callback); + } + } + + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + delegate bool CreateBackchannelStreamNativeDelegate (IntPtr inst, IntPtr media, IntPtr ctx); + + static bool CreateBackchannelStream_cb (IntPtr inst, IntPtr media, IntPtr ctx) + { + try { + RTSPOnvifMediaFactory __obj = GLib.Object.GetObject (inst, false) as RTSPOnvifMediaFactory; + bool __result; + __result = __obj.OnCreateBackchannelStream (GLib.Object.GetObject(media) as Gst.RtspServer.RTSPOnvifMedia, Gst.RtspServer.RTSPContext.New (ctx)); + return __result; + } catch (Exception e) { + GLib.ExceptionManager.RaiseUnhandledException (e, true); + // NOTREACHED: above call does not return. + throw e; + } + } + + [GLib.DefaultSignalHandler(Type=typeof(Gst.RtspServer.RTSPOnvifMediaFactory), ConnectionMethod="OverrideCreateBackchannelStream")] + protected virtual bool OnCreateBackchannelStream (Gst.RtspServer.RTSPOnvifMedia media, Gst.RtspServer.RTSPContext ctx) + { + return InternalCreateBackchannelStream (media, ctx); + } + + private bool InternalCreateBackchannelStream (Gst.RtspServer.RTSPOnvifMedia media, Gst.RtspServer.RTSPContext ctx) + { + CreateBackchannelStreamNativeDelegate unmanaged = null; + unsafe { + IntPtr* raw_ptr = (IntPtr*)(((long) this.LookupGType().GetThresholdType().GetClassPtr()) + (long) class_abi.GetFieldOffset("create_backchannel_stream")); + unmanaged = (CreateBackchannelStreamNativeDelegate) Marshal.GetDelegateForFunctionPointer(*raw_ptr, typeof(CreateBackchannelStreamNativeDelegate)); + } + if (unmanaged == null) return false; + + IntPtr native_ctx = GLib.Marshaller.StructureToPtrAlloc (ctx); + bool __result = unmanaged (this.Handle, media == null ? IntPtr.Zero : media.Handle, native_ctx); + Marshal.FreeHGlobal (native_ctx); + return __result; + } + // Internal representation of the wrapped structure ABI. static GLib.AbiStruct _class_abi = null; @@ -94,14 +154,22 @@ namespace Gst.RtspServer { , Gst.RtspServer.RTSPMediaFactory.class_abi.Fields , (uint) Marshal.SizeOf(typeof(IntPtr)) // has_backchannel_support , null + , "create_backchannel_stream" + , (uint) Marshal.SizeOf(typeof(IntPtr)) + , 0 + ), + new GLib.AbiField("create_backchannel_stream" + , -1 + , (uint) Marshal.SizeOf(typeof(IntPtr)) // create_backchannel_stream + , "has_backchannel_support" , "_gst_reserved" , (uint) Marshal.SizeOf(typeof(IntPtr)) , 0 ), new GLib.AbiField("_gst_reserved" , -1 - , (uint) Marshal.SizeOf(typeof(IntPtr)) * 20 // _gst_reserved - , "has_backchannel_support" + , (uint) Marshal.SizeOf(typeof(IntPtr)) * 19 // _gst_reserved + , "create_backchannel_stream" , null , (uint) Marshal.SizeOf(typeof(IntPtr)) , 0 diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Tags/Constants.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Tags/Constants.cs index c57955ea5c..5a9479404f 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Tags/Constants.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Tags/Constants.cs @@ -25,6 +25,7 @@ namespace Gst.Tags { public const string TAG_CAPTURING_FOCAL_RATIO = @"capturing-focal-ratio"; public const string TAG_CAPTURING_GAIN_ADJUSTMENT = @"capturing-gain-adjustment"; public const string TAG_CAPTURING_ISO_SPEED = @"capturing-iso-speed"; + public const string TAG_CAPTURING_LIGHT_SOURCE = @"capturing-light-source"; public const string TAG_CAPTURING_METERING_MODE = @"capturing-metering-mode"; public const string TAG_CAPTURING_SATURATION = @"capturing-saturation"; public const string TAG_CAPTURING_SCENE_CAPTURE_TYPE = @"capturing-scene-capture-type"; diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/AncillaryMeta.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/AncillaryMeta.cs new file mode 100644 index 0000000000..cdc1a3d156 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/AncillaryMeta.cs @@ -0,0 +1,65 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace Gst.Video { + + using System; + using System.Collections; + using System.Collections.Generic; + using System.Runtime.InteropServices; + +#region Autogenerated code + [StructLayout(LayoutKind.Sequential)] + public partial struct AncillaryMeta : IEquatable { + + public Gst.Meta Meta; + public Gst.Video.AncillaryMetaField Field; + public bool CNotYChannel; + public ushort Line; + public ushort Offset; + public ushort DID; + public ushort SDIDBlockNumber; + public ushort DataCount; + public ushort Data; + public ushort Checksum; + + public static Gst.Video.AncillaryMeta Zero = new Gst.Video.AncillaryMeta (); + + public static Gst.Video.AncillaryMeta New(IntPtr raw) { + if (raw == IntPtr.Zero) + return Gst.Video.AncillaryMeta.Zero; + return (Gst.Video.AncillaryMeta) Marshal.PtrToStructure (raw, typeof (Gst.Video.AncillaryMeta)); + } + + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_ancillary_meta_get_info(); + + public static Gst.MetaInfo Info { + get { + IntPtr raw_ret = gst_ancillary_meta_get_info(); + Gst.MetaInfo ret = Gst.MetaInfo.New (raw_ret); + return ret; + } + } + + public bool Equals (AncillaryMeta other) + { + return true && Meta.Equals (other.Meta) && Field.Equals (other.Field) && CNotYChannel.Equals (other.CNotYChannel) && Line.Equals (other.Line) && Offset.Equals (other.Offset) && DID.Equals (other.DID) && SDIDBlockNumber.Equals (other.SDIDBlockNumber) && DataCount.Equals (other.DataCount) && Data.Equals (other.Data) && Checksum.Equals (other.Checksum); + } + + public override bool Equals (object other) + { + return other is AncillaryMeta && Equals ((AncillaryMeta) other); + } + + public override int GetHashCode () + { + return this.GetType ().FullName.GetHashCode () ^ Meta.GetHashCode () ^ Field.GetHashCode () ^ CNotYChannel.GetHashCode () ^ Line.GetHashCode () ^ Offset.GetHashCode () ^ DID.GetHashCode () ^ SDIDBlockNumber.GetHashCode () ^ DataCount.GetHashCode () ^ Data.GetHashCode () ^ Checksum.GetHashCode (); + } + + private static GLib.GType GType { + get { return GLib.GType.Pointer; } + } +#endregion + } +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/AncillaryMetaField.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/AncillaryMetaField.cs new file mode 100644 index 0000000000..e9c766cc06 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/AncillaryMetaField.cs @@ -0,0 +1,29 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace Gst.Video { + + using System; + using System.Runtime.InteropServices; + +#region Autogenerated code + [GLib.GType (typeof (Gst.Video.AncillaryMetaFieldGType))] + public enum AncillaryMetaField { + + Progressive = 0, + InterlacedFirst = 16, + InterlacedSecond = 17, + } + + internal class AncillaryMetaFieldGType { + [DllImport ("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_ancillary_meta_field_get_type (); + + public static GLib.GType GType { + get { + return new GLib.GType (gst_ancillary_meta_field_get_type ()); + } + } + } +#endregion +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/Constants.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/Constants.cs index 427d24b462..6482f04085 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/Constants.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/Constants.cs @@ -71,7 +71,10 @@ namespace Gst.Video { public const string VIDEO_ENCODER_SINK_NAME = @"sink"; public const string VIDEO_ENCODER_SRC_NAME = @"src"; public const string VIDEO_FORMATS_ALL = @"{ "; - public const string VIDEO_FORMATS_ALL_STR = @"ABGR64_BE, BGRA64_BE, AYUV64, ARGB64_BE, ARGB64, RGBA64_BE, ABGR64_LE, BGRA64_LE, ARGB64_LE, RGBA64_LE, GBRA_12BE, GBRA_12LE, Y412_BE, Y412_LE, A444_10BE, GBRA_10BE, A444_10LE, GBRA_10LE, A422_10BE, A422_10LE, A420_10BE, A420_10LE, Y410, RGB10A2_LE, BGR10A2_LE, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16BE, Y444_16LE, v216, P016_BE, P016_LE, Y444_12BE, GBR_12BE, Y444_12LE, GBR_12LE, I422_12BE, I422_12LE, Y212_BE, Y212_LE, I420_12BE, I420_12LE, P012_BE, P012_LE, Y444_10BE, GBR_10BE, Y444_10LE, GBR_10LE, r210, I422_10BE, I422_10LE, NV16_10LE32, Y210, v210, UYVP, I420_10BE, I420_10LE, P010_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, NV12_10BE_8L128, NV12_10LE40_4L4, MT2110T, MT2110R, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_BE, GRAY16_LE, GRAY10_LE32, GRAY8"; + public const string VIDEO_FORMATS_ALL_STR = @"A444_16BE, A444_16LE, AYUV64, ARGB64, Y416_BE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, Y416_LE, RGBA64_LE, ARGB64_LE, BGRA64_LE, ABGR64_LE, A422_16BE, A422_16LE, A420_16BE, A420_16LE, A444_12BE, GBRA_12BE, A444_12LE, GBRA_12LE, Y412_BE, Y412_LE, A422_12BE, A422_12LE, A420_12BE, A420_12LE, A444_10BE, GBRA_10BE, A444_10LE, GBRA_10LE, A422_10BE, A422_10LE, A420_10BE, A420_10LE, Y410, BGR10A2_LE, RGB10A2_LE, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16BE, GBR_16BE, Y444_16LE, GBR_16LE, Y216_BE, v216, Y216_LE, P016_BE, P016_LE, Y444_12BE, GBR_12BE, Y444_12LE, GBR_12LE, I422_12BE, I422_12LE, Y212_BE, Y212_LE, I420_12BE, I420_12LE, P012_BE, P012_LE, Y444_10BE, GBR_10BE, Y444_10LE, GBR_10LE, r210, I422_10BE, I422_10LE, NV16_10LE32, Y210, UYVP, v210, I420_10BE, I420_10LE, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, P010_10LE, NV12_10LE40, NV12_10LE32, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_BE, GRAY16_LE, GRAY10_LE16, GRAY10_LE32, GRAY8"; + public const string VIDEO_FORMATS_ANY = @"{ "; + public const string VIDEO_FORMATS_ANY_STR = @"DMA_DRM, "; + public const int VIDEO_FORMAT_LAST = 139; public const string VIDEO_FPS_RANGE = @"(fraction) [ 0, max ]"; public const int VIDEO_MAX_COMPONENTS = 4; public const int VIDEO_MAX_PLANES = 4; diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/Global.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/Global.cs index a175190ca2..07769b4b52 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/Global.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/Global.cs @@ -11,6 +11,33 @@ namespace Gst.Video { #region Autogenerated code public partial class Global { + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_ancillary_meta_api_get_type(); + + public static GLib.GType AncillaryMetaApiGetType() { + IntPtr raw_ret = gst_ancillary_meta_api_get_type(); + GLib.GType ret = new GLib.GType(raw_ret); + return ret; + } + + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_ancillary_meta_get_info(); + + public static Gst.MetaInfo AncillaryMetaGetInfo() { + IntPtr raw_ret = gst_ancillary_meta_get_info(); + Gst.MetaInfo ret = Gst.MetaInfo.New (raw_ret); + return ret; + } + + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_buffer_add_ancillary_meta(IntPtr buffer); + + public static Gst.Video.AncillaryMeta BufferAddAncillaryMeta(Gst.Buffer buffer) { + IntPtr raw_ret = gst_buffer_add_ancillary_meta(buffer == null ? IntPtr.Zero : buffer.Handle); + Gst.Video.AncillaryMeta ret = Gst.Video.AncillaryMeta.New (raw_ret); + return ret; + } + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_buffer_add_video_afd_meta(IntPtr buffer, byte field, int spec, int afd); @@ -119,6 +146,10 @@ namespace Gst.Video { return ret; } + public static Gst.Video.VideoSEIUserDataUnregisteredMeta BufferAddVideoSeiUserDataUnregisteredMeta(Gst.Buffer buffer, byte uuid, ulong size) { + return BufferAddVideoSeiUserDataUnregisteredMeta (buffer, uuid, 0, size); + } + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_buffer_add_video_time_code_meta(IntPtr buffer, IntPtr tc); @@ -262,6 +293,15 @@ namespace Gst.Video { return ret; } + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_navigation_event_new_mouse_double_click(int button, double x, double y, int state); + + public static Gst.Event NavigationEventNewMouseDoubleClick(int button, double x, double y, Gst.Video.NavigationModifierType state) { + IntPtr raw_ret = gst_navigation_event_new_mouse_double_click(button, x, y, (int) state); + Gst.Event ret = raw_ret == IntPtr.Zero ? null : (Gst.Event) GLib.Opaque.GetOpaque (raw_ret, typeof (Gst.Event), true); + return ret; + } + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_navigation_event_new_mouse_move(double x, double y, int state); @@ -906,6 +946,28 @@ namespace Gst.Video { return ret; } + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern uint gst_video_dma_drm_format_from_gst_format(int format, ulong modifier); + + public static uint VideoDmaDrmFormatFromGstFormat(Gst.Video.VideoFormat format, ulong modifier) { + uint raw_ret = gst_video_dma_drm_format_from_gst_format((int) format, modifier); + uint ret = raw_ret; + return ret; + } + + public static uint VideoDmaDrmFormatFromGstFormat(Gst.Video.VideoFormat format) { + return VideoDmaDrmFormatFromGstFormat (format, 0); + } + + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern int gst_video_dma_drm_format_to_gst_format(uint fourcc, ulong modifier); + + public static Gst.Video.VideoFormat VideoDmaDrmFormatToGstFormat(uint fourcc, ulong modifier) { + int raw_ret = gst_video_dma_drm_format_to_gst_format(fourcc, modifier); + Gst.Video.VideoFormat ret = (Gst.Video.VideoFormat) raw_ret; + return ret; + } + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint gst_video_dma_drm_fourcc_from_format(int format); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/NavigationAdapter.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/NavigationAdapter.cs index 3e401c2ea9..4ed2385ea8 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/NavigationAdapter.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/NavigationAdapter.cs @@ -204,6 +204,15 @@ namespace Gst.Video { return ret; } + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_navigation_event_new_mouse_double_click(int button, double x, double y, int state); + + public static Gst.Event EventNewMouseDoubleClick(int button, double x, double y, Gst.Video.NavigationModifierType state) { + IntPtr raw_ret = gst_navigation_event_new_mouse_double_click(button, x, y, (int) state); + Gst.Event ret = raw_ret == IntPtr.Zero ? null : (Gst.Event) GLib.Opaque.GetOpaque (raw_ret, typeof (Gst.Event), true); + return ret; + } + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_navigation_event_new_mouse_move(double x, double y, int state); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/NavigationEventType.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/NavigationEventType.cs index 7a05dce32b..9ac4719ef6 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/NavigationEventType.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/NavigationEventType.cs @@ -23,6 +23,7 @@ namespace Gst.Video { TouchUp = 10, TouchFrame = 11, TouchCancel = 12, + MouseDoubleClick = 13, } internal class NavigationEventTypeGType { diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/VideoEncoder.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/VideoEncoder.cs index 72f8991f7f..8663666186 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/VideoEncoder.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/VideoEncoder.cs @@ -1370,6 +1370,15 @@ namespace Gst.Video { return ret; } + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_video_encoder_drop_frame(IntPtr raw, IntPtr frame); + + public void DropFrame(Gst.Video.VideoCodecFrame frame) { + IntPtr native_frame = GLib.Marshaller.StructureToPtrAlloc (frame); + gst_video_encoder_drop_frame(Handle, native_frame); + Marshal.FreeHGlobal (native_frame); + } + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int gst_video_encoder_finish_frame(IntPtr raw, IntPtr frame); @@ -1508,6 +1517,15 @@ namespace Gst.Video { return ProxyGetcaps (null, null); } + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_video_encoder_release_frame(IntPtr raw, IntPtr frame); + + public void ReleaseFrame(Gst.Video.VideoCodecFrame frame) { + IntPtr native_frame = GLib.Marshaller.StructureToPtrAlloc (frame); + gst_video_encoder_release_frame(Handle, native_frame); + Marshal.FreeHGlobal (native_frame); + } + [DllImport("gstvideo-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_video_encoder_set_headers(IntPtr raw, IntPtr headers); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/VideoFormat.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/VideoFormat.cs index 77c67cd03a..4fb8cd7422 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.Video/VideoFormat.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Video/VideoFormat.cs @@ -127,6 +127,28 @@ namespace Gst.Video { DmaDrm = 114, Mt2110t = 115, Mt2110r = 116, + A422 = 117, + A444 = 118, + A44412le = 119, + A44412be = 120, + A42212le = 121, + A42212be = 122, + A42012le = 123, + A42012be = 124, + A44416le = 125, + A44416be = 126, + A42216le = 127, + A42216be = 128, + A42016le = 129, + A42016be = 130, + Gbr16le = 131, + Gbr16be = 132, + Rbga = 133, + Y216Le = 134, + Y216Be = 135, + Y416Le = 136, + Y416Be = 137, + Gray10Le16 = 138, } internal class VideoFormatGType { diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/AllocationMetaParamsAggregator.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/AllocationMetaParamsAggregator.cs new file mode 100644 index 0000000000..58a5e456ff --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/AllocationMetaParamsAggregator.cs @@ -0,0 +1,10 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace Gst { + + using System; + + public delegate bool AllocationMetaParamsAggregator(Gst.Structure aggregated_params, Gst.Structure params0, Gst.Structure params1); + +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/AllocatorFlags.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/AllocatorFlags.cs index 88b80c6db2..027a8c4891 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/AllocatorFlags.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/AllocatorFlags.cs @@ -12,6 +12,7 @@ namespace Gst { public enum AllocatorFlags : uint { CustomAlloc = 16, + NoCopy = 32, Last = 1048576, } diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/ByteArrayInterface.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/ByteArrayInterface.cs new file mode 100644 index 0000000000..731e4e3ebe --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/ByteArrayInterface.cs @@ -0,0 +1,57 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace Gst { + + using System; + using System.Collections; + using System.Collections.Generic; + using System.Runtime.InteropServices; + +#region Autogenerated code + [StructLayout(LayoutKind.Sequential)] + public partial struct ByteArrayInterface : IEquatable { + + public byte Data; + private UIntPtr len; + public ulong Len { + get { + return (ulong) len; + } + set { + len = new UIntPtr (value); + } + } + private IntPtr _resize; + [MarshalAs (UnmanagedType.ByValArray, SizeConst=4)] + private IntPtr[] _gstGstReserved; + + public static Gst.ByteArrayInterface Zero = new Gst.ByteArrayInterface (); + + public static Gst.ByteArrayInterface New(IntPtr raw) { + if (raw == IntPtr.Zero) + return Gst.ByteArrayInterface.Zero; + return (Gst.ByteArrayInterface) Marshal.PtrToStructure (raw, typeof (Gst.ByteArrayInterface)); + } + + public bool Equals (ByteArrayInterface other) + { + return true && Data.Equals (other.Data) && Len.Equals (other.Len) && _resize.Equals (other._resize); + } + + public override bool Equals (object other) + { + return other is ByteArrayInterface && Equals ((ByteArrayInterface) other); + } + + public override int GetHashCode () + { + return this.GetType ().FullName.GetHashCode () ^ Data.GetHashCode () ^ Len.GetHashCode () ^ _resize.GetHashCode (); + } + + private static GLib.GType GType { + get { return GLib.GType.Pointer; } + } +#endregion + } +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Caps.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Caps.cs index 1c3666e946..2fc4843f60 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Caps.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Caps.cs @@ -135,6 +135,17 @@ namespace Gst { return ret; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_caps_id_str_set_value(IntPtr raw, IntPtr field, IntPtr value); + + public void IdStrSetValue(Gst.IdStr field, GLib.Value value) { + IntPtr native_field = GLib.Marshaller.StructureToPtrAlloc (field); + IntPtr native_value = GLib.Marshaller.StructureToPtrAlloc (value); + gst_caps_id_str_set_value(Handle, native_field, native_value); + Marshal.FreeHGlobal (native_field); + Marshal.FreeHGlobal (native_value); + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_caps_intersect(IntPtr raw, IntPtr caps2); @@ -361,6 +372,17 @@ namespace Gst { Marshal.FreeHGlobal (native_value); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_caps_set_value_static_str(IntPtr raw, IntPtr field, IntPtr value); + + public void SetValueStaticStr(string field, GLib.Value value) { + IntPtr native_field = GLib.Marshaller.StringToPtrGStrdup (field); + IntPtr native_value = GLib.Marshaller.StructureToPtrAlloc (value); + gst_caps_set_value_static_str(Handle, native_field, native_value); + GLib.Marshaller.Free (native_field); + Marshal.FreeHGlobal (native_value); + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_caps_simplify(IntPtr raw); @@ -437,6 +459,27 @@ namespace Gst { GLib.Marshaller.Free (native_media_type); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_caps_new_id_str_empty_simple(IntPtr media_type); + + public Caps (Gst.IdStr media_type) : base (IntPtr.Zero) + { + IntPtr native_media_type = GLib.Marshaller.StructureToPtrAlloc (media_type); + Raw = gst_caps_new_id_str_empty_simple(native_media_type); + Marshal.FreeHGlobal (native_media_type); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_caps_new_static_str_empty_simple(IntPtr media_type); + + public static Caps NewStaticStrEmptySimple(string media_type) + { + IntPtr native_media_type = GLib.Marshaller.StringToPtrGStrdup (media_type); + Caps result = new Caps (gst_caps_new_static_str_empty_simple(native_media_type)); + GLib.Marshaller.Free (native_media_type); + return result; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_caps_new_any(); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/CapsFeatures.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/CapsFeatures.cs index 4c4911b5ca..39aad9a570 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/CapsFeatures.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/CapsFeatures.cs @@ -50,6 +50,17 @@ namespace Gst { return result; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_caps_features_new_single_static_str(IntPtr feature); + + public static CapsFeatures NewSingleStaticStr(string feature) + { + IntPtr native_feature = GLib.Marshaller.StringToPtrGStrdup (feature); + CapsFeatures result = CapsFeatures.New (gst_caps_features_new_single_static_str(native_feature)); + GLib.Marshaller.Free (native_feature); + return result; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_caps_features_get_type(); @@ -77,6 +88,7 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_caps_features_add_id(IntPtr raw, uint feature); + [Obsolete] public void AddId(uint feature) { IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); @@ -85,6 +97,32 @@ namespace Gst { System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_caps_features_add_id_str(IntPtr raw, IntPtr feature); + + public void AddIdStr(Gst.IdStr feature) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_feature = GLib.Marshaller.StructureToPtrAlloc (feature); + gst_caps_features_add_id_str(this_as_native, native_feature); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + Marshal.FreeHGlobal (native_feature); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_caps_features_add_static_str(IntPtr raw, IntPtr feature); + + public void AddStaticStr(string feature) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_feature = GLib.Marshaller.StringToPtrGStrdup (feature); + gst_caps_features_add_static_str(this_as_native, native_feature); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + GLib.Marshaller.Free (native_feature); + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_caps_features_contains(IntPtr raw, IntPtr feature); @@ -103,6 +141,7 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_caps_features_contains_id(IntPtr raw, uint feature); + [Obsolete] public bool ContainsId(uint feature) { IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); @@ -113,6 +152,21 @@ namespace Gst { return ret; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_caps_features_contains_id_str(IntPtr raw, IntPtr feature); + + public bool ContainsIdStr(Gst.IdStr feature) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_feature = GLib.Marshaller.StructureToPtrAlloc (feature); + bool raw_ret = gst_caps_features_contains_id_str(this_as_native, native_feature); + bool ret = raw_ret; + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + Marshal.FreeHGlobal (native_feature); + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_caps_features_get_nth(IntPtr raw, uint i); @@ -129,6 +183,7 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint gst_caps_features_get_nth_id(IntPtr raw, uint i); + [Obsolete] public uint GetNthId(uint i) { IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); @@ -139,6 +194,19 @@ namespace Gst { return ret; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_caps_features_get_nth_id_str(IntPtr raw, uint i); + + public Gst.IdStr GetNthIdStr(uint i) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr raw_ret = gst_caps_features_get_nth_id_str(this_as_native, i); + Gst.IdStr ret = Gst.IdStr.New (raw_ret); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint gst_caps_features_get_size(IntPtr raw); @@ -200,6 +268,7 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_caps_features_remove_id(IntPtr raw, uint feature); + [Obsolete] public void RemoveId(uint feature) { IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); @@ -208,6 +277,19 @@ namespace Gst { System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_caps_features_remove_id_str(IntPtr raw, IntPtr feature); + + public void RemoveIdStr(Gst.IdStr feature) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_feature = GLib.Marshaller.StructureToPtrAlloc (feature); + gst_caps_features_remove_id_str(this_as_native, native_feature); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + Marshal.FreeHGlobal (native_feature); + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_caps_features_set_parent_refcount(IntPtr raw, int refcount); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Clock.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Clock.cs index d0278fbf01..a761a531d5 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Clock.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Clock.cs @@ -645,19 +645,19 @@ namespace Gst { } [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern bool gst_clock_add_observation(IntPtr raw, ulong slave, ulong master, out double r_squared); + static extern bool gst_clock_add_observation(IntPtr raw, ulong observation_internal, ulong observation_external, out double r_squared); - public bool AddObservation(ulong slave, ulong master, out double r_squared) { - bool raw_ret = gst_clock_add_observation(Handle, slave, master, out r_squared); + public bool AddObservation(ulong observation_internal, ulong observation_external, out double r_squared) { + bool raw_ret = gst_clock_add_observation(Handle, observation_internal, observation_external, out r_squared); bool ret = raw_ret; return ret; } [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern bool gst_clock_add_observation_unapplied(IntPtr raw, ulong slave, ulong master, out double r_squared, out ulong _internal, out ulong external, out ulong rate_num, out ulong rate_denom); + static extern bool gst_clock_add_observation_unapplied(IntPtr raw, ulong observation_internal, ulong observation_external, out double r_squared, out ulong _internal, out ulong external, out ulong rate_num, out ulong rate_denom); - public bool AddObservationUnapplied(ulong slave, ulong master, out double r_squared, out ulong _internal, out ulong external, out ulong rate_num, out ulong rate_denom) { - bool raw_ret = gst_clock_add_observation_unapplied(Handle, slave, master, out r_squared, out _internal, out external, out rate_num, out rate_denom); + public bool AddObservationUnapplied(ulong observation_internal, ulong observation_external, out double r_squared, out ulong _internal, out ulong external, out ulong rate_num, out ulong rate_denom) { + bool raw_ret = gst_clock_add_observation_unapplied(Handle, observation_internal, observation_external, out r_squared, out _internal, out external, out rate_num, out rate_denom); bool ret = raw_ret; return ret; } diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs index 04efbef9c4..aa3fd09f45 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs @@ -100,6 +100,7 @@ namespace Gst { public const string TAG_CONDUCTOR = @"conductor"; public const string TAG_CONTACT = @"contact"; public const string TAG_CONTAINER_FORMAT = @"container-format"; + public const string TAG_CONTAINER_SPECIFIC_TRACK_ID = @"container-specific-track-id"; public const string TAG_COPYRIGHT = @"copyright"; public const string TAG_COPYRIGHT_URI = @"copyright-uri"; public const string TAG_DATE = @"date"; diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/CustomMeta.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/CustomMeta.cs index 9ff4eb9e0e..a9401f0693 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/CustomMeta.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/CustomMeta.cs @@ -13,6 +13,15 @@ namespace Gst { public partial struct CustomMeta : IEquatable { public Gst.Meta Meta; + private IntPtr _structure; + public Gst.Structure Structure { + get { + return _structure == IntPtr.Zero ? null : (Gst.Structure) GLib.Opaque.GetOpaque (_structure, typeof (Gst.Structure), false); + } + set { + _structure = value == null ? IntPtr.Zero : value.Handle; + } + } public static Gst.CustomMeta Zero = new Gst.CustomMeta (); @@ -22,21 +31,6 @@ namespace Gst { return (Gst.CustomMeta) Marshal.PtrToStructure (raw, typeof (Gst.CustomMeta)); } - [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr gst_custom_meta_get_structure(IntPtr raw); - - public Gst.Structure Structure { - get { - IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); - System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); - IntPtr raw_ret = gst_custom_meta_get_structure(this_as_native); - Gst.Structure ret = raw_ret == IntPtr.Zero ? null : (Gst.Structure) GLib.Opaque.GetOpaque (raw_ret, typeof (Gst.Structure), false); - ReadNative (this_as_native, ref this); - System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); - return ret; - } - } - [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_custom_meta_has_name(IntPtr raw, IntPtr name); @@ -59,7 +53,7 @@ namespace Gst { public bool Equals (CustomMeta other) { - return true && Meta.Equals (other.Meta); + return true && Meta.Equals (other.Meta) && Structure.Equals (other.Structure); } public override bool Equals (object other) @@ -69,7 +63,7 @@ namespace Gst { public override int GetHashCode () { - return this.GetType ().FullName.GetHashCode () ^ Meta.GetHashCode (); + return this.GetType ().FullName.GetHashCode () ^ Meta.GetHashCode () ^ Structure.GetHashCode (); } private static GLib.GType GType { diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Debug.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Debug.cs index 81b787f168..6e5b8154dd 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Debug.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Debug.cs @@ -217,6 +217,34 @@ namespace Gst { LogLiteral (category, level, file, function, line, null, message_string); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_debug_print_object(IntPtr ptr); + + public static string PrintObject(IntPtr ptr) { + IntPtr raw_ret = gst_debug_print_object(ptr); + string ret = GLib.Marshaller.PtrToStringGFree(raw_ret); + return ret; + } + + public static string PrintObject() { + return PrintObject (IntPtr.Zero); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_debug_print_segment(IntPtr segment); + + public static string PrintSegment(Gst.Segment segment) { + IntPtr native_segment = GLib.Marshaller.StructureToPtrAlloc (segment); + IntPtr raw_ret = gst_debug_print_segment(native_segment); + string ret = GLib.Marshaller.PtrToStringGFree(raw_ret); + Marshal.FreeHGlobal (native_segment); + return ret; + } + + public static string PrintSegment() { + return PrintSegment (Gst.Segment.Zero); + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_debug_print_stack_trace(); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Event.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Event.cs index 97b237cd70..99381b8e3c 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Event.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Event.cs @@ -120,6 +120,7 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_event_has_name_id(IntPtr raw, uint name); + [Obsolete] public bool HasNameId(uint name) { bool raw_ret = gst_event_has_name_id(Handle, name); bool ret = raw_ret; diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Global.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Global.cs index d11c476d06..02e746c566 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Global.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Global.cs @@ -257,6 +257,15 @@ namespace Gst { return ret; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_meta_api_type_aggregate_params(IntPtr api, IntPtr aggregated_params, IntPtr params0, IntPtr params1); + + public static bool MetaApiTypeAggregateParams(GLib.GType api, Gst.Structure aggregated_params, Gst.Structure params0, Gst.Structure params1) { + bool raw_ret = gst_meta_api_type_aggregate_params(api.Val, aggregated_params == null ? IntPtr.Zero : aggregated_params.Handle, params0 == null ? IntPtr.Zero : params0.Handle, params1 == null ? IntPtr.Zero : params1.Handle); + bool ret = raw_ret; + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_meta_api_type_has_tag(IntPtr api, uint tag); @@ -279,6 +288,23 @@ namespace Gst { return ret; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_meta_api_type_set_params_aggregator(IntPtr api, GstSharp.AllocationMetaParamsAggregatorNative aggregator); + + public static void MetaApiTypeSetParamsAggregator(GLib.GType api, Gst.AllocationMetaParamsAggregator aggregator) { + GstSharp.AllocationMetaParamsAggregatorWrapper aggregator_wrapper = new GstSharp.AllocationMetaParamsAggregatorWrapper (aggregator); + gst_meta_api_type_set_params_aggregator(api.Val, aggregator_wrapper.NativeDelegate); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_meta_deserialize(IntPtr buffer, byte data, UIntPtr size, out uint consumed); + + public static Gst.Meta MetaDeserialize(Gst.Buffer buffer, byte data, ulong size, out uint consumed) { + IntPtr raw_ret = gst_meta_deserialize(buffer == null ? IntPtr.Zero : buffer.Handle, data, new UIntPtr (size), out consumed); + Gst.Meta ret = Gst.Meta.New (raw_ret); + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_meta_get_info(IntPtr impl); @@ -290,23 +316,6 @@ namespace Gst { return ret; } - [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr gst_meta_register(IntPtr api, IntPtr impl, UIntPtr size, GstSharp.MetaInitFunctionNative init_func, GstSharp.MetaFreeFunctionNative free_func, GstSharp.MetaTransformFunctionNative transform_func); - - public static Gst.MetaInfo MetaRegister(GLib.GType api, string impl, ulong size, Gst.MetaInitFunction init_func, Gst.MetaFreeFunction free_func, Gst.MetaTransformFunction transform_func) { - IntPtr native_impl = GLib.Marshaller.StringToPtrGStrdup (impl); - GstSharp.MetaInitFunctionWrapper init_func_wrapper = new GstSharp.MetaInitFunctionWrapper (init_func); - init_func_wrapper.PersistUntilCalled (); - GstSharp.MetaFreeFunctionWrapper free_func_wrapper = new GstSharp.MetaFreeFunctionWrapper (free_func); - free_func_wrapper.PersistUntilCalled (); - GstSharp.MetaTransformFunctionWrapper transform_func_wrapper = new GstSharp.MetaTransformFunctionWrapper (transform_func); - transform_func_wrapper.PersistUntilCalled (); - IntPtr raw_ret = gst_meta_register(api.Val, native_impl, new UIntPtr (size), init_func_wrapper.NativeDelegate, free_func_wrapper.NativeDelegate, transform_func_wrapper.NativeDelegate); - Gst.MetaInfo ret = Gst.MetaInfo.New (raw_ret); - GLib.Marshaller.Free (native_impl); - return ret; - } - [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_meta_register_custom(IntPtr name, IntPtr tags, GstSharp.CustomMetaTransformFunctionNative transform_func, IntPtr user_data, GLib.DestroyNotify destroy_data); @@ -334,6 +343,17 @@ namespace Gst { return MetaRegisterCustom (name, tags, null); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_meta_register_custom_simple(IntPtr name); + + public static Gst.MetaInfo MetaRegisterCustomSimple(string name) { + IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); + IntPtr raw_ret = gst_meta_register_custom_simple(native_name); + Gst.MetaInfo ret = Gst.MetaInfo.New (raw_ret); + GLib.Marshaller.Free (native_name); + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_parent_buffer_meta_api_get_type(); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.AllocationMetaParamsAggregatorNative.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.AllocationMetaParamsAggregatorNative.cs new file mode 100644 index 0000000000..ae011b51a2 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.AllocationMetaParamsAggregatorNative.cs @@ -0,0 +1,95 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace GstSharp { + + using System; + using System.Runtime.InteropServices; + +#region Autogenerated code + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate bool AllocationMetaParamsAggregatorNative(IntPtr aggregated_params, IntPtr params0, IntPtr params1); + + internal class AllocationMetaParamsAggregatorInvoker { + + AllocationMetaParamsAggregatorNative native_cb; + IntPtr __data; + GLib.DestroyNotify __notify; + + ~AllocationMetaParamsAggregatorInvoker () + { + if (__notify == null) + return; + __notify (__data); + } + + internal AllocationMetaParamsAggregatorInvoker (AllocationMetaParamsAggregatorNative native_cb) : this (native_cb, IntPtr.Zero, null) {} + + internal AllocationMetaParamsAggregatorInvoker (AllocationMetaParamsAggregatorNative native_cb, IntPtr data) : this (native_cb, data, null) {} + + internal AllocationMetaParamsAggregatorInvoker (AllocationMetaParamsAggregatorNative native_cb, IntPtr data, GLib.DestroyNotify notify) + { + this.native_cb = native_cb; + __data = data; + __notify = notify; + } + + internal Gst.AllocationMetaParamsAggregator Handler { + get { + return new Gst.AllocationMetaParamsAggregator(InvokeNative); + } + } + + bool InvokeNative (Gst.Structure aggregated_params, Gst.Structure params0, Gst.Structure params1) + { + bool __result = native_cb (aggregated_params == null ? IntPtr.Zero : aggregated_params.Handle, params0 == null ? IntPtr.Zero : params0.Handle, params1 == null ? IntPtr.Zero : params1.Handle); + return __result; + } + } + + internal class AllocationMetaParamsAggregatorWrapper { + + public bool NativeCallback (IntPtr aggregated_params, IntPtr params0, IntPtr params1) + { + try { + bool __ret = managed (aggregated_params == IntPtr.Zero ? null : (Gst.Structure) GLib.Opaque.GetOpaque (aggregated_params, typeof (Gst.Structure), false), params0 == IntPtr.Zero ? null : (Gst.Structure) GLib.Opaque.GetOpaque (params0, typeof (Gst.Structure), false), params1 == IntPtr.Zero ? null : (Gst.Structure) GLib.Opaque.GetOpaque (params1, typeof (Gst.Structure), false)); + if (release_on_call) + gch.Free (); + return __ret; + } catch (Exception e) { + GLib.ExceptionManager.RaiseUnhandledException (e, false); + return false; + } + } + + bool release_on_call = false; + GCHandle gch; + + public void PersistUntilCalled () + { + release_on_call = true; + gch = GCHandle.Alloc (this); + } + + internal AllocationMetaParamsAggregatorNative NativeDelegate; + Gst.AllocationMetaParamsAggregator managed; + + public AllocationMetaParamsAggregatorWrapper (Gst.AllocationMetaParamsAggregator managed) + { + this.managed = managed; + if (managed != null) + NativeDelegate = new AllocationMetaParamsAggregatorNative (NativeCallback); + } + + public static Gst.AllocationMetaParamsAggregator GetManagedDelegate (AllocationMetaParamsAggregatorNative native) + { + if (native == null) + return null; + AllocationMetaParamsAggregatorWrapper wrapper = (AllocationMetaParamsAggregatorWrapper) native.Target; + if (wrapper == null) + return null; + return wrapper.managed; + } + } +#endregion +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.MetaClearFunctionNative.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.MetaClearFunctionNative.cs new file mode 100644 index 0000000000..4a3a6da601 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.MetaClearFunctionNative.cs @@ -0,0 +1,94 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace GstSharp { + + using System; + using System.Runtime.InteropServices; + +#region Autogenerated code + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void MetaClearFunctionNative(IntPtr buffer, IntPtr meta); + + internal class MetaClearFunctionInvoker { + + MetaClearFunctionNative native_cb; + IntPtr __data; + GLib.DestroyNotify __notify; + + ~MetaClearFunctionInvoker () + { + if (__notify == null) + return; + __notify (__data); + } + + internal MetaClearFunctionInvoker (MetaClearFunctionNative native_cb) : this (native_cb, IntPtr.Zero, null) {} + + internal MetaClearFunctionInvoker (MetaClearFunctionNative native_cb, IntPtr data) : this (native_cb, data, null) {} + + internal MetaClearFunctionInvoker (MetaClearFunctionNative native_cb, IntPtr data, GLib.DestroyNotify notify) + { + this.native_cb = native_cb; + __data = data; + __notify = notify; + } + + internal Gst.MetaClearFunction Handler { + get { + return new Gst.MetaClearFunction(InvokeNative); + } + } + + void InvokeNative (Gst.Buffer buffer, Gst.Meta meta) + { + IntPtr native_meta = GLib.Marshaller.StructureToPtrAlloc (meta); + native_cb (buffer == null ? IntPtr.Zero : buffer.Handle, native_meta); + Marshal.FreeHGlobal (native_meta); + } + } + + internal class MetaClearFunctionWrapper { + + public void NativeCallback (IntPtr buffer, IntPtr meta) + { + try { + managed (buffer == IntPtr.Zero ? null : (Gst.Buffer) GLib.Opaque.GetOpaque (buffer, typeof (Gst.Buffer), false), Gst.Meta.New (meta)); + if (release_on_call) + gch.Free (); + } catch (Exception e) { + GLib.ExceptionManager.RaiseUnhandledException (e, false); + } + } + + bool release_on_call = false; + GCHandle gch; + + public void PersistUntilCalled () + { + release_on_call = true; + gch = GCHandle.Alloc (this); + } + + internal MetaClearFunctionNative NativeDelegate; + Gst.MetaClearFunction managed; + + public MetaClearFunctionWrapper (Gst.MetaClearFunction managed) + { + this.managed = managed; + if (managed != null) + NativeDelegate = new MetaClearFunctionNative (NativeCallback); + } + + public static Gst.MetaClearFunction GetManagedDelegate (MetaClearFunctionNative native) + { + if (native == null) + return null; + MetaClearFunctionWrapper wrapper = (MetaClearFunctionWrapper) native.Target; + if (wrapper == null) + return null; + return wrapper.managed; + } + } +#endregion +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.MetaDeserializeFunctionNative.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.MetaDeserializeFunctionNative.cs new file mode 100644 index 0000000000..aa57c4de17 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.MetaDeserializeFunctionNative.cs @@ -0,0 +1,98 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace GstSharp { + + using System; + using System.Runtime.InteropServices; + +#region Autogenerated code + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate IntPtr MetaDeserializeFunctionNative(IntPtr info, IntPtr buffer, byte data, UIntPtr size, byte version); + + internal class MetaDeserializeFunctionInvoker { + + MetaDeserializeFunctionNative native_cb; + IntPtr __data; + GLib.DestroyNotify __notify; + + ~MetaDeserializeFunctionInvoker () + { + if (__notify == null) + return; + __notify (__data); + } + + internal MetaDeserializeFunctionInvoker (MetaDeserializeFunctionNative native_cb) : this (native_cb, IntPtr.Zero, null) {} + + internal MetaDeserializeFunctionInvoker (MetaDeserializeFunctionNative native_cb, IntPtr data) : this (native_cb, data, null) {} + + internal MetaDeserializeFunctionInvoker (MetaDeserializeFunctionNative native_cb, IntPtr data, GLib.DestroyNotify notify) + { + this.native_cb = native_cb; + __data = data; + __notify = notify; + } + + internal Gst.MetaDeserializeFunction Handler { + get { + return new Gst.MetaDeserializeFunction(InvokeNative); + } + } + + Gst.Meta InvokeNative (Gst.MetaInfo info, Gst.Buffer buffer, byte data, ulong size, byte version) + { + IntPtr native_info = GLib.Marshaller.StructureToPtrAlloc (info); + Gst.Meta __result = Gst.Meta.New (native_cb (native_info, buffer == null ? IntPtr.Zero : buffer.Handle, data, new UIntPtr (size), version)); + Marshal.FreeHGlobal (native_info); + return __result; + } + } + + internal class MetaDeserializeFunctionWrapper { + + public IntPtr NativeCallback (IntPtr info, IntPtr buffer, byte data, UIntPtr size, byte version) + { + try { + Gst.Meta __ret = managed (Gst.MetaInfo.New (info), buffer == IntPtr.Zero ? null : (Gst.Buffer) GLib.Opaque.GetOpaque (buffer, typeof (Gst.Buffer), false), data, (ulong) size, version); + if (release_on_call) + gch.Free (); + return GLib.Marshaller.StructureToPtrAlloc (__ret); + } catch (Exception e) { + GLib.ExceptionManager.RaiseUnhandledException (e, true); + // NOTREACHED: Above call does not return. + throw e; + } + } + + bool release_on_call = false; + GCHandle gch; + + public void PersistUntilCalled () + { + release_on_call = true; + gch = GCHandle.Alloc (this); + } + + internal MetaDeserializeFunctionNative NativeDelegate; + Gst.MetaDeserializeFunction managed; + + public MetaDeserializeFunctionWrapper (Gst.MetaDeserializeFunction managed) + { + this.managed = managed; + if (managed != null) + NativeDelegate = new MetaDeserializeFunctionNative (NativeCallback); + } + + public static Gst.MetaDeserializeFunction GetManagedDelegate (MetaDeserializeFunctionNative native) + { + if (native == null) + return null; + MetaDeserializeFunctionWrapper wrapper = (MetaDeserializeFunctionWrapper) native.Target; + if (wrapper == null) + return null; + return wrapper.managed; + } + } +#endregion +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.MetaSerializeFunctionNative.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.MetaSerializeFunctionNative.cs new file mode 100644 index 0000000000..49e8820d12 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.MetaSerializeFunctionNative.cs @@ -0,0 +1,100 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace GstSharp { + + using System; + using System.Runtime.InteropServices; + +#region Autogenerated code + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate bool MetaSerializeFunctionNative(IntPtr meta, IntPtr data, out byte version); + + internal class MetaSerializeFunctionInvoker { + + MetaSerializeFunctionNative native_cb; + IntPtr __data; + GLib.DestroyNotify __notify; + + ~MetaSerializeFunctionInvoker () + { + if (__notify == null) + return; + __notify (__data); + } + + internal MetaSerializeFunctionInvoker (MetaSerializeFunctionNative native_cb) : this (native_cb, IntPtr.Zero, null) {} + + internal MetaSerializeFunctionInvoker (MetaSerializeFunctionNative native_cb, IntPtr data) : this (native_cb, data, null) {} + + internal MetaSerializeFunctionInvoker (MetaSerializeFunctionNative native_cb, IntPtr data, GLib.DestroyNotify notify) + { + this.native_cb = native_cb; + __data = data; + __notify = notify; + } + + internal Gst.MetaSerializeFunction Handler { + get { + return new Gst.MetaSerializeFunction(InvokeNative); + } + } + + bool InvokeNative (Gst.Meta meta, Gst.ByteArrayInterface data, out byte version) + { + IntPtr native_meta = GLib.Marshaller.StructureToPtrAlloc (meta); + IntPtr native_data = GLib.Marshaller.StructureToPtrAlloc (data); + bool __result = native_cb (native_meta, native_data, out version); + Marshal.FreeHGlobal (native_meta); + Marshal.FreeHGlobal (native_data); + return __result; + } + } + + internal class MetaSerializeFunctionWrapper { + + public bool NativeCallback (IntPtr meta, IntPtr data, out byte version) + { + try { + bool __ret = managed (Gst.Meta.New (meta), Gst.ByteArrayInterface.New (data), out version); + if (release_on_call) + gch.Free (); + return __ret; + } catch (Exception e) { + GLib.ExceptionManager.RaiseUnhandledException (e, true); + // NOTREACHED: Above call does not return. + throw e; + } + } + + bool release_on_call = false; + GCHandle gch; + + public void PersistUntilCalled () + { + release_on_call = true; + gch = GCHandle.Alloc (this); + } + + internal MetaSerializeFunctionNative NativeDelegate; + Gst.MetaSerializeFunction managed; + + public MetaSerializeFunctionWrapper (Gst.MetaSerializeFunction managed) + { + this.managed = managed; + if (managed != null) + NativeDelegate = new MetaSerializeFunctionNative (NativeCallback); + } + + public static Gst.MetaSerializeFunction GetManagedDelegate (MetaSerializeFunctionNative native) + { + if (native == null) + return null; + MetaSerializeFunctionWrapper wrapper = (MetaSerializeFunctionWrapper) native.Target; + if (wrapper == null) + return null; + return wrapper.managed; + } + } +#endregion +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.StructureFilterMapIdStrFuncNative.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.StructureFilterMapIdStrFuncNative.cs new file mode 100644 index 0000000000..6e4980589e --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.StructureFilterMapIdStrFuncNative.cs @@ -0,0 +1,99 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace GstSharp { + + using System; + using System.Runtime.InteropServices; + +#region Autogenerated code + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate bool StructureFilterMapIdStrFuncNative(IntPtr fieldname, IntPtr value, IntPtr user_data); + + internal class StructureFilterMapIdStrFuncInvoker { + + StructureFilterMapIdStrFuncNative native_cb; + IntPtr __data; + GLib.DestroyNotify __notify; + + ~StructureFilterMapIdStrFuncInvoker () + { + if (__notify == null) + return; + __notify (__data); + } + + internal StructureFilterMapIdStrFuncInvoker (StructureFilterMapIdStrFuncNative native_cb) : this (native_cb, IntPtr.Zero, null) {} + + internal StructureFilterMapIdStrFuncInvoker (StructureFilterMapIdStrFuncNative native_cb, IntPtr data) : this (native_cb, data, null) {} + + internal StructureFilterMapIdStrFuncInvoker (StructureFilterMapIdStrFuncNative native_cb, IntPtr data, GLib.DestroyNotify notify) + { + this.native_cb = native_cb; + __data = data; + __notify = notify; + } + + internal Gst.StructureFilterMapIdStrFunc Handler { + get { + return new Gst.StructureFilterMapIdStrFunc(InvokeNative); + } + } + + bool InvokeNative (Gst.IdStr fieldname, GLib.Value value) + { + IntPtr native_fieldname = GLib.Marshaller.StructureToPtrAlloc (fieldname); + IntPtr native_value = GLib.Marshaller.StructureToPtrAlloc (value); + bool __result = native_cb (native_fieldname, native_value, __data); + Marshal.FreeHGlobal (native_fieldname); + Marshal.FreeHGlobal (native_value); + return __result; + } + } + + internal class StructureFilterMapIdStrFuncWrapper { + + public bool NativeCallback (IntPtr fieldname, IntPtr value, IntPtr user_data) + { + try { + bool __ret = managed (Gst.IdStr.New (fieldname), (GLib.Value) Marshal.PtrToStructure (value, typeof (GLib.Value))); + if (release_on_call) + gch.Free (); + return __ret; + } catch (Exception e) { + GLib.ExceptionManager.RaiseUnhandledException (e, false); + return false; + } + } + + bool release_on_call = false; + GCHandle gch; + + public void PersistUntilCalled () + { + release_on_call = true; + gch = GCHandle.Alloc (this); + } + + internal StructureFilterMapIdStrFuncNative NativeDelegate; + Gst.StructureFilterMapIdStrFunc managed; + + public StructureFilterMapIdStrFuncWrapper (Gst.StructureFilterMapIdStrFunc managed) + { + this.managed = managed; + if (managed != null) + NativeDelegate = new StructureFilterMapIdStrFuncNative (NativeCallback); + } + + public static Gst.StructureFilterMapIdStrFunc GetManagedDelegate (StructureFilterMapIdStrFuncNative native) + { + if (native == null) + return null; + StructureFilterMapIdStrFuncWrapper wrapper = (StructureFilterMapIdStrFuncWrapper) native.Target; + if (wrapper == null) + return null; + return wrapper.managed; + } + } +#endregion +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.StructureForeachIdStrFuncNative.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.StructureForeachIdStrFuncNative.cs new file mode 100644 index 0000000000..203062eb5b --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.StructureForeachIdStrFuncNative.cs @@ -0,0 +1,99 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace GstSharp { + + using System; + using System.Runtime.InteropServices; + +#region Autogenerated code + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate bool StructureForeachIdStrFuncNative(IntPtr fieldname, IntPtr value, IntPtr user_data); + + internal class StructureForeachIdStrFuncInvoker { + + StructureForeachIdStrFuncNative native_cb; + IntPtr __data; + GLib.DestroyNotify __notify; + + ~StructureForeachIdStrFuncInvoker () + { + if (__notify == null) + return; + __notify (__data); + } + + internal StructureForeachIdStrFuncInvoker (StructureForeachIdStrFuncNative native_cb) : this (native_cb, IntPtr.Zero, null) {} + + internal StructureForeachIdStrFuncInvoker (StructureForeachIdStrFuncNative native_cb, IntPtr data) : this (native_cb, data, null) {} + + internal StructureForeachIdStrFuncInvoker (StructureForeachIdStrFuncNative native_cb, IntPtr data, GLib.DestroyNotify notify) + { + this.native_cb = native_cb; + __data = data; + __notify = notify; + } + + internal Gst.StructureForeachIdStrFunc Handler { + get { + return new Gst.StructureForeachIdStrFunc(InvokeNative); + } + } + + bool InvokeNative (Gst.IdStr fieldname, GLib.Value value) + { + IntPtr native_fieldname = GLib.Marshaller.StructureToPtrAlloc (fieldname); + IntPtr native_value = GLib.Marshaller.StructureToPtrAlloc (value); + bool __result = native_cb (native_fieldname, native_value, __data); + Marshal.FreeHGlobal (native_fieldname); + Marshal.FreeHGlobal (native_value); + return __result; + } + } + + internal class StructureForeachIdStrFuncWrapper { + + public bool NativeCallback (IntPtr fieldname, IntPtr value, IntPtr user_data) + { + try { + bool __ret = managed (Gst.IdStr.New (fieldname), (GLib.Value) Marshal.PtrToStructure (value, typeof (GLib.Value))); + if (release_on_call) + gch.Free (); + return __ret; + } catch (Exception e) { + GLib.ExceptionManager.RaiseUnhandledException (e, false); + return false; + } + } + + bool release_on_call = false; + GCHandle gch; + + public void PersistUntilCalled () + { + release_on_call = true; + gch = GCHandle.Alloc (this); + } + + internal StructureForeachIdStrFuncNative NativeDelegate; + Gst.StructureForeachIdStrFunc managed; + + public StructureForeachIdStrFuncWrapper (Gst.StructureForeachIdStrFunc managed) + { + this.managed = managed; + if (managed != null) + NativeDelegate = new StructureForeachIdStrFuncNative (NativeCallback); + } + + public static Gst.StructureForeachIdStrFunc GetManagedDelegate (StructureForeachIdStrFuncNative native) + { + if (native == null) + return null; + StructureForeachIdStrFuncWrapper wrapper = (StructureForeachIdStrFuncWrapper) native.Target; + if (wrapper == null) + return null; + return wrapper.managed; + } + } +#endregion +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.StructureMapIdStrFuncNative.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.StructureMapIdStrFuncNative.cs new file mode 100644 index 0000000000..74f287090c --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/GstSharp.StructureMapIdStrFuncNative.cs @@ -0,0 +1,99 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace GstSharp { + + using System; + using System.Runtime.InteropServices; + +#region Autogenerated code + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate bool StructureMapIdStrFuncNative(IntPtr fieldname, IntPtr value, IntPtr user_data); + + internal class StructureMapIdStrFuncInvoker { + + StructureMapIdStrFuncNative native_cb; + IntPtr __data; + GLib.DestroyNotify __notify; + + ~StructureMapIdStrFuncInvoker () + { + if (__notify == null) + return; + __notify (__data); + } + + internal StructureMapIdStrFuncInvoker (StructureMapIdStrFuncNative native_cb) : this (native_cb, IntPtr.Zero, null) {} + + internal StructureMapIdStrFuncInvoker (StructureMapIdStrFuncNative native_cb, IntPtr data) : this (native_cb, data, null) {} + + internal StructureMapIdStrFuncInvoker (StructureMapIdStrFuncNative native_cb, IntPtr data, GLib.DestroyNotify notify) + { + this.native_cb = native_cb; + __data = data; + __notify = notify; + } + + internal Gst.StructureMapIdStrFunc Handler { + get { + return new Gst.StructureMapIdStrFunc(InvokeNative); + } + } + + bool InvokeNative (Gst.IdStr fieldname, GLib.Value value) + { + IntPtr native_fieldname = GLib.Marshaller.StructureToPtrAlloc (fieldname); + IntPtr native_value = GLib.Marshaller.StructureToPtrAlloc (value); + bool __result = native_cb (native_fieldname, native_value, __data); + Marshal.FreeHGlobal (native_fieldname); + Marshal.FreeHGlobal (native_value); + return __result; + } + } + + internal class StructureMapIdStrFuncWrapper { + + public bool NativeCallback (IntPtr fieldname, IntPtr value, IntPtr user_data) + { + try { + bool __ret = managed (Gst.IdStr.New (fieldname), (GLib.Value) Marshal.PtrToStructure (value, typeof (GLib.Value))); + if (release_on_call) + gch.Free (); + return __ret; + } catch (Exception e) { + GLib.ExceptionManager.RaiseUnhandledException (e, false); + return false; + } + } + + bool release_on_call = false; + GCHandle gch; + + public void PersistUntilCalled () + { + release_on_call = true; + gch = GCHandle.Alloc (this); + } + + internal StructureMapIdStrFuncNative NativeDelegate; + Gst.StructureMapIdStrFunc managed; + + public StructureMapIdStrFuncWrapper (Gst.StructureMapIdStrFunc managed) + { + this.managed = managed; + if (managed != null) + NativeDelegate = new StructureMapIdStrFuncNative (NativeCallback); + } + + public static Gst.StructureMapIdStrFunc GetManagedDelegate (StructureMapIdStrFuncNative native) + { + if (native == null) + return null; + StructureMapIdStrFuncWrapper wrapper = (StructureMapIdStrFuncWrapper) native.Target; + if (wrapper == null) + return null; + return wrapper.managed; + } + } +#endregion +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/IdStr.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/IdStr.cs new file mode 100644 index 0000000000..988d8de6d1 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/IdStr.cs @@ -0,0 +1,260 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace Gst { + + using System; + using System.Collections; + using System.Collections.Generic; + using System.Runtime.InteropServices; + +#region Autogenerated code + [StructLayout(LayoutKind.Sequential)] + public partial struct IdStr : IEquatable { + + private IntPtr _pointer; + [MarshalAs (UnmanagedType.ByValArray, SizeConst=8)] + private byte[] Padding; + + public static Gst.IdStr Zero = new Gst.IdStr (); + + public static Gst.IdStr New(IntPtr raw) { + if (raw == IntPtr.Zero) + return Gst.IdStr.Zero; + return (Gst.IdStr) Marshal.PtrToStructure (raw, typeof (Gst.IdStr)); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_id_str_new(); + + public static IdStr New() + { + IdStr result = IdStr.New (gst_id_str_new()); + return result; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_id_str_get_type(); + + public static GLib.GType GType { + get { + IntPtr raw_ret = gst_id_str_get_type(); + GLib.GType ret = new GLib.GType(raw_ret); + return ret; + } + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_id_str_as_str(IntPtr raw); + + public string AsStr() { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr raw_ret = gst_id_str_as_str(this_as_native); + string ret = GLib.Marshaller.Utf8PtrToString (raw_ret); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + return ret; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_id_str_clear(IntPtr raw); + + public void Clear() { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + gst_id_str_clear(this_as_native); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_id_str_copy_into(IntPtr raw, IntPtr s); + + public void CopyInto(Gst.IdStr s) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_s = GLib.Marshaller.StructureToPtrAlloc (s); + gst_id_str_copy_into(this_as_native, native_s); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + Marshal.FreeHGlobal (native_s); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern UIntPtr gst_id_str_get_len(IntPtr raw); + + public ulong Len { + get { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + UIntPtr raw_ret = gst_id_str_get_len(this_as_native); + ulong ret = (ulong) raw_ret; + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + return ret; + } + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_id_str_init(IntPtr raw); + + public void Init() { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + gst_id_str_init(this_as_native); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_id_str_is_equal(IntPtr raw, IntPtr s2); + + public bool IsEqual(Gst.IdStr s2) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_s2 = GLib.Marshaller.StructureToPtrAlloc (s2); + bool raw_ret = gst_id_str_is_equal(this_as_native, native_s2); + bool ret = raw_ret; + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + Marshal.FreeHGlobal (native_s2); + return ret; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_id_str_is_equal_to_str(IntPtr raw, IntPtr s2); + + public bool IsEqualToStr(string s2) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_s2 = GLib.Marshaller.StringToPtrGStrdup (s2); + bool raw_ret = gst_id_str_is_equal_to_str(this_as_native, native_s2); + bool ret = raw_ret; + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + GLib.Marshaller.Free (native_s2); + return ret; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_id_str_is_equal_to_str_with_len(IntPtr raw, IntPtr s2, UIntPtr len); + + public bool IsEqualToStrWithLen(string s2) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_s2 = GLib.Marshaller.StringToPtrGStrdup (s2); + bool raw_ret = gst_id_str_is_equal_to_str_with_len(this_as_native, native_s2, new UIntPtr ((ulong) System.Text.Encoding.UTF8.GetByteCount (s2))); + bool ret = raw_ret; + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + GLib.Marshaller.Free (native_s2); + return ret; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_id_str_move(IntPtr raw, IntPtr s); + + public void Move(Gst.IdStr s) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_s = GLib.Marshaller.StructureToPtrAlloc (s); + gst_id_str_move(this_as_native, native_s); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + Marshal.FreeHGlobal (native_s); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_id_str_set(IntPtr raw, IntPtr value); + + public void Set(string value) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_value = GLib.Marshaller.StringToPtrGStrdup (value); + gst_id_str_set(this_as_native, native_value); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + GLib.Marshaller.Free (native_value); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_id_str_set_static_str(IntPtr raw, IntPtr value); + + public string StaticStr { + set { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_value = GLib.Marshaller.StringToPtrGStrdup (value); + gst_id_str_set_static_str(this_as_native, native_value); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + GLib.Marshaller.Free (native_value); + } + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_id_str_set_static_str_with_len(IntPtr raw, IntPtr value, UIntPtr len); + + public string StaticStrWithLen { + set { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_value = GLib.Marshaller.StringToPtrGStrdup (value); + gst_id_str_set_static_str_with_len(this_as_native, native_value, new UIntPtr ((ulong) System.Text.Encoding.UTF8.GetByteCount (value))); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + GLib.Marshaller.Free (native_value); + } + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_id_str_set_with_len(IntPtr raw, IntPtr value, UIntPtr len); + + public string WithLen { + set { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_value = GLib.Marshaller.StringToPtrGStrdup (value); + gst_id_str_set_with_len(this_as_native, native_value, new UIntPtr ((ulong) System.Text.Encoding.UTF8.GetByteCount (value))); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + GLib.Marshaller.Free (native_value); + } + } + + static void ReadNative (IntPtr native, ref Gst.IdStr target) + { + target = New (native); + } + + public bool Equals (IdStr other) + { + return true && _pointer.Equals (other._pointer); + } + + public override bool Equals (object other) + { + return other is IdStr && Equals ((IdStr) other); + } + + public override int GetHashCode () + { + return this.GetType ().FullName.GetHashCode () ^ _pointer.GetHashCode (); + } + + public static explicit operator GLib.Value (Gst.IdStr boxed) + { + GLib.Value val = GLib.Value.Empty; + val.Init (Gst.IdStr.GType); + val.Val = boxed; + return val; + } + + public static explicit operator Gst.IdStr (GLib.Value val) + { + return (Gst.IdStr) val.Val; + } +#endregion + } +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Message.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Message.cs index e69f00dbea..fda041454b 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Message.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Message.cs @@ -99,6 +99,24 @@ namespace Gst { AddRedirectEntry (location, null, null); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_message_get_details(IntPtr raw); + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_message_set_details(IntPtr raw, IntPtr details); + + public Gst.Structure Details { + get { + IntPtr raw_ret = gst_message_get_details(Handle); + Gst.Structure ret = raw_ret == IntPtr.Zero ? null : (Gst.Structure) GLib.Opaque.GetOpaque (raw_ret, typeof (Gst.Structure), false); + return ret; + } + set { + value.Owned = false; + gst_message_set_details(Handle, value == null ? IntPtr.Zero : value.Handle); + } + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern UIntPtr gst_message_get_num_redirect_entries(IntPtr raw); @@ -234,6 +252,17 @@ namespace Gst { return structure; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_message_parse_error_writable_details(IntPtr raw, out IntPtr structure); + + public Gst.Structure ParseErrorWritableDetails() { + Gst.Structure structure; + IntPtr native_structure; + gst_message_parse_error_writable_details(Handle, out native_structure); + structure = native_structure == IntPtr.Zero ? null : (Gst.Structure) GLib.Opaque.GetOpaque (native_structure, typeof (Gst.Structure), false); + return structure; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_message_parse_group_id(IntPtr raw, out uint group_id); @@ -275,6 +304,17 @@ namespace Gst { return structure; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_message_parse_info_writable_details(IntPtr raw, out IntPtr structure); + + public Gst.Structure ParseInfoWritableDetails() { + Gst.Structure structure; + IntPtr native_structure; + gst_message_parse_info_writable_details(Handle, out native_structure); + structure = native_structure == IntPtr.Zero ? null : (Gst.Structure) GLib.Opaque.GetOpaque (native_structure, typeof (Gst.Structure), false); + return structure; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_message_parse_instant_rate_request(IntPtr raw, out double rate_multiplier); @@ -512,6 +552,17 @@ namespace Gst { return structure; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_message_parse_warning_writable_details(IntPtr raw, out IntPtr structure); + + public Gst.Structure ParseWarningWritableDetails() { + Gst.Structure structure; + IntPtr native_structure; + gst_message_parse_warning_writable_details(Handle, out native_structure); + structure = native_structure == IntPtr.Zero ? null : (Gst.Structure) GLib.Opaque.GetOpaque (native_structure, typeof (Gst.Structure), false); + return structure; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_message_set_buffering_stats(IntPtr raw, int mode, int avg_in, int avg_out, long buffering_left); @@ -567,6 +618,15 @@ namespace Gst { return ret; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_message_writable_details(IntPtr raw); + + public Gst.Structure WritableDetails() { + IntPtr raw_ret = gst_message_writable_details(Handle); + Gst.Structure ret = raw_ret == IntPtr.Zero ? null : (Gst.Structure) GLib.Opaque.GetOpaque (raw_ret, typeof (Gst.Structure), false); + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_message_writable_structure(IntPtr raw); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Meta.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Meta.cs index bce320bc2a..778ed6f9da 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Meta.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Meta.cs @@ -57,6 +57,43 @@ namespace Gst { } } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_meta_serialize(IntPtr raw, IntPtr data); + + public bool Serialize(Gst.ByteArrayInterface data) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr native_data = GLib.Marshaller.StructureToPtrAlloc (data); + bool raw_ret = gst_meta_serialize(this_as_native, native_data); + bool ret = raw_ret; + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + Marshal.FreeHGlobal (native_data); + return ret; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_meta_serialize_simple(IntPtr raw, IntPtr[] data); + + public bool SerializeSimple(IntPtr[] data) { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + bool raw_ret = gst_meta_serialize_simple(this_as_native, data); + bool ret = raw_ret; + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + return ret; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_meta_api_type_aggregate_params(IntPtr api, IntPtr aggregated_params, IntPtr params0, IntPtr params1); + + public static bool ApiTypeAggregateParams(GLib.GType api, Gst.Structure aggregated_params, Gst.Structure params0, Gst.Structure params1) { + bool raw_ret = gst_meta_api_type_aggregate_params(api.Val, aggregated_params == null ? IntPtr.Zero : aggregated_params.Handle, params0 == null ? IntPtr.Zero : params0.Handle, params1 == null ? IntPtr.Zero : params1.Handle); + bool ret = raw_ret; + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_meta_api_type_has_tag(IntPtr api, uint tag); @@ -79,6 +116,23 @@ namespace Gst { return ret; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_meta_api_type_set_params_aggregator(IntPtr api, GstSharp.AllocationMetaParamsAggregatorNative aggregator); + + public static void ApiTypeSetParamsAggregator(GLib.GType api, Gst.AllocationMetaParamsAggregator aggregator) { + GstSharp.AllocationMetaParamsAggregatorWrapper aggregator_wrapper = new GstSharp.AllocationMetaParamsAggregatorWrapper (aggregator); + gst_meta_api_type_set_params_aggregator(api.Val, aggregator_wrapper.NativeDelegate); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_meta_deserialize(IntPtr buffer, byte data, UIntPtr size, out uint consumed); + + public static Gst.Meta Deserialize(Gst.Buffer buffer, byte data, ulong size, out uint consumed) { + IntPtr raw_ret = gst_meta_deserialize(buffer == null ? IntPtr.Zero : buffer.Handle, data, new UIntPtr (size), out consumed); + Gst.Meta ret = Gst.Meta.New (raw_ret); + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_meta_get_info(IntPtr impl); @@ -90,23 +144,6 @@ namespace Gst { return ret; } - [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr gst_meta_register(IntPtr api, IntPtr impl, UIntPtr size, GstSharp.MetaInitFunctionNative init_func, GstSharp.MetaFreeFunctionNative free_func, GstSharp.MetaTransformFunctionNative transform_func); - - public static Gst.MetaInfo Register(GLib.GType api, string impl, ulong size, Gst.MetaInitFunction init_func, Gst.MetaFreeFunction free_func, Gst.MetaTransformFunction transform_func) { - IntPtr native_impl = GLib.Marshaller.StringToPtrGStrdup (impl); - GstSharp.MetaInitFunctionWrapper init_func_wrapper = new GstSharp.MetaInitFunctionWrapper (init_func); - init_func_wrapper.PersistUntilCalled (); - GstSharp.MetaFreeFunctionWrapper free_func_wrapper = new GstSharp.MetaFreeFunctionWrapper (free_func); - free_func_wrapper.PersistUntilCalled (); - GstSharp.MetaTransformFunctionWrapper transform_func_wrapper = new GstSharp.MetaTransformFunctionWrapper (transform_func); - transform_func_wrapper.PersistUntilCalled (); - IntPtr raw_ret = gst_meta_register(api.Val, native_impl, new UIntPtr (size), init_func_wrapper.NativeDelegate, free_func_wrapper.NativeDelegate, transform_func_wrapper.NativeDelegate); - Gst.MetaInfo ret = Gst.MetaInfo.New (raw_ret); - GLib.Marshaller.Free (native_impl); - return ret; - } - [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_meta_register_custom(IntPtr name, IntPtr tags, GstSharp.CustomMetaTransformFunctionNative transform_func, IntPtr user_data, GLib.DestroyNotify destroy_data); @@ -134,6 +171,17 @@ namespace Gst { return RegisterCustom (name, tags, null); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_meta_register_custom_simple(IntPtr name); + + public static Gst.MetaInfo RegisterCustomSimple(string name) { + IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); + IntPtr raw_ret = gst_meta_register_custom_simple(native_name); + Gst.MetaInfo ret = Gst.MetaInfo.New (raw_ret); + GLib.Marshaller.Free (native_name); + return ret; + } + static void ReadNative (IntPtr native, ref Gst.Meta target) { target = New (native); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/MetaClearFunction.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/MetaClearFunction.cs new file mode 100644 index 0000000000..0f6cd32da4 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/MetaClearFunction.cs @@ -0,0 +1,10 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace Gst { + + using System; + + public delegate void MetaClearFunction(Gst.Buffer buffer, Gst.Meta meta); + +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/MetaDeserializeFunction.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/MetaDeserializeFunction.cs new file mode 100644 index 0000000000..f01fb038a5 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/MetaDeserializeFunction.cs @@ -0,0 +1,10 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace Gst { + + using System; + + public delegate Gst.Meta MetaDeserializeFunction(Gst.MetaInfo info, Gst.Buffer buffer, byte data, ulong size, byte version); + +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/MetaInfo.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/MetaInfo.cs index b55e79ac15..0ba6037a39 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/MetaInfo.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/MetaInfo.cs @@ -41,6 +41,24 @@ namespace Gst { return GstSharp.MetaTransformFunctionWrapper.GetManagedDelegate (_transform_func); } } + private GstSharp.MetaSerializeFunctionNative _serialize_func; + public Gst.MetaSerializeFunction SerializeFunc { + get { + return GstSharp.MetaSerializeFunctionWrapper.GetManagedDelegate (_serialize_func); + } + } + private GstSharp.MetaDeserializeFunctionNative _deserialize_func; + public Gst.MetaDeserializeFunction DeserializeFunc { + get { + return GstSharp.MetaDeserializeFunctionWrapper.GetManagedDelegate (_deserialize_func); + } + } + private GstSharp.MetaClearFunctionNative _clear_func; + public Gst.MetaClearFunction ClearFunc { + get { + return GstSharp.MetaClearFunctionWrapper.GetManagedDelegate (_clear_func); + } + } public static Gst.MetaInfo Zero = new Gst.MetaInfo (); @@ -65,6 +83,19 @@ namespace Gst { } } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_meta_info_register(IntPtr raw); + + public Gst.MetaInfo Register() { + IntPtr this_as_native = System.Runtime.InteropServices.Marshal.AllocHGlobal (System.Runtime.InteropServices.Marshal.SizeOf (this)); + System.Runtime.InteropServices.Marshal.StructureToPtr (this, this_as_native, false); + IntPtr raw_ret = gst_meta_info_register(this_as_native); + Gst.MetaInfo ret = Gst.MetaInfo.New (raw_ret); + ReadNative (this_as_native, ref this); + System.Runtime.InteropServices.Marshal.FreeHGlobal (this_as_native); + return ret; + } + static void ReadNative (IntPtr native, ref Gst.MetaInfo target) { target = New (native); @@ -72,7 +103,7 @@ namespace Gst { public bool Equals (MetaInfo other) { - return true && Api.Equals (other.Api) && Type.Equals (other.Type) && Size.Equals (other.Size) && InitFunc.Equals (other.InitFunc) && FreeFunc.Equals (other.FreeFunc) && TransformFunc.Equals (other.TransformFunc); + return true && Api.Equals (other.Api) && Type.Equals (other.Type) && Size.Equals (other.Size) && InitFunc.Equals (other.InitFunc) && FreeFunc.Equals (other.FreeFunc) && TransformFunc.Equals (other.TransformFunc) && SerializeFunc.Equals (other.SerializeFunc) && DeserializeFunc.Equals (other.DeserializeFunc) && ClearFunc.Equals (other.ClearFunc); } public override bool Equals (object other) @@ -82,7 +113,7 @@ namespace Gst { public override int GetHashCode () { - return this.GetType ().FullName.GetHashCode () ^ Api.GetHashCode () ^ Type.GetHashCode () ^ Size.GetHashCode () ^ InitFunc.GetHashCode () ^ FreeFunc.GetHashCode () ^ TransformFunc.GetHashCode (); + return this.GetType ().FullName.GetHashCode () ^ Api.GetHashCode () ^ Type.GetHashCode () ^ Size.GetHashCode () ^ InitFunc.GetHashCode () ^ FreeFunc.GetHashCode () ^ TransformFunc.GetHashCode () ^ SerializeFunc.GetHashCode () ^ DeserializeFunc.GetHashCode () ^ ClearFunc.GetHashCode (); } private static GLib.GType GType { diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/MetaSerializeFunction.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/MetaSerializeFunction.cs new file mode 100644 index 0000000000..2ee6278c47 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/MetaSerializeFunction.cs @@ -0,0 +1,10 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace Gst { + + using System; + + public delegate bool MetaSerializeFunction(Gst.Meta meta, Gst.ByteArrayInterface data, out byte version); + +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/ObjectFlags.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/ObjectFlags.cs index e93718f3a1..3b2079ce5d 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/ObjectFlags.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/ObjectFlags.cs @@ -12,6 +12,7 @@ namespace Gst { public enum ObjectFlags : uint { MayBeLeaked = 1, + Constructed = 2, Last = 16, } diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Pipeline.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Pipeline.cs index 8baf4496e3..6fa5488736 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Pipeline.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Pipeline.cs @@ -154,6 +154,17 @@ namespace Gst { gst_pipeline_auto_clock(Handle); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern ulong gst_pipeline_get_configured_latency(IntPtr raw); + + public ulong ConfiguredLatency { + get { + ulong raw_ret = gst_pipeline_get_configured_latency(Handle); + ulong ret = raw_ret; + return ret; + } + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_pipeline_get_pipeline_clock(IntPtr raw); @@ -165,6 +176,17 @@ namespace Gst { } } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_pipeline_is_live(IntPtr raw); + + public bool IsLive { + get { + bool raw_ret = gst_pipeline_is_live(Handle); + bool ret = raw_ret; + return ret; + } + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_pipeline_use_clock(IntPtr raw, IntPtr clock); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Plugin.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Plugin.cs index 4e2c5c5cd5..6c5d4de643 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Plugin.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Plugin.cs @@ -157,6 +157,33 @@ namespace Gst { AddDependencySimple (null, null, null, flags); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_plugin_add_status_error(IntPtr raw, IntPtr message); + + public void AddStatusError(string message) { + IntPtr native_message = GLib.Marshaller.StringToPtrGStrdup (message); + gst_plugin_add_status_error(Handle, native_message); + GLib.Marshaller.Free (native_message); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_plugin_add_status_info(IntPtr raw, IntPtr message); + + public void AddStatusInfo(string message) { + IntPtr native_message = GLib.Marshaller.StringToPtrGStrdup (message); + gst_plugin_add_status_info(Handle, native_message); + GLib.Marshaller.Free (native_message); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_plugin_add_status_warning(IntPtr raw, IntPtr message); + + public void AddStatusWarning(string message) { + IntPtr native_message = GLib.Marshaller.StringToPtrGStrdup (message); + gst_plugin_add_status_warning(Handle, native_message); + GLib.Marshaller.Free (native_message); + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_plugin_get_cache_data(IntPtr raw); @@ -252,6 +279,39 @@ namespace Gst { } } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_plugin_get_status_errors(IntPtr raw); + + public string[] StatusErrors { + get { + IntPtr raw_ret = gst_plugin_get_status_errors(Handle); + string[] ret = GLib.Marshaller.NullTermPtrToStringArray (raw_ret, true); + return ret; + } + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_plugin_get_status_infos(IntPtr raw); + + public string[] StatusInfos { + get { + IntPtr raw_ret = gst_plugin_get_status_infos(Handle); + string[] ret = GLib.Marshaller.NullTermPtrToStringArray (raw_ret, true); + return ret; + } + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_plugin_get_status_warnings(IntPtr raw); + + public string[] StatusWarnings { + get { + IntPtr raw_ret = gst_plugin_get_status_warnings(Handle); + string[] ret = GLib.Marshaller.NullTermPtrToStringArray (raw_ret, true); + return ret; + } + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_plugin_get_version(IntPtr raw); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/SerializeFlags.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/SerializeFlags.cs index 477ae8099a..4a731ce2a4 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/SerializeFlags.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/SerializeFlags.cs @@ -13,6 +13,7 @@ namespace Gst { None = 0, BackwardCompat = 1, + Strict = 2, } internal class SerializeFlagsGType { diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/StreamCollection.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/StreamCollection.cs index bc64bc6c3b..97baadbe29 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/StreamCollection.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/StreamCollection.cs @@ -81,25 +81,25 @@ namespace Gst { } [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - delegate void StreamNotifyNativeDelegate (IntPtr inst, IntPtr _object, IntPtr p0); + delegate void StreamNotifyNativeDelegate (IntPtr inst, IntPtr prop_stream, IntPtr prop); - static void StreamNotify_cb (IntPtr inst, IntPtr _object, IntPtr p0) + static void StreamNotify_cb (IntPtr inst, IntPtr prop_stream, IntPtr prop) { try { StreamCollection __obj = GLib.Object.GetObject (inst, false) as StreamCollection; - __obj.OnStreamNotify (GLib.Object.GetObject(_object) as Gst.Stream, p0); + __obj.OnStreamNotify (GLib.Object.GetObject(prop_stream) as Gst.Stream, prop); } catch (Exception e) { GLib.ExceptionManager.RaiseUnhandledException (e, false); } } [GLib.DefaultSignalHandler(Type=typeof(Gst.StreamCollection), ConnectionMethod="OverrideStreamNotify")] - protected virtual void OnStreamNotify (Gst.Stream _object, IntPtr p0) + protected virtual void OnStreamNotify (Gst.Stream prop_stream, IntPtr prop) { - InternalStreamNotify (_object, p0); + InternalStreamNotify (prop_stream, prop); } - private void InternalStreamNotify (Gst.Stream _object, IntPtr p0) + private void InternalStreamNotify (Gst.Stream prop_stream, IntPtr prop) { StreamNotifyNativeDelegate unmanaged = null; unsafe { @@ -108,7 +108,7 @@ namespace Gst { } if (unmanaged == null) return; - unmanaged (this.Handle, _object == null ? IntPtr.Zero : _object.Handle, p0); + unmanaged (this.Handle, prop_stream == null ? IntPtr.Zero : prop_stream.Handle, prop); } diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/StreamNotifyHandler.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/StreamNotifyHandler.cs index 1aef38d105..c26fe51942 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/StreamNotifyHandler.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/StreamNotifyHandler.cs @@ -8,13 +8,13 @@ namespace Gst { public delegate void StreamNotifyHandler(object o, StreamNotifyArgs args); public class StreamNotifyArgs : GLib.SignalArgs { - public Gst.Stream Object{ + public Gst.Stream PropStream{ get { return (Gst.Stream) Args [0]; } } - public IntPtr P0{ + public IntPtr Prop{ get { return (IntPtr) Args [1]; } diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Structure.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Structure.cs index 9a7e6ddfbf..5c9852a3c8 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Structure.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Structure.cs @@ -77,11 +77,20 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_structure_filter_and_map_in_place(IntPtr raw, GstSharp.StructureFilterMapFuncNative func, IntPtr user_data); + [Obsolete] public void FilterAndMapInPlace(Gst.StructureFilterMapFunc func) { GstSharp.StructureFilterMapFuncWrapper func_wrapper = new GstSharp.StructureFilterMapFuncWrapper (func); gst_structure_filter_and_map_in_place(Handle, func_wrapper.NativeDelegate, IntPtr.Zero); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_structure_filter_and_map_in_place_id_str(IntPtr raw, GstSharp.StructureFilterMapIdStrFuncNative func, IntPtr user_data); + + public void FilterAndMapInPlaceIdStr(Gst.StructureFilterMapIdStrFunc func) { + GstSharp.StructureFilterMapIdStrFuncWrapper func_wrapper = new GstSharp.StructureFilterMapIdStrFuncWrapper (func); + gst_structure_filter_and_map_in_place_id_str(Handle, func_wrapper.NativeDelegate, IntPtr.Zero); + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_structure_fixate(IntPtr raw); @@ -160,6 +169,7 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_structure_foreach(IntPtr raw, GstSharp.StructureForeachFuncNative func, IntPtr user_data); + [Obsolete] public bool Foreach(Gst.StructureForeachFunc func) { GstSharp.StructureForeachFuncWrapper func_wrapper = new GstSharp.StructureForeachFuncWrapper (func); bool raw_ret = gst_structure_foreach(Handle, func_wrapper.NativeDelegate, IntPtr.Zero); @@ -167,6 +177,16 @@ namespace Gst { return ret; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_structure_foreach_id_str(IntPtr raw, GstSharp.StructureForeachIdStrFuncNative func, IntPtr user_data); + + public bool ForeachIdStr(Gst.StructureForeachIdStrFunc func) { + GstSharp.StructureForeachIdStrFuncWrapper func_wrapper = new GstSharp.StructureForeachIdStrFuncWrapper (func); + bool raw_ret = gst_structure_foreach_id_str(Handle, func_wrapper.NativeDelegate, IntPtr.Zero); + bool ret = raw_ret; + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_structure_get_array(IntPtr raw, IntPtr fieldname, out IntPtr array); @@ -332,6 +352,7 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint gst_structure_get_name_id(IntPtr raw); + [Obsolete] public uint NameId { get { uint raw_ret = gst_structure_get_name_id(Handle); @@ -340,6 +361,25 @@ namespace Gst { } } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_structure_get_name_id_str(IntPtr raw); + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_structure_set_name_id_str(IntPtr raw, IntPtr value); + + public Gst.IdStr NameIdStr { + get { + IntPtr raw_ret = gst_structure_get_name_id_str(Handle); + Gst.IdStr ret = Gst.IdStr.New (raw_ret); + return ret; + } + set { + IntPtr native_value = GLib.Marshaller.StructureToPtrAlloc (value); + gst_structure_set_name_id_str(Handle, native_value); + Marshal.FreeHGlobal (native_value); + } + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_structure_get_string(IntPtr raw, IntPtr fieldname); @@ -429,6 +469,7 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_structure_id_has_field(IntPtr raw, uint field); + [Obsolete] public bool IdHasField(uint field) { bool raw_ret = gst_structure_id_has_field(Handle, field); bool ret = raw_ret; @@ -438,6 +479,7 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_structure_id_has_field_typed(IntPtr raw, uint field, IntPtr type); + [Obsolete] public bool IdHasFieldTyped(uint field, GLib.GType type) { bool raw_ret = gst_structure_id_has_field_typed(Handle, field, type.Val); bool ret = raw_ret; @@ -447,15 +489,101 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_structure_id_set_value(IntPtr raw, uint field, IntPtr value); + [Obsolete] public void IdSetValue(uint field, GLib.Value value) { IntPtr native_value = GLib.Marshaller.StructureToPtrAlloc (value); gst_structure_id_set_value(Handle, field, native_value); Marshal.FreeHGlobal (native_value); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_structure_id_str_get_field_type(IntPtr raw, IntPtr fieldname); + + public GLib.GType IdStrGetFieldType(Gst.IdStr fieldname) { + IntPtr native_fieldname = GLib.Marshaller.StructureToPtrAlloc (fieldname); + IntPtr raw_ret = gst_structure_id_str_get_field_type(Handle, native_fieldname); + GLib.GType ret = new GLib.GType(raw_ret); + Marshal.FreeHGlobal (native_fieldname); + return ret; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_structure_id_str_get_value(IntPtr raw, IntPtr fieldname); + + public GLib.Value IdStrGetValue(Gst.IdStr fieldname) { + IntPtr native_fieldname = GLib.Marshaller.StructureToPtrAlloc (fieldname); + IntPtr raw_ret = gst_structure_id_str_get_value(Handle, native_fieldname); + GLib.Value ret = (GLib.Value) Marshal.PtrToStructure (raw_ret, typeof (GLib.Value)); + Marshal.FreeHGlobal (native_fieldname); + return ret; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_structure_id_str_has_field(IntPtr raw, IntPtr fieldname); + + public bool IdStrHasField(Gst.IdStr fieldname) { + IntPtr native_fieldname = GLib.Marshaller.StructureToPtrAlloc (fieldname); + bool raw_ret = gst_structure_id_str_has_field(Handle, native_fieldname); + bool ret = raw_ret; + Marshal.FreeHGlobal (native_fieldname); + return ret; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_structure_id_str_has_field_typed(IntPtr raw, IntPtr fieldname, IntPtr type); + + public bool IdStrHasFieldTyped(Gst.IdStr fieldname, GLib.GType type) { + IntPtr native_fieldname = GLib.Marshaller.StructureToPtrAlloc (fieldname); + bool raw_ret = gst_structure_id_str_has_field_typed(Handle, native_fieldname, type.Val); + bool ret = raw_ret; + Marshal.FreeHGlobal (native_fieldname); + return ret; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_structure_id_str_nth_field_name(IntPtr raw, uint index); + + public Gst.IdStr IdStrNthFieldName(uint index) { + IntPtr raw_ret = gst_structure_id_str_nth_field_name(Handle, index); + Gst.IdStr ret = Gst.IdStr.New (raw_ret); + return ret; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_structure_id_str_remove_field(IntPtr raw, IntPtr fieldname); + + public void IdStrRemoveField(Gst.IdStr fieldname) { + IntPtr native_fieldname = GLib.Marshaller.StructureToPtrAlloc (fieldname); + gst_structure_id_str_remove_field(Handle, native_fieldname); + Marshal.FreeHGlobal (native_fieldname); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_structure_id_str_set_value(IntPtr raw, IntPtr fieldname, IntPtr value); + + public void IdStrSetValue(Gst.IdStr fieldname, GLib.Value value) { + IntPtr native_fieldname = GLib.Marshaller.StructureToPtrAlloc (fieldname); + IntPtr native_value = GLib.Marshaller.StructureToPtrAlloc (value); + gst_structure_id_str_set_value(Handle, native_fieldname, native_value); + Marshal.FreeHGlobal (native_fieldname); + Marshal.FreeHGlobal (native_value); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_structure_id_str_take_value(IntPtr raw, IntPtr fieldname, IntPtr value); + + public void IdStrTakeValue(Gst.IdStr fieldname, GLib.Value value) { + IntPtr native_fieldname = GLib.Marshaller.StructureToPtrAlloc (fieldname); + IntPtr native_value = GLib.Marshaller.StructureToPtrAlloc (value); + gst_structure_id_str_take_value(Handle, native_fieldname, native_value); + Marshal.FreeHGlobal (native_fieldname); + Marshal.FreeHGlobal (native_value); + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_structure_id_take_value(IntPtr raw, uint field, IntPtr value); + [Obsolete] public void IdTakeValue(uint field, GLib.Value value) { IntPtr native_value = GLib.Marshaller.StructureToPtrAlloc (value); gst_structure_id_take_value(Handle, field, native_value); @@ -492,6 +620,7 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_structure_map_in_place(IntPtr raw, GstSharp.StructureMapFuncNative func, IntPtr user_data); + [Obsolete] public bool MapInPlace(Gst.StructureMapFunc func) { GstSharp.StructureMapFuncWrapper func_wrapper = new GstSharp.StructureMapFuncWrapper (func); bool raw_ret = gst_structure_map_in_place(Handle, func_wrapper.NativeDelegate, IntPtr.Zero); @@ -499,6 +628,16 @@ namespace Gst { return ret; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_structure_map_in_place_id_str(IntPtr raw, GstSharp.StructureMapIdStrFuncNative func, IntPtr user_data); + + public bool MapInPlaceIdStr(Gst.StructureMapIdStrFunc func) { + GstSharp.StructureMapIdStrFuncWrapper func_wrapper = new GstSharp.StructureMapIdStrFuncWrapper (func); + bool raw_ret = gst_structure_map_in_place_id_str(Handle, func_wrapper.NativeDelegate, IntPtr.Zero); + bool ret = raw_ret; + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int gst_structure_n_fields(IntPtr raw); @@ -536,12 +675,22 @@ namespace Gst { [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_structure_serialize(IntPtr raw, int flags); + [Obsolete] public string Serialize(Gst.SerializeFlags flags) { IntPtr raw_ret = gst_structure_serialize(Handle, (int) flags); string ret = GLib.Marshaller.PtrToStringGFree(raw_ret); return ret; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_structure_serialize_full(IntPtr raw, int flags); + + public string SerializeFull(Gst.SerializeFlags flags) { + IntPtr raw_ret = gst_structure_serialize_full(Handle, (int) flags); + string ret = GLib.Marshaller.PtrToStringGFree(raw_ret); + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_structure_set_array(IntPtr raw, IntPtr fieldname, IntPtr array); @@ -560,6 +709,17 @@ namespace Gst { GLib.Marshaller.Free (native_fieldname); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_structure_set_name_static_str(IntPtr raw, IntPtr name); + + public string NameStaticStr { + set { + IntPtr native_value = GLib.Marshaller.StringToPtrGStrdup (value); + gst_structure_set_name_static_str(Handle, native_value); + GLib.Marshaller.Free (native_value); + } + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_structure_set_parent_refcount(IntPtr raw, int refcount); @@ -580,6 +740,17 @@ namespace Gst { Marshal.FreeHGlobal (native_value); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_structure_set_value_static_str(IntPtr raw, IntPtr fieldname, IntPtr value); + + public void SetValueStaticStr(string fieldname, GLib.Value value) { + IntPtr native_fieldname = GLib.Marshaller.StringToPtrGStrdup (fieldname); + IntPtr native_value = GLib.Marshaller.StructureToPtrAlloc (value); + gst_structure_set_value_static_str(Handle, native_fieldname, native_value); + GLib.Marshaller.Free (native_fieldname); + Marshal.FreeHGlobal (native_value); + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_structure_take_value(IntPtr raw, IntPtr fieldname, IntPtr value); @@ -591,6 +762,17 @@ namespace Gst { Marshal.FreeHGlobal (native_value); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_structure_take_value_static_str(IntPtr raw, IntPtr fieldname, IntPtr value); + + public void TakeValueStaticStr(string fieldname, GLib.Value value) { + IntPtr native_fieldname = GLib.Marshaller.StringToPtrGStrdup (fieldname); + IntPtr native_value = GLib.Marshaller.StructureToPtrAlloc (value); + gst_structure_take_value_static_str(Handle, native_fieldname, native_value); + GLib.Marshaller.Free (native_fieldname); + Marshal.FreeHGlobal (native_value); + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_structure_to_string(IntPtr raw); @@ -643,6 +825,27 @@ namespace Gst { Raw = gst_structure_new_id_empty(quark); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_structure_new_id_str_empty(IntPtr name); + + public Structure (Gst.IdStr name) + { + IntPtr native_name = GLib.Marshaller.StructureToPtrAlloc (name); + Raw = gst_structure_new_id_str_empty(native_name); + Marshal.FreeHGlobal (native_name); + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr gst_structure_new_static_str_empty(IntPtr name); + + public static Structure NewStaticStrEmpty(string name) + { + IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); + Structure result = new Structure (gst_structure_new_static_str_empty(native_name)); + GLib.Marshaller.Free (native_name); + return result; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_structure_free(IntPtr raw); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/StructureFilterMapIdStrFunc.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/StructureFilterMapIdStrFunc.cs new file mode 100644 index 0000000000..d0356b1ae1 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/StructureFilterMapIdStrFunc.cs @@ -0,0 +1,10 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace Gst { + + using System; + + public delegate bool StructureFilterMapIdStrFunc(Gst.IdStr fieldname, GLib.Value value); + +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/StructureForeachIdStrFunc.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/StructureForeachIdStrFunc.cs new file mode 100644 index 0000000000..bad1fbfe80 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/StructureForeachIdStrFunc.cs @@ -0,0 +1,10 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace Gst { + + using System; + + public delegate bool StructureForeachIdStrFunc(Gst.IdStr fieldname, GLib.Value value); + +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/StructureMapIdStrFunc.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/StructureMapIdStrFunc.cs new file mode 100644 index 0000000000..6c84498c08 --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/StructureMapIdStrFunc.cs @@ -0,0 +1,10 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace Gst { + + using System; + + public delegate bool StructureMapIdStrFunc(Gst.IdStr fieldname, GLib.Value value); + +} diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Tracer.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Tracer.cs index d36dd43f16..df9f7bd1cb 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Tracer.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Tracer.cs @@ -57,6 +57,24 @@ namespace Gst { // End of the ABI representation. + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void gst_tracer_class_set_use_structure_params(bool use_structure_params); + + public static bool UseStructureParams { + set { + gst_tracer_class_set_use_structure_params(value); + } + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_tracer_class_uses_structure_params(); + + public static bool UsesStructureParams() { + bool raw_ret = gst_tracer_class_uses_structure_params(); + bool ret = raw_ret; + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_tracer_get_type(); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Util.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Util.cs index 8e9c5c0c8d..0269a97a38 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Util.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Util.cs @@ -208,6 +208,15 @@ namespace Gst { return ret; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern uint gst_util_ceil_log2(uint v); + + public static uint CeilLog2(uint v) { + uint raw_ret = gst_util_ceil_log2(v); + uint ret = raw_ret; + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_util_double_to_fraction(double src, out int dest_n, out int dest_d); @@ -230,6 +239,28 @@ namespace Gst { gst_util_dump_mem(mem, size); } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern int gst_util_filename_compare(IntPtr a, IntPtr b); + + public static int FilenameCompare(string a, string b) { + IntPtr native_a = GLib.Marshaller.StringToFilenamePtr (a); + IntPtr native_b = GLib.Marshaller.StringToFilenamePtr (b); + int raw_ret = gst_util_filename_compare(native_a, native_b); + int ret = raw_ret; + GLib.Marshaller.Free (native_a); + GLib.Marshaller.Free (native_b); + return ret; + } + + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern uint gst_util_floor_log2(uint v); + + public static uint FloorLog2(uint v) { + uint raw_ret = gst_util_floor_log2(v); + uint ret = raw_ret; + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_util_fraction_add(int a_n, int a_d, int b_n, int b_d, out int res_n, out int res_d); @@ -257,6 +288,15 @@ namespace Gst { return ret; } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool gst_util_fraction_multiply_int64(long a_n, long a_d, long b_n, long b_d, out long res_n, out long res_d); + + public static bool FractionMultiplyInt64(long a_n, long a_d, long b_n, long b_d, out long res_n, out long res_d) { + bool raw_ret = gst_util_fraction_multiply_int64(a_n, a_d, b_n, b_d, out res_n, out res_d); + bool ret = raw_ret; + return ret; + } + [DllImport("gstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_util_fraction_to_double(int src_n, int src_d, out double dest); diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/VecDeque.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/VecDeque.cs new file mode 100644 index 0000000000..77b9c30acb --- /dev/null +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/VecDeque.cs @@ -0,0 +1,34 @@ +// This file was generated by the Gtk# code generator. +// Any changes made will be lost if regenerated. + +namespace Gst { + + using System; + using System.Collections; + using System.Collections.Generic; + using System.Runtime.InteropServices; + +#region Autogenerated code + public partial class VecDeque : GLib.Opaque { + + public VecDeque(IntPtr raw) : base(raw) {} + + + // Internal representation of the wrapped structure ABI. + static GLib.AbiStruct _abi_info = null; + static public GLib.AbiStruct abi_info { + get { + if (_abi_info == null) + _abi_info = new GLib.AbiStruct (new List{ + }); + + return _abi_info; + } + } + + + // End of the ABI representation. + +#endregion + } +} diff --git a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-abi.c b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-abi.c index 5f5a678eb5..4ed1f74427 100644 --- a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-abi.c +++ b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-abi.c @@ -494,6 +494,7 @@ int main (int argc, char *argv[]) { g_print("\"GstAudioRingBuffer.may_start\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GstAudioRingBuffer, may_start)); g_print("\"GstAudioRingBuffer.active\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GstAudioRingBuffer, active)); g_print("\"GstAudioRingBuffer.cb_data_notify\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GstAudioRingBuffer, cb_data_notify)); + g_print("\"GstAudioRingBuffer.priv\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GstAudioRingBuffer, priv)); g_print("\"sizeof(GstAudioSinkClass)\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) sizeof(GstAudioSinkClass)); g_print("\"GstAudioSinkClass.open\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GstAudioSinkClass, open)); g_print("\"GstAudioSinkClass.prepare\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GstAudioSinkClass, prepare)); @@ -1134,6 +1135,7 @@ int main (int argc, char *argv[]) { g_print("\"GstRTSPOnvifMedia.priv\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GstRTSPOnvifMedia, priv)); g_print("\"sizeof(GstRTSPOnvifMediaFactoryClass)\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) sizeof(GstRTSPOnvifMediaFactoryClass)); g_print("\"GstRTSPOnvifMediaFactoryClass.has_backchannel_support\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GstRTSPOnvifMediaFactoryClass, has_backchannel_support)); + g_print("\"GstRTSPOnvifMediaFactoryClass.create_backchannel_stream\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GstRTSPOnvifMediaFactoryClass, create_backchannel_stream)); g_print("\"sizeof(GstRTSPOnvifMediaFactory)\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) sizeof(GstRTSPOnvifMediaFactory)); g_print("\"GstRTSPOnvifMediaFactory.priv\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GstRTSPOnvifMediaFactory, priv)); g_print("\"sizeof(GstRTSPOnvifServerClass)\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) sizeof(GstRTSPOnvifServerClass)); diff --git a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-abi.cs b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-abi.cs index bcaedef897..f519048898 100644 --- a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-abi.cs +++ b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-abi.cs @@ -487,6 +487,7 @@ namespace AbiTester { Console.WriteLine("\"GstAudioRingBuffer.may_start\": \"" + Gst.Audio.AudioRingBuffer.abi_info.GetFieldOffset("may_start") + "\""); Console.WriteLine("\"GstAudioRingBuffer.active\": \"" + Gst.Audio.AudioRingBuffer.abi_info.GetFieldOffset("active") + "\""); Console.WriteLine("\"GstAudioRingBuffer.cb_data_notify\": \"" + Gst.Audio.AudioRingBuffer.abi_info.GetFieldOffset("cb_data_notify") + "\""); + Console.WriteLine("\"GstAudioRingBuffer.priv\": \"" + Gst.Audio.AudioRingBuffer.abi_info.GetFieldOffset("priv") + "\""); Console.WriteLine("\"sizeof(GstAudioSinkClass)\": \"" + Gst.Audio.AudioSink.class_abi.Size + "\""); Console.WriteLine("\"GstAudioSinkClass.open\": \"" + Gst.Audio.AudioSink.class_abi.GetFieldOffset("open") + "\""); Console.WriteLine("\"GstAudioSinkClass.prepare\": \"" + Gst.Audio.AudioSink.class_abi.GetFieldOffset("prepare") + "\""); @@ -1127,6 +1128,7 @@ namespace AbiTester { Console.WriteLine("\"GstRTSPOnvifMedia.priv\": \"" + Gst.RtspServer.RTSPOnvifMedia.abi_info.GetFieldOffset("priv") + "\""); Console.WriteLine("\"sizeof(GstRTSPOnvifMediaFactoryClass)\": \"" + Gst.RtspServer.RTSPOnvifMediaFactory.class_abi.Size + "\""); Console.WriteLine("\"GstRTSPOnvifMediaFactoryClass.has_backchannel_support\": \"" + Gst.RtspServer.RTSPOnvifMediaFactory.class_abi.GetFieldOffset("has_backchannel_support") + "\""); + Console.WriteLine("\"GstRTSPOnvifMediaFactoryClass.create_backchannel_stream\": \"" + Gst.RtspServer.RTSPOnvifMediaFactory.class_abi.GetFieldOffset("create_backchannel_stream") + "\""); Console.WriteLine("\"sizeof(GstRTSPOnvifMediaFactory)\": \"" + Gst.RtspServer.RTSPOnvifMediaFactory.abi_info.Size + "\""); Console.WriteLine("\"GstRTSPOnvifMediaFactory.priv\": \"" + Gst.RtspServer.RTSPOnvifMediaFactory.abi_info.GetFieldOffset("priv") + "\""); Console.WriteLine("\"sizeof(GstRTSPOnvifServerClass)\": \"" + Gst.RtspServer.RTSPOnvifServer.class_abi.Size + "\""); diff --git a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml index bfcfd9ece2..10254e2cc6 100644 --- a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml +++ b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml @@ -394,6 +394,7 @@ + @@ -577,6 +578,7 @@ + @@ -694,6 +696,7 @@ + @@ -717,6 +720,20 @@ + + + + + missing glib:type-name + + + missing glib:type-name + + + missing glib:type-name + + + @@ -1031,6 +1048,33 @@ + + + + + missing glib:type-name + + + missing glib:type-name + + + + + + missing glib:type-name + + + + missing glib:type-name + + + missing glib:type-name + + + + + + @@ -1054,6 +1098,18 @@ + + + + + missing glib:type-name + + + missing glib:type-name + + + + @@ -1280,6 +1336,18 @@ + + + + + missing glib:type-name + + + missing glib:type-name + + + + @@ -1290,6 +1358,18 @@ + + + + + missing glib:type-name + + + missing glib:type-name + + + + @@ -1300,6 +1380,18 @@ + + + + + missing glib:type-name + + + missing glib:type-name + + + + @@ -2598,16 +2690,16 @@ - - + + - - + + @@ -5215,6 +5307,10 @@ + + + + @@ -5227,6 +5323,10 @@ + + + + @@ -5336,6 +5436,24 @@ + + + + + + + + + + + + + + + + + + missing glib:type-name @@ -5374,6 +5492,18 @@ + + + + + + + + + + + + @@ -5814,8 +5944,8 @@ - - + + @@ -6039,6 +6169,16 @@ + + + + + + + + + + @@ -6500,7 +6640,7 @@ - + + + + + missing glib:type-name + + + + + + + + @@ -6993,6 +7151,17 @@ + + + + + missing glib:type-name + + + missing glib:type-name + + + missing glib:type-name @@ -7169,6 +7338,15 @@ + + + + + + missing glib:type-name + + + missing glib:type-name @@ -7224,30 +7402,57 @@ + + + + + - + + + + + + missing glib:type-name + + + + + + + + + - + + + + + + missing glib:type-name + + + missing glib:type-name @@ -7264,12 +7469,20 @@ - + + + + missing glib:type-name + + + + + @@ -7292,12 +7505,20 @@ - + + + + + + missing glib:type-name + + + @@ -7401,6 +7622,9 @@ missing glib:type-name + + missing glib:type-name + missing glib:type-name @@ -7811,7 +8035,7 @@ - + @@ -8065,6 +8289,103 @@ + + + missing glib:type-name + + + @@ -8733,6 +9060,14 @@ + + + + + missing glib:type-name + + + @@ -8764,6 +9099,14 @@ + + + + + missing glib:type-name + + + @@ -8951,6 +9294,14 @@ + + + + + missing glib:type-name + + + @@ -8960,6 +9311,14 @@ + + + + + missing glib:type-name + + + @@ -9012,6 +9371,12 @@ + + + missing glib:type-name + + + missing glib:type-name @@ -9047,6 +9412,35 @@ + + + + + missing glib:type-name + + + + + + + + + + + + + + + missing glib:type-name + + + missing glib:type-name + + + missing glib:type-name + + + @@ -9067,6 +9461,26 @@ + + + + + + + + + + missing glib:type-name + + + + missing glib:type-name + + + + + + missing glib:type-name @@ -9075,19 +9489,6 @@ - - - missing glib:type-name - - - - - - - - - - missing glib:type-name @@ -9100,6 +9501,14 @@ + + + missing glib:type-name + + + + + + @@ -15987,6 +16655,14 @@ + + + + + + + + @@ -16052,6 +16728,10 @@ + + + + @@ -16064,6 +16744,12 @@ + + + + + + @@ -16105,7 +16791,10 @@ - + + missing glib:type-name + + @@ -21948,6 +22676,38 @@ + + + missing glib:type-name + + + + missing glib:type-name + + + + + + missing glib:type-name + + + + missing glib:type-name + + + + + + + + + + + + + + + missing glib:type-name @@ -22041,6 +22801,43 @@ + + + + + missing glib:type-name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22254,6 +23051,23 @@ + + + + + missing glib:type-name + + + + + + + + missing glib:type-name + + + + @@ -22376,10 +23190,10 @@ - - - - + + + + @@ -22671,6 +23485,7 @@ + @@ -22841,6 +23656,7 @@ + @@ -24383,7 +25199,7 @@ - + @@ -24568,6 +25384,7 @@ + @@ -24589,6 +25406,8 @@ + + @@ -24909,6 +25728,13 @@ @@ -15680,6 +16348,14 @@ + + + + + + + + @@ -15745,6 +16421,10 @@ + + + + @@ -15757,6 +16437,12 @@ + + + + + + @@ -15798,7 +16484,10 @@ - + + missing glib:type-name + + @@ -22022,6 +22750,38 @@ + + + missing glib:type-name + + + + missing glib:type-name + + + + + + missing glib:type-name + + + + missing glib:type-name + + + + + + + + + + + + + + + missing glib:type-name @@ -22115,6 +22875,43 @@ + + + + + missing glib:type-name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22328,6 +23125,23 @@ + + + + + missing glib:type-name + + + + + + + + missing glib:type-name + + + + @@ -22451,8 +23265,8 @@ - - + + @@ -22745,6 +23559,7 @@ + @@ -22915,6 +23730,7 @@ + @@ -24457,7 +25273,7 @@ - + @@ -24642,6 +25458,7 @@ + @@ -24663,6 +25480,8 @@ + + @@ -24983,6 +25802,13 @@