mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 05:56:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

pad: actually return data.ret

Browse source 
The return value from gst_pad_forward() is the aggregated return value from the callback and the callback returns FALSE to continue iterating.
This commit is contained in:
Stefan Sauer 2014-03-16 11:05:56 +01:00
parent d57bc8b5dc
commit 29bae0bc72
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/gstutils.c
View file

@ -2449,7 +2449,6 @@ gboolean
gst_pad_proxy_query_accept_caps (GstPad * pad, GstQuery * query) gst_pad_proxy_query_accept_caps (GstPad * pad, GstQuery * query)
{ {
QueryAcceptCapsData data; QueryAcceptCapsData data;
gboolean result;
g_return_val_if_fail (GST_IS_PAD (pad), FALSE); g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
g_return_val_if_fail (GST_IS_QUERY (query), FALSE); g_return_val_if_fail (GST_IS_QUERY (query), FALSE);
@ -2460,16 +2459,16 @@ gst_pad_proxy_query_accept_caps (GstPad * pad, GstQuery * query)
data.query = query; data.query = query;
/* value to hold the return, by default it holds TRUE */ /* value to hold the return, by default it holds TRUE */
/* FIXME: TRUE is wrong when there are no pads */
data.ret = TRUE; data.ret = TRUE;
result = gst_pad_forward (pad, (GstPadForwardFunction) query_accept_caps_func, gst_pad_forward (pad, (GstPadForwardFunction) query_accept_caps_func, &data);
&data);
gst_query_set_accept_caps_result (query, data.ret); gst_query_set_accept_caps_result (query, data.ret);
GST_CAT_DEBUG_OBJECT (GST_CAT_PADS, pad, "proxying accept caps query: %d", GST_CAT_DEBUG_OBJECT (GST_CAT_PADS, pad, "proxying accept caps query: %d",
result); data.ret);
return result; return data.ret;
} }
typedef struct typedef struct
@ -2543,6 +2542,7 @@ gst_pad_proxy_query_caps (GstPad * pad, GstQuery * query)
gst_query_set_caps_result (query, result); gst_query_set_caps_result (query, result);
gst_caps_unref (result); gst_caps_unref (result);
/* FIXME: return something depending on the processing */
return TRUE; return TRUE;
} }