From 4a4f06abcf4c5b5a70082e64619951cf23b28c41 Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Tue, 1 May 2012 14:31:20 -0300 Subject: [PATCH] wrappercamerabinsrc: removing renegotiate handlers gstreamer 1.0 already has the reconfigure event, remove the custom event handling from wrappercamerabinsrc --- gst/camerabin2/gstwrappercamerabinsrc.c | 28 ------------------------- 1 file changed, 28 deletions(-) diff --git a/gst/camerabin2/gstwrappercamerabinsrc.c b/gst/camerabin2/gstwrappercamerabinsrc.c index 7d2c795480..778c5e1cbb 100644 --- a/gst/camerabin2/gstwrappercamerabinsrc.c +++ b/gst/camerabin2/gstwrappercamerabinsrc.c @@ -315,30 +315,6 @@ gst_wrapper_camera_bin_src_vidsrc_probe (GstPad * pad, GstPadProbeInfo * info, return ret; } -static gboolean -gst_wrapper_camera_bin_src_event (GstPad * pad, GstObject * parent, - GstEvent * event) -{ - GstWrapperCameraBinSrc *src = - GST_WRAPPER_CAMERA_BIN_SRC (GST_PAD_PARENT (pad)); - const GstStructure *structure; - - structure = gst_event_get_structure (event); - if (structure && gst_structure_has_name (structure, "renegotiate")) { - GST_DEBUG_OBJECT (src, "Received renegotiate on pad %s", - GST_PAD_NAME (pad)); - - if (pad == src->imgsrc) { - src->image_renegotiate = TRUE; - } else if (pad == src->vidsrc) { - src->video_renegotiate = TRUE; - } - } - //TODO porting - //return src->srcpad_event_func (pad, event); - return TRUE; -} - static GstPadProbeReturn gst_wrapper_camera_src_src_event_probe (GstPad * pad, GstPadProbeInfo * info, gpointer udata) @@ -1172,10 +1148,6 @@ gst_wrapper_camera_bin_src_init (GstWrapperCameraBinSrc * self) self->srcpad_event_func = GST_PAD_EVENTFUNC (self->vfsrc); - gst_pad_set_event_function (self->imgsrc, gst_wrapper_camera_bin_src_event); - gst_pad_set_event_function (self->vidsrc, gst_wrapper_camera_bin_src_event); - gst_pad_set_event_function (self->vfsrc, gst_wrapper_camera_bin_src_event); - /* TODO where are variables reset? */ self->image_capture_count = 0; self->video_rec_status = GST_VIDEO_RECORDING_STATUS_DONE;