Commit 6ad219d5 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠

Release 1.16.0

parent cf3b88ae
Pipeline #31911 failed with stages
in 82 minutes and 16 seconds
...@@ -23,6 +23,7 @@ namespace GES { ...@@ -23,6 +23,7 @@ namespace GES {
public const string MULTI_FILE_URI_PREFIX = @"multifile://"; public const string MULTI_FILE_URI_PREFIX = @"multifile://";
public const int PADDING = 4; public const int PADDING = 4;
public const int PADDING_LARGE = 20; public const int PADDING_LARGE = 20;
public const uint TIMELINE_ELEMENT_NO_LAYER_PRIORITY = 4294967295;
#endregion #endregion
} }
} }
...@@ -29,6 +29,15 @@ namespace GES { ...@@ -29,6 +29,15 @@ namespace GES {
ges_deinit(); ges_deinit();
} }
[DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr ges_edge_name(int edge);
public static string EdgeName(GES.Edge edge) {
IntPtr raw_ret = ges_edge_name((int) edge);
string ret = GLib.Marshaller.Utf8PtrToString (raw_ret);
return ret;
}
[DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)] [DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)]
static extern bool ges_init(); static extern bool ges_init();
......
...@@ -1163,6 +1163,64 @@ namespace GES { ...@@ -1163,6 +1163,64 @@ namespace GES {
Marshal.FreeHGlobal (native_value); Marshal.FreeHGlobal (native_value);
} }
static GetLayerPriorityNativeDelegate GetLayerPriority_cb_delegate;
static GetLayerPriorityNativeDelegate GetLayerPriorityVMCallback {
get {
if (GetLayerPriority_cb_delegate == null)
GetLayerPriority_cb_delegate = new GetLayerPriorityNativeDelegate (GetLayerPriority_cb);
return GetLayerPriority_cb_delegate;
}
}
static void OverrideGetLayerPriority (GLib.GType gtype)
{
OverrideGetLayerPriority (gtype, GetLayerPriorityVMCallback);
}
static void OverrideGetLayerPriority (GLib.GType gtype, GetLayerPriorityNativeDelegate callback)
{
unsafe {
IntPtr* raw_ptr = (IntPtr*)(((long) gtype.GetClassPtr()) + (long) class_abi.GetFieldOffset("get_layer_priority"));
*raw_ptr = Marshal.GetFunctionPointerForDelegate((Delegate) callback);
}
}
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate uint GetLayerPriorityNativeDelegate (IntPtr inst);
static uint GetLayerPriority_cb (IntPtr inst)
{
try {
TimelineElement __obj = GLib.Object.GetObject (inst, false) as TimelineElement;
uint __result;
__result = __obj.OnGetLayerPriority ();
return __result;
} catch (Exception e) {
GLib.ExceptionManager.RaiseUnhandledException (e, true);
// NOTREACHED: above call does not return.
throw e;
}
}
[GLib.DefaultSignalHandler(Type=typeof(GES.TimelineElement), ConnectionMethod="OverrideGetLayerPriority")]
protected virtual uint OnGetLayerPriority ()
{
return InternalGetLayerPriority ();
}
private uint InternalGetLayerPriority ()
{
GetLayerPriorityNativeDelegate unmanaged = null;
unsafe {
IntPtr* raw_ptr = (IntPtr*)(((long) this.LookupGType().GetThresholdType().GetClassPtr()) + (long) class_abi.GetFieldOffset("get_layer_priority"));
unmanaged = (GetLayerPriorityNativeDelegate) Marshal.GetDelegateForFunctionPointer(*raw_ptr, typeof(GetLayerPriorityNativeDelegate));
}
if (unmanaged == null) return 0;
uint __result = unmanaged (this.Handle);
return __result;
}
// Internal representation of the wrapped structure ABI. // Internal representation of the wrapped structure ABI.
static GLib.AbiStruct _class_abi = null; static GLib.AbiStruct _class_abi = null;
...@@ -1302,14 +1360,22 @@ namespace GES { ...@@ -1302,14 +1360,22 @@ namespace GES {
, -1 , -1
, (uint) Marshal.SizeOf(typeof(IntPtr)) // set_child_property , (uint) Marshal.SizeOf(typeof(IntPtr)) // set_child_property
, "get_track_types" , "get_track_types"
, "get_layer_priority"
, (uint) Marshal.SizeOf(typeof(IntPtr))
, 0
),
new GLib.AbiField("get_layer_priority"
, -1
, (uint) Marshal.SizeOf(typeof(IntPtr)) // get_layer_priority
, "set_child_property"
, "_ges_reserved" , "_ges_reserved"
, (uint) Marshal.SizeOf(typeof(IntPtr)) , (uint) Marshal.SizeOf(typeof(IntPtr))
, 0 , 0
), ),
new GLib.AbiField("_ges_reserved" new GLib.AbiField("_ges_reserved"
, -1 , -1
, (uint) Marshal.SizeOf(typeof(IntPtr)) * 17 // _ges_reserved , (uint) Marshal.SizeOf(typeof(IntPtr)) * 16 // _ges_reserved
, "set_child_property" , "get_layer_priority"
, null , null
, (uint) Marshal.SizeOf(typeof(IntPtr)) , (uint) Marshal.SizeOf(typeof(IntPtr))
, 0 , 0
...@@ -1378,6 +1444,17 @@ namespace GES { ...@@ -1378,6 +1444,17 @@ namespace GES {
return value; return value;
} }
[DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)]
static extern uint ges_timeline_element_get_layer_priority(IntPtr raw);
public uint LayerPriority {
get {
uint raw_ret = ges_timeline_element_get_layer_priority(Handle);
uint ret = raw_ret;
return ret;
}
}
[DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)] [DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr ges_timeline_element_get_toplevel_parent(IntPtr raw); static extern IntPtr ges_timeline_element_get_toplevel_parent(IntPtr raw);
......
...@@ -76,10 +76,11 @@ namespace GES { ...@@ -76,10 +76,11 @@ namespace GES {
[DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)] [DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)]
static extern void ges_title_source_set_font_desc(IntPtr raw, IntPtr font_desc); static extern void ges_title_source_set_font_desc(IntPtr raw, IntPtr font_desc);
[Obsolete]
public string FontDesc { public string FontDesc {
get { get {
IntPtr raw_ret = ges_title_source_get_font_desc(Handle); IntPtr raw_ret = ges_title_source_get_font_desc(Handle);
string ret = GLib.Marshaller.Utf8PtrToString (raw_ret); string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
return ret; return ret;
} }
set { set {
...@@ -112,10 +113,11 @@ namespace GES { ...@@ -112,10 +113,11 @@ namespace GES {
[DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)] [DllImport("ges-1.0", CallingConvention = CallingConvention.Cdecl)]
static extern void ges_title_source_set_text(IntPtr raw, IntPtr text); static extern void ges_title_source_set_text(IntPtr raw, IntPtr text);
[Obsolete]
public string Text { public string Text {
get { get {
IntPtr raw_ret = ges_title_source_get_text(Handle); IntPtr raw_ret = ges_title_source_get_text(Handle);
string ret = GLib.Marshaller.Utf8PtrToString (raw_ret); string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
return ret; return ret;
} }
set { set {
......
...@@ -453,31 +453,19 @@ namespace GES { ...@@ -453,31 +453,19 @@ namespace GES {
int cnt_wanted_categories = wanted_categories == null ? 0 : wanted_categories.Length; int cnt_wanted_categories = wanted_categories == null ? 0 : wanted_categories.Length;
IntPtr[] native_wanted_categories = new IntPtr [cnt_wanted_categories + 1]; IntPtr[] native_wanted_categories = new IntPtr [cnt_wanted_categories + 1];
for (int i = 0; i < cnt_wanted_categories; i++) for (int i = 0; i < cnt_wanted_categories; i++)
native_wanted_categories [i] = GLib.Marshaller.StringToPtrGStrdup (wanted_categories[i]); native_wanted_categories [i] = GLib.Marshaller.StringToPtrGStrdup(wanted_categories[i]);
native_wanted_categories [cnt_wanted_categories] = IntPtr.Zero; native_wanted_categories [cnt_wanted_categories] = IntPtr.Zero;
int cnt_blacklist = blacklist == null ? 0 : blacklist.Length; int cnt_blacklist = blacklist == null ? 0 : blacklist.Length;
IntPtr[] native_blacklist = new IntPtr [cnt_blacklist + 1]; IntPtr[] native_blacklist = new IntPtr [cnt_blacklist + 1];
for (int i = 0; i < cnt_blacklist; i++) for (int i = 0; i < cnt_blacklist; i++)
native_blacklist [i] = GLib.Marshaller.StringToPtrGStrdup (blacklist[i]); native_blacklist [i] = GLib.Marshaller.StringToPtrGStrdup(blacklist[i]);
native_blacklist [cnt_blacklist] = IntPtr.Zero; native_blacklist [cnt_blacklist] = IntPtr.Zero;
int cnt_whitelist = whitelist == null ? 0 : whitelist.Length; int cnt_whitelist = whitelist == null ? 0 : whitelist.Length;
IntPtr[] native_whitelist = new IntPtr [cnt_whitelist + 1]; IntPtr[] native_whitelist = new IntPtr [cnt_whitelist + 1];
for (int i = 0; i < cnt_whitelist; i++) for (int i = 0; i < cnt_whitelist; i++)
native_whitelist [i] = GLib.Marshaller.StringToPtrGStrdup (whitelist[i]); native_whitelist [i] = GLib.Marshaller.StringToPtrGStrdup(whitelist[i]);
native_whitelist [cnt_whitelist] = IntPtr.Zero; native_whitelist [cnt_whitelist] = IntPtr.Zero;
ges_track_element_add_children_props(Handle, element == null ? IntPtr.Zero : element.Handle, native_wanted_categories, native_blacklist, native_whitelist); ges_track_element_add_children_props(Handle, element == null ? IntPtr.Zero : element.Handle, native_wanted_categories, native_blacklist, native_whitelist);
for (int i = 0; i < native_wanted_categories.Length - 1; i++) {
wanted_categories [i] = GLib.Marshaller.Utf8PtrToString (native_wanted_categories[i]);
GLib.Marshaller.Free (native_wanted_categories[i]);
}
for (int i = 0; i < native_blacklist.Length - 1; i++) {
blacklist [i] = GLib.Marshaller.Utf8PtrToString (native_blacklist[i]);
GLib.Marshaller.Free (native_blacklist[i]);
}
for (int i = 0; i < native_whitelist.Length - 1; i++) {
whitelist [i] = GLib.Marshaller.Utf8PtrToString (native_whitelist[i]);
GLib.Marshaller.Free (native_whitelist[i]);
}
} }
public void AddChildrenProps(Gst.Element element) { public void AddChildrenProps(Gst.Element element) {
......
...@@ -174,6 +174,7 @@ int main (int argc, char *argv[]) { ...@@ -174,6 +174,7 @@ int main (int argc, char *argv[]) {
g_print("\"GESTimelineElementClass.lookup_child\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESTimelineElementClass, lookup_child)); g_print("\"GESTimelineElementClass.lookup_child\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESTimelineElementClass, lookup_child));
g_print("\"GESTimelineElementClass.get_track_types\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESTimelineElementClass, get_track_types)); g_print("\"GESTimelineElementClass.get_track_types\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESTimelineElementClass, get_track_types));
g_print("\"GESTimelineElementClass.set_child_property\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESTimelineElementClass, set_child_property)); g_print("\"GESTimelineElementClass.set_child_property\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESTimelineElementClass, set_child_property));
g_print("\"GESTimelineElementClass.get_layer_priority\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESTimelineElementClass, get_layer_priority));
g_print("\"sizeof(GESTimelineElement)\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) sizeof(GESTimelineElement)); g_print("\"sizeof(GESTimelineElement)\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) sizeof(GESTimelineElement));
g_print("\"GESTimelineElement.parent\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESTimelineElement, parent)); g_print("\"GESTimelineElement.parent\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESTimelineElement, parent));
g_print("\"GESTimelineElement.asset\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESTimelineElement, asset)); g_print("\"GESTimelineElement.asset\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESTimelineElement, asset));
......
...@@ -189,6 +189,7 @@ namespace AbiTester { ...@@ -189,6 +189,7 @@ namespace AbiTester {
Console.WriteLine("\"GESTimelineElementClass.lookup_child\": \"" + GES.TimelineElement.class_abi.GetFieldOffset("lookup_child") + "\""); Console.WriteLine("\"GESTimelineElementClass.lookup_child\": \"" + GES.TimelineElement.class_abi.GetFieldOffset("lookup_child") + "\"");
Console.WriteLine("\"GESTimelineElementClass.get_track_types\": \"" + GES.TimelineElement.class_abi.GetFieldOffset("get_track_types") + "\""); Console.WriteLine("\"GESTimelineElementClass.get_track_types\": \"" + GES.TimelineElement.class_abi.GetFieldOffset("get_track_types") + "\"");
Console.WriteLine("\"GESTimelineElementClass.set_child_property\": \"" + GES.TimelineElement.class_abi.GetFieldOffset("set_child_property") + "\""); Console.WriteLine("\"GESTimelineElementClass.set_child_property\": \"" + GES.TimelineElement.class_abi.GetFieldOffset("set_child_property") + "\"");
Console.WriteLine("\"GESTimelineElementClass.get_layer_priority\": \"" + GES.TimelineElement.class_abi.GetFieldOffset("get_layer_priority") + "\"");
Console.WriteLine("\"sizeof(GESTimelineElement)\": \"" + GES.TimelineElement.abi_info.Size + "\""); Console.WriteLine("\"sizeof(GESTimelineElement)\": \"" + GES.TimelineElement.abi_info.Size + "\"");
Console.WriteLine("\"GESTimelineElement.parent\": \"" + GES.TimelineElement.abi_info.GetFieldOffset("parent") + "\""); Console.WriteLine("\"GESTimelineElement.parent\": \"" + GES.TimelineElement.abi_info.GetFieldOffset("parent") + "\"");
Console.WriteLine("\"GESTimelineElement.asset\": \"" + GES.TimelineElement.abi_info.GetFieldOffset("asset") + "\""); Console.WriteLine("\"GESTimelineElement.asset\": \"" + GES.TimelineElement.abi_info.GetFieldOffset("asset") + "\"");
......
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<parameter name="error" type="GError**" /> <parameter name="error" type="GError**" />
</parameters> </parameters>
</callback> </callback>
<callback name="FormatterLoadFromURIMethod" cname="GESFormatterLoadFromURIMethod"> <callback name="FormatterLoadFromURIMethod" cname="GESFormatterLoadFromURIMethod" deprecated="true" deprecated-version="1.16">
<return-type type="gboolean" /> <return-type type="gboolean" />
<parameters throws="1"> <parameters throws="1">
<parameter name="formatter" type="GESFormatter*" /> <parameter name="formatter" type="GESFormatter*" />
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
<parameter name="error" type="GError**" /> <parameter name="error" type="GError**" />
</parameters> </parameters>
</callback> </callback>
<callback name="FormatterSaveToURIMethod" cname="GESFormatterSaveToURIMethod"> <callback name="FormatterSaveToURIMethod" cname="GESFormatterSaveToURIMethod" deprecated="true" deprecated-version="1.16">
<return-type type="gboolean" /> <return-type type="gboolean" />
<parameters throws="1"> <parameters throws="1">
<parameter name="formatter" type="GESFormatter*" /> <parameter name="formatter" type="GESFormatter*" />
...@@ -2508,7 +2508,8 @@ ...@@ -2508,7 +2508,8 @@
<method vm="lookup_child" /> <method vm="lookup_child" />
<method vm="get_track_types" /> <method vm="get_track_types" />
<method vm="set_child_property" /> <method vm="set_child_property" />
<field cname="_ges_reserved" access="private" writeable="false" readable="false" is_callback="false" name="_gesGesReserved" type="gpointer" array="true" array_len="17" padding="true" /> <method vm="get_layer_priority" />
<field cname="_ges_reserved" access="private" writeable="false" readable="false" is_callback="false" name="_gesGesReserved" type="gpointer" array="true" array_len="16" padding="true" />
</class_struct> </class_struct>
<method name="GetType" cname="ges_timeline_element_get_type" shared="true"> <method name="GetType" cname="ges_timeline_element_get_type" shared="true">
<return-type type="GType" /> <return-type type="GType" />
...@@ -2519,6 +2520,10 @@ ...@@ -2519,6 +2520,10 @@
<parameter name="copy" type="GESTimelineElement*" /> <parameter name="copy" type="GESTimelineElement*" />
</parameters> </parameters>
</virtual_method> </virtual_method>
<virtual_method name="GetLayerPriority" cname="get_layer_priority">
<return-type type="guint32" />
<parameters />
</virtual_method>
<virtual_method name="GetTrackTypes" cname="get_track_types" version="1.6.0"> <virtual_method name="GetTrackTypes" cname="get_track_types" version="1.6.0">
<return-type type="GESTrackType" /> <return-type type="GESTrackType" />
<parameters /> <parameters />
...@@ -2659,6 +2664,10 @@ ...@@ -2659,6 +2664,10 @@
<return-type type="guint64" /> <return-type type="guint64" />
<parameters /> <parameters />
</method> </method>
<method name="GetLayerPriority" cname="ges_timeline_element_get_layer_priority">
<return-type type="guint32" />
<parameters />
</method>
<method name="GetMaxDuration" cname="ges_timeline_element_get_max_duration"> <method name="GetMaxDuration" cname="ges_timeline_element_get_max_duration">
<return-type type="guint64" /> <return-type type="guint64" />
<parameters /> <parameters />
...@@ -2971,16 +2980,16 @@ ...@@ -2971,16 +2980,16 @@
<return-type type="guint32" /> <return-type type="guint32" />
<parameters /> <parameters />
</method> </method>
<method name="GetFontDesc" cname="ges_title_source_get_font_desc"> <method name="GetFontDesc" cname="ges_title_source_get_font_desc" deprecated="true" deprecated-version="1.16">
<return-type type="const-gchar*" /> <return-type type="gchar*" owned="true" />
<parameters /> <parameters />
</method> </method>
<method name="GetHalignment" cname="ges_title_source_get_halignment"> <method name="GetHalignment" cname="ges_title_source_get_halignment">
<return-type type="GESTextHAlign" /> <return-type type="GESTextHAlign" />
<parameters /> <parameters />
</method> </method>
<method name="GetText" cname="ges_title_source_get_text"> <method name="GetText" cname="ges_title_source_get_text" deprecated="true" deprecated-version="1.16">
<return-type type="const-gchar*" /> <return-type type="gchar*" owned="true" />
<parameters /> <parameters />
</method> </method>
<method name="GetTextColor" cname="ges_title_source_get_text_color"> <method name="GetTextColor" cname="ges_title_source_get_text_color">
...@@ -3227,9 +3236,9 @@ ...@@ -3227,9 +3236,9 @@
<return-type type="void" /> <return-type type="void" />
<parameters> <parameters>
<parameter name="element" type="GstElement*" /> <parameter name="element" type="GstElement*" />
<parameter allow-none="1" name="wanted_categories" type="const-gchar**" array="true" null_term_array="true" /> <parameter allow-none="1" name="wanted_categories" type="const gchar**" array="true" null_term_array="true" />
<parameter allow-none="1" name="blacklist" type="const-gchar**" array="true" null_term_array="true" /> <parameter allow-none="1" name="blacklist" type="const gchar**" array="true" null_term_array="true" />
<parameter allow-none="1" name="whitelist" type="const-gchar**" array="true" null_term_array="true" /> <parameter allow-none="1" name="whitelist" type="const gchar**" array="true" null_term_array="true" />
</parameters> </parameters>
</method> </method>
<method name="Edit" cname="ges_track_element_edit"> <method name="Edit" cname="ges_track_element_edit">
...@@ -3817,6 +3826,12 @@ ...@@ -3817,6 +3826,12 @@
<method name="Deinit" cname="ges_deinit" shared="true"> <method name="Deinit" cname="ges_deinit" shared="true">
<return-type type="void" /> <return-type type="void" />
</method> </method>
<method name="EdgeName" cname="ges_edge_name" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter name="edge" type="GESEdge" />
</parameters>
</method>
<method name="Init" cname="ges_init" shared="true"> <method name="Init" cname="ges_init" shared="true">
<return-type type="gboolean" /> <return-type type="gboolean" />
</method> </method>
...@@ -3824,7 +3839,7 @@ ...@@ -3824,7 +3839,7 @@
<return-type type="gboolean" array_index="1" /> <return-type type="gboolean" array_index="1" />
<parameters throws="1"> <parameters throws="1">
<parameter allow-none="1" name="argc" type="gint*" owned="true" pass_as="ref" array_index="1" /> <parameter allow-none="1" name="argc" type="gint*" owned="true" pass_as="ref" array_index="1" />
<parameter allow-none="1" name="argv" type="char***" owned="true" pass_as="ref" array="true" array_length_param_index="0" /> <parameter allow-none="1" name="argv" type="char****" owned="true" pass_as="ref" array="true" array_length_param_index="0" />
<parameter name="error" type="GError**" /> <parameter name="error" type="GError**" />
</parameters> </parameters>
</method> </method>
...@@ -3893,6 +3908,7 @@ ...@@ -3893,6 +3908,7 @@
<constant value="multifile://" ctype="gchar*" gtype="gchar*" name="MULTI_FILE_URI_PREFIX" /> <constant value="multifile://" ctype="gchar*" gtype="gchar*" name="MULTI_FILE_URI_PREFIX" />
<constant value="4" ctype="gint" gtype="gint" name="PADDING" /> <constant value="4" ctype="gint" gtype="gint" name="PADDING" />
<constant value="20" ctype="gint" gtype="gint" name="PADDING_LARGE" /> <constant value="20" ctype="gint" gtype="gint" name="PADDING_LARGE" />
<constant value="4294967295" ctype="guint32" gtype="guint32" name="TIMELINE_ELEMENT_NO_LAYER_PRIORITY" />
</object> </object>
</namespace> </namespace>
</api> </api>
\ No newline at end of file
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<parameter name="error" type="GError**"/> <parameter name="error" type="GError**"/>
</parameters> </parameters>
</callback> </callback>
<callback name="FormatterLoadFromURIMethod" cname="GESFormatterLoadFromURIMethod"> <callback name="FormatterLoadFromURIMethod" cname="GESFormatterLoadFromURIMethod" deprecated="true" deprecated-version="1.16">
<return-type type="gboolean"/> <return-type type="gboolean"/>
<parameters throws="1"> <parameters throws="1">
<parameter name="formatter" type="GESFormatter*"/> <parameter name="formatter" type="GESFormatter*"/>
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
<parameter name="error" type="GError**"/> <parameter name="error" type="GError**"/>
</parameters> </parameters>
</callback> </callback>
<callback name="FormatterSaveToURIMethod" cname="GESFormatterSaveToURIMethod"> <callback name="FormatterSaveToURIMethod" cname="GESFormatterSaveToURIMethod" deprecated="true" deprecated-version="1.16">
<return-type type="gboolean"/> <return-type type="gboolean"/>
<parameters throws="1"> <parameters throws="1">
<parameter name="formatter" type="GESFormatter*"/> <parameter name="formatter" type="GESFormatter*"/>
...@@ -2528,7 +2528,8 @@ ...@@ -2528,7 +2528,8 @@
<method vm="lookup_child"/> <method vm="lookup_child"/>
<method vm="get_track_types"/> <method vm="get_track_types"/>
<method vm="set_child_property"/> <method vm="set_child_property"/>
<field cname="_ges_reserved" access="private" writeable="false" readable="false" is_callback="false" name="_gesGesReserved" type="gpointer" array="true" array_len="17"/> <method vm="get_layer_priority"/>
<field cname="_ges_reserved" access="private" writeable="false" readable="false" is_callback="false" name="_gesGesReserved" type="gpointer" array="true" array_len="16"/>
</class_struct> </class_struct>
<method name="GetType" cname="ges_timeline_element_get_type" shared="true"> <method name="GetType" cname="ges_timeline_element_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
...@@ -2539,6 +2540,10 @@ ...@@ -2539,6 +2540,10 @@
<parameter name="copy" type="GESTimelineElement*"/> <parameter name="copy" type="GESTimelineElement*"/>
</parameters> </parameters>
</virtual_method> </virtual_method>
<virtual_method name="GetLayerPriority" cname="get_layer_priority">
<return-type type="guint32"/>
<parameters/>
</virtual_method>
<virtual_method name="GetTrackTypes" cname="get_track_types" version="1.6.0"> <virtual_method name="GetTrackTypes" cname="get_track_types" version="1.6.0">
<return-type type="GESTrackType"/> <return-type type="GESTrackType"/>
<parameters/> <parameters/>
...@@ -2679,6 +2684,10 @@ ...@@ -2679,6 +2684,10 @@
<return-type type="guint64"/> <return-type type="guint64"/>
<parameters/> <parameters/>
</method> </method>
<method name="GetLayerPriority" cname="ges_timeline_element_get_layer_priority">
<return-type type="guint32"/>
<parameters/>
</method>
<method name="GetMaxDuration" cname="ges_timeline_element_get_max_duration"> <method name="GetMaxDuration" cname="ges_timeline_element_get_max_duration">
<return-type type="guint64"/> <return-type type="guint64"/>
<parameters/> <parameters/>
...@@ -2991,16 +3000,16 @@ ...@@ -2991,16 +3000,16 @@
<return-type type="guint32"/> <return-type type="guint32"/>
<parameters/> <parameters/>
</method> </method>
<method name="GetFontDesc" cname="ges_title_source_get_font_desc"> <method name="GetFontDesc" cname="ges_title_source_get_font_desc" deprecated="true" deprecated-version="1.16">
<return-type type="const-gchar*"/> <return-type type="gchar*" owned="true"/>
<parameters/> <parameters/>
</method> </method>
<method name="GetHalignment" cname="ges_title_source_get_halignment"> <method name="GetHalignment" cname="ges_title_source_get_halignment">
<return-type type="GESTextHAlign"/> <return-type type="GESTextHAlign"/>
<parameters/> <parameters/>
</method> </method>
<method name="GetText" cname="ges_title_source_get_text"> <method name="GetText" cname="ges_title_source_get_text" deprecated="true" deprecated-version="1.16">
<return-type type="const-gchar*"/> <return-type type="gchar*" owned="true"/>
<parameters/> <parameters/>
</method> </method>
<method name="GetTextColor" cname="ges_title_source_get_text_color"> <method name="GetTextColor" cname="ges_title_source_get_text_color">
...@@ -3247,9 +3256,9 @@ ...@@ -3247,9 +3256,9 @@
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter name="element" type="GstElement*"/> <parameter name="element" type="GstElement*"/>
<parameter allow-none="1" name="wanted_categories" type="const-gchar**" array="true" null_term_array="true"/> <parameter allow-none="1" name="wanted_categories" type="const gchar**" array="true" null_term_array="true"/>
<parameter allow-none="1" name="blacklist" type="const-gchar**" array="true" null_term_array="true"/> <parameter allow-none="1" name="blacklist" type="const gchar**" array="true" null_term_array="true"/>
<parameter allow-none="1" name="whitelist" type="const-gchar**" array="true" null_term_array="true"/> <parameter allow-none="1" name="whitelist" type="const gchar**" array="true" null_term_array="true"/>
</parameters> </parameters>
</method> </method>
<method name="Edit" cname="ges_track_element_edit"> <method name="Edit" cname="ges_track_element_edit">
...@@ -3841,6 +3850,12 @@ ...@@ -3841,6 +3850,12 @@
<method name="Deinit" cname="ges_deinit" shared="true"> <method name="Deinit" cname="ges_deinit" shared="true">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
<method name="EdgeName" cname="ges_edge_name" shared="true">
<return-type type="const-gchar*"/>
<parameters>
<parameter name="edge" type="GESEdge"/>
</parameters>
</method>
<method name="Init" cname="ges_init" shared="true"> <method name="Init" cname="ges_init" shared="true">
<return-type type="gboolean"/> <return-type type="gboolean"/>
</method> </method>
...@@ -3848,7 +3863,7 @@ ...@@ -3848,7 +3863,7 @@
<return-type type="gboolean" array_index="1"/> <return-type type="gboolean" array_index="1"/>
<parameters throws="1"> <parameters throws="1">
<parameter allow-none="1" name="argc" type="gint*" owned="true" pass_as="ref" array_index="1"/> <parameter allow-none="1" name="argc" type="gint*" owned="true" pass_as="ref" array_index="1"/>
<parameter allow-none="1" name="argv" type="char***" owned="true" pass_as="ref" array="true" array_length_param_index="0"/> <parameter allow-none="1" name="argv" type="char****" owned="true" pass_as="ref" array="true" array_length_param_index="0"/>
<parameter name="error" type="GError**"/> <parameter name="error" type="GError**"/>
</parameters> </parameters>
</method> </method>
...@@ -3917,6 +3932,7 @@ ...@@ -3917,6 +3932,7 @@
<constant value="multifile://" ctype="gchar*" gtype="gchar*" name="MULTI_FILE_URI_PREFIX"/> <constant value="multifile://" ctype="gchar*" gtype="gchar*" name="MULTI_FILE_URI_PREFIX"/>
<constant value="4" ctype="gint" gtype="gint" name="PADDING"/> <constant value="4" ctype="gint" gtype="gint" name="PADDING"/>
<constant value="20" ctype="gint" gtype="gint" name="PADDING_LARGE"/> <constant value="20" ctype="gint" gtype="gint" name="PADDING_LARGE"/>
<constant value="4294967295" ctype="guint32" gtype="guint32" name="TIMELINE_ELEMENT_NO_LAYER_PRIORITY"/>
</object> </object>
</namespace> </namespace>
</api> </api>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -214,7 +214,7 @@ MT safe. Caller owns return value (gst_net_time_packet_free to free).</doc> ...@@ -214,7 +214,7 @@ MT safe. Caller owns return value (gst_net_time_packet_free to free).</doc>
<parameters> <parameters>
<parameter name="buffer" transfer-ownership="none"> <parameter name="buffer" transfer-ownership="none">
<doc xml:space="preserve">a buffer from which to construct the packet, or NULL</doc> <doc xml:space="preserve">a buffer from which to construct the packet, or NULL</doc>
<array zero-terminated="0" c:type="guint8*"> <array zero-terminated="0" c:type="const guint8*">
<type name="guint8" c:type="guint8"/> <type name="guint8" c:type="guint8"/>
</array> </array>
</parameter> </parameter>
......
This diff is collapsed.
...@@ -398,7 +398,7 @@ extension.</doc> ...@@ -398,7 +398,7 @@ extension.</doc>
</instance-parameter> </instance-parameter>
<parameter name="data" transfer-ownership="none"> <parameter name="data" transfer-ownership="none">
<doc xml:space="preserve">profile-specific data</doc> <doc xml:space="preserve">profile-specific data</doc>
<array length="1" zero-terminated="0" c:type="guint8*"> <array length="1" zero-terminated="0" c:type="const guint8*">
<type name="guint8" c:type="guint8"/> <type name="guint8" c:type="guint8"/>
</array> </array>
</parameter> </parameter>
...@@ -1154,7 +1154,7 @@ reached.</doc> ...@@ -1154,7 +1154,7 @@ reached.</doc>
</parameter> </parameter>
<parameter name="data" transfer-ownership="none"> <parameter name="data" transfer-ownership="none">
<doc xml:space="preserve">the data</doc> <doc xml:space="preserve">the data</doc>
<array length="1" zero-terminated="0" c:type="guint8*"> <array length="1" zero-terminated="0" c:type="const guint8*">
<type name="guint8" c:type="guint8"/> <type name="guint8" c:type="guint8"/>
</array> </array>
</parameter> </parameter>
...@@ -2341,7 +2341,7 @@ the buffer downstream.</doc> ...@@ -2341,7 +2341,7 @@ the buffer downstream.</doc>
</instance-parameter> </instance-parameter>
<parameter name="data" transfer-ownership="none"> <parameter name="data" transfer-ownership="none">
<doc xml:space="preserve">data to set as payload</doc> <doc xml:space="preserve">data to set as payload</doc>
<array length="1" zero-terminated="0" c:type="guint8*"> <array length="1" zero-terminated="0" c:type="const guint8*">
<type name="guint8" c:type="guint8"/> <type name="guint8" c:type="guint8"/>
</array> </array>
</parameter> </parameter>
...@@ -3092,6 +3092,14 @@ Variable arguments should be in the form field name, field type ...@@ -3092,6 +3092,14 @@ Variable arguments should be in the form field name, field type
<property name="mtu" writable="1" transfer-ownership="none"> <property name="mtu" writable="1" transfer-ownership="none">
<type name="guint" c:type="guint"/> <type name="guint" c:type="guint"/>
</property> </property>
<property name="onvif-no-rate-control"
version="1.16"
writable="1"
transfer-ownership="none">
<doc xml:space="preserve">Make the payloader timestamp packets according to the Rate-Control=no
behaviour specified in the ONVIF replay spec.</doc>
<type name="gboolean" c:type="gboolean"/>
</property>
<property name="perfect-rtptime" writable="1" transfer-ownership="none"> <property name="perfect-rtptime" writable="1" transfer-ownership="none">
<doc xml:space="preserve">Try to use the offset fields to generate perfect RTP timestamps. When this <doc xml:space="preserve"