From a2ce51984c5ceef49b6f043586246bc4c92ca160 Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Sun, 17 Sep 2017 12:37:03 -0700 Subject: [PATCH] aggregator: register func for do_events_and_queries This fixes logging the func ptr from _iterate_sinkpads(). --- gst-libs/gst/base/gstaggregator.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/base/gstaggregator.c b/gst-libs/gst/base/gstaggregator.c index f972a9d46f..2bad1a10f4 100644 --- a/gst-libs/gst/base/gstaggregator.c +++ b/gst-libs/gst/base/gstaggregator.c @@ -750,8 +750,8 @@ gst_aggregator_wait_and_check (GstAggregator * self, gboolean * timeout) } static gboolean -do_events_and_queries (GstAggregator * self, GstAggregatorPad * pad, - gpointer user_data) +gst_aggregator_do_events_and_queries (GstAggregator * self, + GstAggregatorPad * pad, gpointer user_data) { GstEvent *event = NULL; GstQuery *query = NULL; @@ -1096,12 +1096,13 @@ gst_aggregator_aggregate_func (GstAggregator * self) GstFlowReturn flow_return = GST_FLOW_OK; gboolean processed_event = FALSE; - gst_aggregator_iterate_sinkpads (self, do_events_and_queries, NULL); + gst_aggregator_iterate_sinkpads (self, gst_aggregator_do_events_and_queries, + NULL); if (!gst_aggregator_wait_and_check (self, &timeout)) continue; - gst_aggregator_iterate_sinkpads (self, do_events_and_queries, + gst_aggregator_iterate_sinkpads (self, gst_aggregator_do_events_and_queries, &processed_event); if (processed_event) continue; @@ -2361,6 +2362,7 @@ gst_aggregator_class_init (GstAggregatorClass * klass) DEFAULT_START_TIME, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); GST_DEBUG_REGISTER_FUNCPTR (gst_aggregator_stop_pad); + GST_DEBUG_REGISTER_FUNCPTR (gst_aggregator_do_events_and_queries); } static void -- 2.34.1