mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

audiovisualizer: ensure default query/event handlers are used

Browse source 
Sync audiovisualizer class implementation to the one in gst-plugins-base. This
commit matches 9dd0e6cccc in that module.

https://bugzilla.gnome.org/show_bug.cgi?id=742875
This commit is contained in:
Luis de Bethencourt 2015-01-21 15:06:21 +00:00
parent a657ba9f3b
commit 6431de3286
1 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst/audiovisualizers/gstaudiovisualizer.c
View file

@ -81,8 +81,6 @@ static gboolean gst_audio_visualizer_sink_event (GstPad * pad,
static gboolean gst_audio_visualizer_src_query (GstPad * pad, static gboolean gst_audio_visualizer_src_query (GstPad * pad,
GstObject * parent, GstQuery * query); GstObject * parent, GstQuery * query);
static gboolean gst_audio_visualizer_sink_query (GstPad * pad,
GstObject * parent, GstQuery * query);
static GstStateChangeReturn gst_audio_visualizer_change_state (GstElement * static GstStateChangeReturn gst_audio_visualizer_change_state (GstElement *
element, GstStateChange transition); element, GstStateChange transition);
@ -586,8 +584,6 @@ gst_audio_visualizer_init (GstAudioVisualizer * scope,
GST_DEBUG_FUNCPTR (gst_audio_visualizer_chain)); GST_DEBUG_FUNCPTR (gst_audio_visualizer_chain));
gst_pad_set_event_function (scope->sinkpad, gst_pad_set_event_function (scope->sinkpad,
GST_DEBUG_FUNCPTR (gst_audio_visualizer_sink_event)); GST_DEBUG_FUNCPTR (gst_audio_visualizer_sink_event));
gst_pad_set_query_function (scope->sinkpad,
GST_DEBUG_FUNCPTR (gst_audio_visualizer_sink_query));
gst_element_add_pad (GST_ELEMENT (scope), scope->sinkpad); gst_element_add_pad (GST_ELEMENT (scope), scope->sinkpad);
pad_template = pad_template =
@ -1265,7 +1261,7 @@ gst_audio_visualizer_src_event (GstPad * pad, GstObject * parent,
scope->earliest_time = timestamp + diff; scope->earliest_time = timestamp + diff;
GST_OBJECT_UNLOCK (scope); GST_OBJECT_UNLOCK (scope);
res = gst_pad_push_event (scope->sinkpad, event); res = gst_pad_event_default (pad, parent, event);
break; break;
} }
case GST_EVENT_RECONFIGURE: case GST_EVENT_RECONFIGURE:
@ -1300,9 +1296,6 @@ gst_audio_visualizer_sink_event (GstPad * pad, GstObject * parent,
gst_event_unref (event); gst_event_unref (event);
break; break;
} }
case GST_EVENT_FLUSH_START:
res = gst_pad_push_event (scope->srcpad, event);
break;
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
gst_audio_visualizer_reset (scope); gst_audio_visualizer_reset (scope);
res = gst_pad_push_event (scope->srcpad, event); res = gst_pad_push_event (scope->srcpad, event);
@ -1318,7 +1311,7 @@ gst_audio_visualizer_sink_event (GstPad * pad, GstObject * parent,
break; break;
} }
default: default:
res = gst_pad_push_event (scope->srcpad, event); res = gst_pad_event_default (pad, parent, event);
break; break;
} }
@ -1384,20 +1377,6 @@ gst_audio_visualizer_src_query (GstPad * pad, GstObject * parent,
return res; return res;
} }
static gboolean
gst_audio_visualizer_sink_query (GstPad * pad, GstObject * parent,
GstQuery * query)
{
gboolean res = FALSE;
switch (GST_QUERY_TYPE (query)) {
default:
res = gst_pad_query_default (pad, parent, query);
break;
}
return res;
}
static GstStateChangeReturn static GstStateChangeReturn
gst_audio_visualizer_change_state (GstElement * element, gst_audio_visualizer_change_state (GstElement * element,
GstStateChange transition) GstStateChange transition)