mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

dtmfsrc: pass unhandled non-custom events to the base class

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=666626
This commit is contained in:
Tim-Philipp Müller 2012-07-08 00:08:55 +01:00
parent 9c8944ca89
commit 945ed74ebe
1 changed files with 47 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
gst/dtmf/gstdtmfsrc.c
View file

@ -211,6 +211,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
"rate = " GST_AUDIO_RATE_RANGE ", " "channels = (int) 1") "rate = " GST_AUDIO_RATE_RANGE ", " "channels = (int) 1")
); );
#define parent_class gst_dtmf_src_parent_class
G_DEFINE_TYPE (GstDTMFSrc, gst_dtmf_src, GST_TYPE_BASE_SRC); G_DEFINE_TYPE (GstDTMFSrc, gst_dtmf_src, GST_TYPE_BASE_SRC);
static void gst_dtmf_src_finalize (GObject * object); static void gst_dtmf_src_finalize (GObject * object);
@ -319,9 +320,11 @@ gst_dtmf_src_finalize (GObject * object)
} }
static gboolean static gboolean
gst_dtmf_src_handle_dtmf_event (GstDTMFSrc * dtmfsrc, gst_dtmf_src_handle_dtmf_event (GstDTMFSrc * dtmfsrc, GstEvent * event)
const GstStructure * event_structure)
{ {
const GstStructure *event_structure;
GstStateChangeReturn sret;
GstState state;
gint event_type; gint event_type;
gboolean start; gboolean start;
gint method; gint method;
@ -330,6 +333,14 @@ gst_dtmf_src_handle_dtmf_event (GstDTMFSrc * dtmfsrc,
gint event_volume; gint event_volume;
gboolean correct_order; gboolean correct_order;
sret = gst_element_get_state (GST_ELEMENT (dtmfsrc), &state, NULL, 0);
if (sret != GST_STATE_CHANGE_SUCCESS || state != GST_STATE_PLAYING) {
GST_DEBUG_OBJECT (dtmfsrc, "dtmf-event, but not in PLAYING state");
goto failure;
}
event_structure = gst_event_get_structure (event);
if (!gst_structure_get_int (event_structure, "type", &event_type) || if (!gst_structure_get_int (event_structure, "type", &event_type) ||
!gst_structure_get_boolean (event_structure, "start", &start) || !gst_structure_get_boolean (event_structure, "start", &start) ||
(start == TRUE && event_type != GST_TONE_DTMF_TYPE_EVENT)) (start == TRUE && event_type != GST_TONE_DTMF_TYPE_EVENT))
@ -375,29 +386,6 @@ failure:
return FALSE; return FALSE;
} }
static gboolean
gst_dtmf_src_handle_custom_upstream (GstDTMFSrc * dtmfsrc, GstEvent * event)
{
gboolean result = FALSE;
const GstStructure *structure;
GstState state;
GstStateChangeReturn ret;
ret = gst_element_get_state (GST_ELEMENT (dtmfsrc), &state, NULL, 0);
if (ret != GST_STATE_CHANGE_SUCCESS || state != GST_STATE_PLAYING) {
GST_DEBUG_OBJECT (dtmfsrc, "Received event while not in PLAYING state");
goto ret;
}
GST_DEBUG_OBJECT (dtmfsrc, "Received event is of our interest");
structure = gst_event_get_structure (event);
if (structure && gst_structure_has_name (structure, "dtmf-event"))
result = gst_dtmf_src_handle_dtmf_event (dtmfsrc, structure);
ret:
return result;
}
static gboolean static gboolean
gst_dtmf_src_handle_event (GstBaseSrc * src, GstEvent * event) gst_dtmf_src_handle_event (GstBaseSrc * src, GstEvent * event)
{ {
@ -406,9 +394,19 @@ gst_dtmf_src_handle_event (GstBaseSrc * src, GstEvent * event)
dtmfsrc = GST_DTMF_SRC (src); dtmfsrc = GST_DTMF_SRC (src);
GST_DEBUG_OBJECT (dtmfsrc, "Received an event on the src pad"); GST_LOG_OBJECT (dtmfsrc, "Received an %s event on the src pad",
if (GST_EVENT_TYPE (event) == GST_EVENT_CUSTOM_UPSTREAM) { GST_EVENT_TYPE_NAME (event));
result = gst_dtmf_src_handle_custom_upstream (dtmfsrc, event);
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_CUSTOM_UPSTREAM:
if (gst_event_has_name (event, "dtmf-event")) {
result = gst_dtmf_src_handle_dtmf_event (dtmfsrc, event);
break;
}
/* fall through */
default:
result = GST_BASE_SRC_CLASS (parent_class)->event (src, event);
break;
} }
return result; return result;
@ -418,12 +416,29 @@ gst_dtmf_src_handle_event (GstBaseSrc * src, GstEvent * event)
static gboolean static gboolean
gst_dtmf_src_send_event (GstElement * element, GstEvent * event) gst_dtmf_src_send_event (GstElement * element, GstEvent * event)
{ {
GstDTMFSrc *dtmfsrc = GST_DTMF_SRC (element);
gboolean ret;
if (gst_dtmf_src_handle_event (GST_BASE_SRC (element), event)) GST_LOG_OBJECT (dtmfsrc, "Received an %s event via send_event",
return TRUE; GST_EVENT_TYPE_NAME (event));
return GST_ELEMENT_CLASS (gst_dtmf_src_parent_class)->send_event switch (GST_EVENT_TYPE (event)) {
(element, event); case GST_EVENT_CUSTOM_BOTH:
case GST_EVENT_CUSTOM_BOTH_OOB:
case GST_EVENT_CUSTOM_UPSTREAM:
case GST_EVENT_CUSTOM_DOWNSTREAM:
case GST_EVENT_CUSTOM_DOWNSTREAM_OOB:
if (gst_event_has_name (event, "dtmf-event")) {
ret = gst_dtmf_src_handle_dtmf_event (dtmfsrc, event);
break;
}
/* fall through */
default:
ret = GST_ELEMENT_CLASS (parent_class)->send_event (element, event);
break;
}
return ret;
} }
static void static void