From: Wim Taymans Date: Wed, 16 Nov 2011 11:36:51 +0000 (+0100) Subject: GstPadFlags: rename flags GST_PAD_* -> GST_PAD_FLAG_* X-Git-Tag: RELEASE-0.11.2~428 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54e1174060668ca3f8e332607eed5f7a67644299;p=platform%2Fupstream%2Fgstreamer.git GstPadFlags: rename flags GST_PAD_* -> GST_PAD_FLAG_* --- diff --git a/docs/random/porting-to-0.11.txt b/docs/random/porting-to-0.11.txt index 5556237..acd2d92 100644 --- a/docs/random/porting-to-0.11.txt +++ b/docs/random/porting-to-0.11.txt @@ -146,6 +146,7 @@ The 0.11 porting guide gst_pad_peer_accept_caps() -> gst_pad_peer_query_accept_caps() gst_pad_query_peer_*() -> gst_pad_peer_query_*() + GstPadFlags: GST_PAD_* -> GST_PAD_FLAG_* * GstPadTemplate gst_pad_template_get_caps() returns a new reference of the caps diff --git a/gst/gstdebugutils.c b/gst/gstdebugutils.c index 2a8c54f..6473b8c 100644 --- a/gst/gstdebugutils.c +++ b/gst/gstdebugutils.c @@ -165,9 +165,12 @@ debug_dump_pad (GstPad * pad, const gchar * color_name, const gchar *activation_mode = "-><"; /* check if pad flags */ - pad_flags[0] = GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_BLOCKED) ? 'B' : 'b'; - pad_flags[1] = GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLUSHING) ? 'F' : 'f'; - pad_flags[2] = GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_BLOCKING) ? 'B' : 'b'; + pad_flags[0] = + GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_BLOCKED) ? 'B' : 'b'; + pad_flags[1] = + GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_FLUSHING) ? 'F' : 'f'; + pad_flags[2] = + GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_BLOCKING) ? 'B' : 'b'; pad_flags[3] = '\0'; fprintf (out, diff --git a/gst/gstelement.c b/gst/gstelement.c index 6d7989f..885d56b 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -706,7 +706,7 @@ gst_element_add_pad (GstElement * element, GstPad * pad) GST_CAT_INFO_OBJECT (GST_CAT_ELEMENT_PADS, element, "adding pad '%s'", GST_STR_NULL (pad_name)); flushing = GST_PAD_IS_FLUSHING (pad); - GST_OBJECT_FLAG_SET (pad, GST_PAD_NEED_PARENT); + GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_NEED_PARENT); GST_OBJECT_UNLOCK (pad); /* then check to see if there's already a pad by that name here */ diff --git a/gst/gstpad.c b/gst/gstpad.c index d63385e..76fab43 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -409,7 +409,7 @@ prepare_event_update (GstPad * srcpad, GstPad * sinkpad) /* we had some new pending events, set our flag */ if (pending) - GST_OBJECT_FLAG_SET (sinkpad, GST_PAD_NEED_EVENTS); + GST_OBJECT_FLAG_SET (sinkpad, GST_PAD_FLAG_NEED_EVENTS); } /* should be called with the OBJECT_LOCK */ @@ -748,7 +748,7 @@ gst_pad_set_active (GstPad * pad, gboolean active) } else { if (!active) { GST_OBJECT_LOCK (pad); - GST_OBJECT_FLAG_UNSET (pad, GST_PAD_NEED_RECONFIGURE); + GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_NEED_RECONFIGURE); GST_OBJECT_UNLOCK (pad); } } @@ -1093,7 +1093,7 @@ gst_pad_add_probe (GstPad * pad, GstPadProbeType mask, if (mask & GST_PAD_PROBE_TYPE_BLOCKING) { /* we have a block probe */ pad->num_blocked++; - GST_OBJECT_FLAG_SET (pad, GST_PAD_BLOCKED); + GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_BLOCKED); GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad, "added blocking probe, " "now %d blocking probes", pad->num_blocked); } @@ -1137,7 +1137,7 @@ cleanup_hook (GstPad * pad, GHook * hook) pad->num_blocked); if (pad->num_blocked == 0) { GST_DEBUG_OBJECT (pad, "last blocking probe removed, unblocking"); - GST_OBJECT_FLAG_UNSET (pad, GST_PAD_BLOCKED); + GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_BLOCKED); GST_PAD_BLOCK_BROADCAST (pad); } } @@ -1202,7 +1202,7 @@ gst_pad_is_blocked (GstPad * pad) g_return_val_if_fail (GST_IS_PAD (pad), result); GST_OBJECT_LOCK (pad); - result = GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_BLOCKED); + result = GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_BLOCKED); GST_OBJECT_UNLOCK (pad); return result; @@ -1230,8 +1230,7 @@ gst_pad_is_blocking (GstPad * pad) GST_OBJECT_LOCK (pad); /* the blocking flag is only valid if the pad is not flushing */ - result = GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_BLOCKING) && - !GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLUSHING); + result = GST_PAD_IS_BLOCKING (pad) && !GST_PAD_IS_FLUSHING (pad); GST_OBJECT_UNLOCK (pad); return result; @@ -1241,10 +1240,10 @@ gst_pad_is_blocking (GstPad * pad) * gst_pad_check_reconfigure: * @pad: the #GstPad to check * - * Check and clear the #GST_PAD_NEED_RECONFIGURE flag on @pad and return %TRUE + * Check and clear the #GST_PAD_FLAG_NEED_RECONFIGURE flag on @pad and return %TRUE * if the flag was set. * - * Returns: %TRUE is the GST_PAD_NEED_RECONFIGURE flag was set on @pad. + * Returns: %TRUE is the GST_PAD_FLAG_NEED_RECONFIGURE flag was set on @pad. */ gboolean gst_pad_check_reconfigure (GstPad * pad) @@ -1255,7 +1254,7 @@ gst_pad_check_reconfigure (GstPad * pad) GST_OBJECT_LOCK (pad); reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad); - GST_OBJECT_FLAG_UNSET (pad, GST_PAD_NEED_RECONFIGURE); + GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_NEED_RECONFIGURE); GST_OBJECT_UNLOCK (pad); return reconfigure; @@ -1274,7 +1273,7 @@ gst_pad_mark_reconfigure (GstPad * pad) g_return_if_fail (GST_IS_PAD (pad)); GST_OBJECT_LOCK (pad); - GST_OBJECT_FLAG_SET (pad, GST_PAD_NEED_RECONFIGURE); + GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_NEED_RECONFIGURE); GST_OBJECT_UNLOCK (pad); } @@ -3014,9 +3013,9 @@ again: * the pad after setting the FLUSHING flag. */ GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad, "Waiting to be unblocked or set flushing"); - GST_OBJECT_FLAG_SET (pad, GST_PAD_BLOCKING); + GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_BLOCKING); GST_PAD_BLOCK_WAIT (pad); - GST_OBJECT_FLAG_UNSET (pad, GST_PAD_BLOCKING); + GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_BLOCKING); GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad, "We got unblocked"); if (G_UNLIKELY (GST_PAD_IS_FLUSHING (pad))) @@ -3125,7 +3124,7 @@ gst_pad_set_offset (GstPad * pad, gint64 offset) /* take the current segment event, adjust it and then place * it on the sinkpad. events on the srcpad are always active. */ if (replace_event (pad, peer, idx)) - GST_OBJECT_FLAG_SET (peer, GST_PAD_NEED_EVENTS); + GST_OBJECT_FLAG_SET (peer, GST_PAD_FLAG_NEED_EVENTS); GST_OBJECT_UNLOCK (peer); @@ -3324,7 +3323,7 @@ gst_pad_chain_data_unchecked (GstPad * pad, GstPadProbeType type, void *data) needs_events = GST_PAD_NEEDS_EVENTS (pad); if (G_UNLIKELY (needs_events)) { - GST_OBJECT_FLAG_UNSET (pad, GST_PAD_NEED_EVENTS); + GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_NEED_EVENTS); GST_DEBUG_OBJECT (pad, "need to update all events"); ret = gst_pad_update_events (pad); @@ -3870,7 +3869,7 @@ probed_data: needs_events = GST_PAD_NEEDS_EVENTS (pad); if (G_UNLIKELY (needs_events)) { - GST_OBJECT_FLAG_UNSET (pad, GST_PAD_NEED_EVENTS); + GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_NEED_EVENTS); GST_DEBUG_OBJECT (pad, "we need to update the events"); ret = gst_pad_update_events (pad); @@ -4055,7 +4054,7 @@ gst_pad_push_event (GstPad * pad, GstEvent * event) } case GST_EVENT_RECONFIGURE: if (GST_PAD_IS_SINK (pad)) - GST_OBJECT_FLAG_SET (pad, GST_PAD_NEED_RECONFIGURE); + GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_NEED_RECONFIGURE); break; default: break; @@ -4218,7 +4217,7 @@ gst_pad_send_event (GstPad * pad, GstEvent * event) break; case GST_EVENT_RECONFIGURE: if (GST_PAD_IS_SRC (pad)) - GST_OBJECT_FLAG_SET (pad, GST_PAD_NEED_RECONFIGURE); + GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_NEED_RECONFIGURE); default: GST_CAT_DEBUG_OBJECT (GST_CAT_EVENT, pad, "have event type %s", GST_EVENT_TYPE_NAME (event)); @@ -4270,7 +4269,7 @@ gst_pad_send_event (GstPad * pad, GstEvent * event) gst_event_replace (&ev->pending, event); /* set the flag so that we update the events next time. We would * usually update below but we might be flushing too. */ - GST_OBJECT_FLAG_SET (pad, GST_PAD_NEED_EVENTS); + GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_NEED_EVENTS); needs_events = TRUE; } } @@ -4287,7 +4286,7 @@ gst_pad_send_event (GstPad * pad, GstEvent * event) if (G_UNLIKELY (needs_events)) { GstFlowReturn ret; - GST_OBJECT_FLAG_UNSET (pad, GST_PAD_NEED_EVENTS); + GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_NEED_EVENTS); GST_DEBUG_OBJECT (pad, "need to update all events"); ret = gst_pad_update_events (pad); diff --git a/gst/gstpad.h b/gst/gstpad.h index f7050de..a8bdad1 100644 --- a/gst/gstpad.h +++ b/gst/gstpad.h @@ -544,35 +544,35 @@ typedef GstFlowReturn (*GstPadStickyEventsForeachFunction) (GstPad *pad, GstEve /** * GstPadFlags: - * @GST_PAD_BLOCKED: is dataflow on a pad blocked - * @GST_PAD_FLUSHING: is pad refusing buffers - * @GST_PAD_BLOCKING: is pad currently blocking on a buffer or event - * @GST_PAD_NEED_RECONFIGURE: the pad should be reconfigured/renegotiated. + * @GST_PAD_FLAG_BLOCKED: is dataflow on a pad blocked + * @GST_PAD_FLAG_FLUSHING: is pad refusing buffers + * @GST_PAD_FLAG_BLOCKING: is pad currently blocking on a buffer or event + * @GST_PAD_FLAG_NEED_RECONFIGURE: the pad should be reconfigured/renegotiated. * The flag has to be unset manually after * reconfiguration happened. * Since: 0.10.34. - * @GST_PAD_NEED_EVENTS: the pad has pending events - * @GST_PAD_FIXED_CAPS: the pad is using fixed caps this means that once the + * @GST_PAD_FLAG_NEED_EVENTS: the pad has pending events + * @GST_PAD_FLAG_FIXED_CAPS: the pad is using fixed caps this means that once the * caps are set on the pad, the caps query function only * returns those caps. - * @GST_PAD_PROXY_CAPS: the default event and query handler will forward + * @GST_PAD_FLAG_PROXY_CAPS: the default event and query handler will forward * all events and queries to the internally linked pads * instead of discarding them. - * @GST_PAD_NEED_PARENT: ensure that there is a parent object before calling + * @GST_PAD_FLAG_NEED_PARENT: ensure that there is a parent object before calling * into the pad callbacks. * @GST_PAD_FLAG_LAST: offset to define more flags * * Pad state flags */ typedef enum { - GST_PAD_BLOCKED = (GST_OBJECT_FLAG_LAST << 0), - GST_PAD_FLUSHING = (GST_OBJECT_FLAG_LAST << 1), - GST_PAD_BLOCKING = (GST_OBJECT_FLAG_LAST << 2), - GST_PAD_NEED_RECONFIGURE = (GST_OBJECT_FLAG_LAST << 3), - GST_PAD_NEED_EVENTS = (GST_OBJECT_FLAG_LAST << 4), - GST_PAD_FIXED_CAPS = (GST_OBJECT_FLAG_LAST << 5), - GST_PAD_PROXY_CAPS = (GST_OBJECT_FLAG_LAST << 6), - GST_PAD_NEED_PARENT = (GST_OBJECT_FLAG_LAST << 7), + GST_PAD_FLAG_BLOCKED = (GST_OBJECT_FLAG_LAST << 0), + GST_PAD_FLAG_FLUSHING = (GST_OBJECT_FLAG_LAST << 1), + GST_PAD_FLAG_BLOCKING = (GST_OBJECT_FLAG_LAST << 2), + GST_PAD_FLAG_NEED_RECONFIGURE = (GST_OBJECT_FLAG_LAST << 3), + GST_PAD_FLAG_NEED_EVENTS = (GST_OBJECT_FLAG_LAST << 4), + GST_PAD_FLAG_FIXED_CAPS = (GST_OBJECT_FLAG_LAST << 5), + GST_PAD_FLAG_PROXY_CAPS = (GST_OBJECT_FLAG_LAST << 6), + GST_PAD_FLAG_NEED_PARENT = (GST_OBJECT_FLAG_LAST << 7), /* padding */ GST_PAD_FLAG_LAST = (GST_OBJECT_FLAG_LAST << 16) } GstPadFlags; @@ -703,21 +703,21 @@ struct _GstPadClass { #define GST_PAD_IS_ACTIVE(pad) (GST_PAD_ACTIVATE_MODE(pad) != GST_PAD_ACTIVATE_NONE) -#define GST_PAD_IS_BLOCKED(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_BLOCKED)) -#define GST_PAD_IS_BLOCKING(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_BLOCKING)) +#define GST_PAD_IS_BLOCKED(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_BLOCKED)) +#define GST_PAD_IS_BLOCKING(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_BLOCKING)) -#define GST_PAD_IS_FLUSHING(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLUSHING)) -#define GST_PAD_SET_FLUSHING(pad) (GST_OBJECT_FLAG_SET (pad, GST_PAD_FLUSHING)) -#define GST_PAD_UNSET_FLUSHING(pad) (GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLUSHING)) +#define GST_PAD_IS_FLUSHING(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_FLUSHING)) +#define GST_PAD_SET_FLUSHING(pad) (GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_FLUSHING)) +#define GST_PAD_UNSET_FLUSHING(pad) (GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_FLUSHING)) -#define GST_PAD_NEEDS_RECONFIGURE(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_NEED_RECONFIGURE)) -#define GST_PAD_NEEDS_EVENTS(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_NEED_EVENTS)) -#define GST_PAD_IS_FIXED_CAPS(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FIXED_CAPS)) -#define GST_PAD_NEEDS_PARENT(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_NEED_PARENT)) +#define GST_PAD_NEEDS_RECONFIGURE(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_NEED_RECONFIGURE)) +#define GST_PAD_NEEDS_EVENTS(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_NEED_EVENTS)) +#define GST_PAD_IS_FIXED_CAPS(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_FIXED_CAPS)) +#define GST_PAD_NEEDS_PARENT(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_NEED_PARENT)) -#define GST_PAD_IS_PROXY_CAPS(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_PROXY_CAPS)) -#define GST_PAD_SET_PROXY_CAPS(pad) (GST_OBJECT_FLAG_SET (pad, GST_PAD_PROXY_CAPS)) -#define GST_PAD_UNSET_PROXY_CAPS(pad) (GST_OBJECT_FLAG_UNSET (pad, GST_PAD_PROXY_CAPS)) +#define GST_PAD_IS_PROXY_CAPS(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_PROXY_CAPS)) +#define GST_PAD_SET_PROXY_CAPS(pad) (GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PROXY_CAPS)) +#define GST_PAD_UNSET_PROXY_CAPS(pad) (GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_PROXY_CAPS)) /** * GST_PAD_GET_STREAM_LOCK: diff --git a/gst/gstutils.c b/gst/gstutils.c index 2379a85..06e92a9 100644 --- a/gst/gstutils.c +++ b/gst/gstutils.c @@ -2394,7 +2394,7 @@ gst_element_seek_simple (GstElement * element, GstFormat format, void gst_pad_use_fixed_caps (GstPad * pad) { - GST_OBJECT_FLAG_SET (pad, GST_PAD_FIXED_CAPS); + GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_FIXED_CAPS); } /** diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c index c195805..9ff590e 100644 --- a/libs/gst/base/gstbasetransform.c +++ b/libs/gst/base/gstbasetransform.c @@ -1227,7 +1227,7 @@ gst_base_transform_setcaps (GstBaseTransform * trans, GstPad * pad, goto failed_configure; GST_OBJECT_LOCK (trans->sinkpad); - GST_OBJECT_FLAG_UNSET (trans->srcpad, GST_PAD_NEED_RECONFIGURE); + GST_OBJECT_FLAG_UNSET (trans->srcpad, GST_PAD_FLAG_NEED_RECONFIGURE); trans->priv->reconfigure = FALSE; GST_OBJECT_UNLOCK (trans->sinkpad); @@ -1726,7 +1726,7 @@ gst_base_transform_handle_buffer (GstBaseTransform * trans, GstBuffer * inbuf, GST_OBJECT_LOCK (trans->sinkpad); reconfigure = GST_PAD_NEEDS_RECONFIGURE (trans->srcpad) || trans->priv->reconfigure; - GST_OBJECT_FLAG_UNSET (trans->srcpad, GST_PAD_NEED_RECONFIGURE); + GST_OBJECT_FLAG_UNSET (trans->srcpad, GST_PAD_FLAG_NEED_RECONFIGURE); trans->priv->reconfigure = FALSE; GST_OBJECT_UNLOCK (trans->sinkpad); diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c index a20c15e..81a7c86 100644 --- a/plugins/elements/gstinputselector.c +++ b/plugins/elements/gstinputselector.c @@ -872,7 +872,7 @@ gst_input_selector_init (GstInputSelector * sel) GST_DEBUG_FUNCPTR (gst_input_selector_query)); gst_pad_set_event_function (sel->srcpad, GST_DEBUG_FUNCPTR (gst_input_selector_event)); - GST_OBJECT_FLAG_SET (sel->srcpad, GST_PAD_PROXY_CAPS); + GST_OBJECT_FLAG_SET (sel->srcpad, GST_PAD_FLAG_PROXY_CAPS); gst_element_add_pad (GST_ELEMENT (sel), sel->srcpad); /* sinkpad management */ sel->active_sinkpad = NULL; @@ -1219,7 +1219,7 @@ gst_input_selector_request_new_pad (GstElement * element, gst_pad_set_iterate_internal_links_function (sinkpad, GST_DEBUG_FUNCPTR (gst_selector_pad_iterate_linked_pads)); - GST_OBJECT_FLAG_SET (sinkpad, GST_PAD_PROXY_CAPS); + GST_OBJECT_FLAG_SET (sinkpad, GST_PAD_FLAG_PROXY_CAPS); gst_pad_set_active (sinkpad, TRUE); gst_element_add_pad (GST_ELEMENT (sel), sinkpad); GST_INPUT_SELECTOR_UNLOCK (sel); diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c index 096f72a..bb52771 100644 --- a/plugins/elements/gstmultiqueue.c +++ b/plugins/elements/gstmultiqueue.c @@ -1907,7 +1907,7 @@ gst_single_queue_new (GstMultiQueue * mqueue, guint id) GST_DEBUG_FUNCPTR (gst_multi_queue_sink_query)); gst_pad_set_iterate_internal_links_function (sq->sinkpad, GST_DEBUG_FUNCPTR (gst_multi_queue_iterate_internal_links)); - GST_OBJECT_FLAG_SET (sq->sinkpad, GST_PAD_PROXY_CAPS); + GST_OBJECT_FLAG_SET (sq->sinkpad, GST_PAD_FLAG_PROXY_CAPS); name = g_strdup_printf ("src_%u", sq->id); sq->srcpad = gst_pad_new_from_static_template (&srctemplate, name); @@ -1921,7 +1921,7 @@ gst_single_queue_new (GstMultiQueue * mqueue, guint id) GST_DEBUG_FUNCPTR (gst_multi_queue_src_query)); gst_pad_set_iterate_internal_links_function (sq->srcpad, GST_DEBUG_FUNCPTR (gst_multi_queue_iterate_internal_links)); - GST_OBJECT_FLAG_SET (sq->srcpad, GST_PAD_PROXY_CAPS); + GST_OBJECT_FLAG_SET (sq->srcpad, GST_PAD_FLAG_PROXY_CAPS); gst_pad_set_element_private (sq->sinkpad, (gpointer) sq); gst_pad_set_element_private (sq->srcpad, (gpointer) sq); diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c index 1ecd308..424f1c5 100644 --- a/plugins/elements/gstqueue2.c +++ b/plugins/elements/gstqueue2.c @@ -379,7 +379,7 @@ gst_queue2_init (GstQueue2 * queue) GST_DEBUG_FUNCPTR (gst_queue2_handle_sink_event)); gst_pad_set_query_function (queue->sinkpad, GST_DEBUG_FUNCPTR (gst_queue2_handle_sink_query)); - GST_OBJECT_FLAG_SET (queue->sinkpad, GST_PAD_PROXY_CAPS); + GST_OBJECT_FLAG_SET (queue->sinkpad, GST_PAD_FLAG_PROXY_CAPS); gst_element_add_pad (GST_ELEMENT (queue), queue->sinkpad); queue->srcpad = gst_pad_new_from_static_template (&srctemplate, "src"); @@ -394,7 +394,7 @@ gst_queue2_init (GstQueue2 * queue) GST_DEBUG_FUNCPTR (gst_queue2_handle_src_event)); gst_pad_set_query_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue2_handle_src_query)); - GST_OBJECT_FLAG_SET (queue->srcpad, GST_PAD_PROXY_CAPS); + GST_OBJECT_FLAG_SET (queue->srcpad, GST_PAD_FLAG_PROXY_CAPS); gst_element_add_pad (GST_ELEMENT (queue), queue->srcpad); /* levels */ diff --git a/plugins/elements/gsttee.c b/plugins/elements/gsttee.c index bf7be80..20bf142 100644 --- a/plugins/elements/gsttee.c +++ b/plugins/elements/gsttee.c @@ -256,7 +256,7 @@ gst_tee_init (GstTee * tee) gst_pad_set_chain_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_tee_chain)); gst_pad_set_chain_list_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_tee_chain_list)); - GST_OBJECT_FLAG_SET (tee->sinkpad, GST_PAD_PROXY_CAPS); + GST_OBJECT_FLAG_SET (tee->sinkpad, GST_PAD_FLAG_PROXY_CAPS); gst_element_add_pad (GST_ELEMENT (tee), tee->sinkpad); tee->last_message = NULL; @@ -337,7 +337,7 @@ gst_tee_request_new_pad (GstElement * element, GstPadTemplate * templ, GST_DEBUG_FUNCPTR (gst_tee_src_get_range)); /* Forward sticky events to the new srcpad */ gst_pad_sticky_events_foreach (tee->sinkpad, forward_sticky_events, srcpad); - GST_OBJECT_FLAG_SET (srcpad, GST_PAD_PROXY_CAPS); + GST_OBJECT_FLAG_SET (srcpad, GST_PAD_FLAG_PROXY_CAPS); gst_element_add_pad (GST_ELEMENT_CAST (tee), srcpad); return srcpad;