FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

srt: Fix GClosure usage

Browse Source 
One needs to set a marshaller as well as use the object setter when
setting objects.
This commit is contained in:
Olivier Crête 2019-01-22 14:33:32 -05:00 committed by Olivier Crête
parent c68fe0b365
commit 5fee3a87c1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/srt/gstsrtobject.c
View File

@ -96,7 +96,7 @@ srt_caller_invoke_removed_closure (SRTCaller * caller, GstSRTObject * srtobject)
g_value_set_int (&values[0], caller->sock); g_value_set_int (&values[0], caller->sock);
g_value_init (&values[1], G_TYPE_SOCKET_ADDRESS); g_value_init (&values[1], G_TYPE_SOCKET_ADDRESS);
g_value_set_pointer (&values[1], caller->sockaddr); g_value_set_object (&values[1], caller->sockaddr);
g_closure_invoke (srtobject->caller_removed_closure, NULL, 2, values, NULL); g_closure_invoke (srtobject->caller_removed_closure, NULL, 2, values, NULL);
@ -657,15 +657,17 @@ idle_listen_source_cb (gpointer data)
/* notifying caller-added */ /* notifying caller-added */
if (srtobject->caller_added_closure != NULL) { if (srtobject->caller_added_closure != NULL) {
GValue values[2] = { G_VALUE_INIT }; GValue values[2] = { G_VALUE_INIT, G_VALUE_INIT };
g_value_init (&values[0], G_TYPE_INT); g_value_init (&values[0], G_TYPE_INT);
g_value_set_int (&values[0], caller->sock); g_value_set_int (&values[0], caller->sock);
g_value_init (&values[1], G_TYPE_SOCKET_ADDRESS); g_value_init (&values[1], G_TYPE_SOCKET_ADDRESS);
g_value_set_pointer (&values[1], caller->sockaddr); g_value_set_object (&values[1], caller->sockaddr);
g_closure_invoke (srtobject->caller_added_closure, NULL, 2, values, NULL); g_closure_invoke (srtobject->caller_added_closure, NULL, 2, values, NULL);
g_value_unset (&values[1]);
} }
GST_DEBUG_OBJECT (srtobject->element, "Accept to connect"); GST_DEBUG_OBJECT (srtobject->element, "Accept to connect");
@ -938,11 +940,15 @@ gst_srt_object_open_full (GstSRTObject * srtobject,
if (caller_added_func != NULL) { if (caller_added_func != NULL) {
srtobject->caller_added_closure = srtobject->caller_added_closure =
g_cclosure_new (G_CALLBACK (caller_added_func), srtobject, NULL); g_cclosure_new (G_CALLBACK (caller_added_func), srtobject, NULL);
g_closure_set_marshal (srtobject->caller_added_closure,
g_cclosure_marshal_generic);
} }
if (caller_removed_func != NULL) { if (caller_removed_func != NULL) {
srtobject->caller_removed_closure = srtobject->caller_removed_closure =
g_cclosure_new (G_CALLBACK (caller_removed_func), srtobject, NULL); g_cclosure_new (G_CALLBACK (caller_removed_func), srtobject, NULL);
g_closure_set_marshal (srtobject->caller_removed_closure,
g_cclosure_marshal_generic);
} }
addr_str = gst_uri_get_host (srtobject->uri); addr_str = gst_uri_get_host (srtobject->uri);