From 91d8bbd8a151dca3614bcc8343fc7592e325d4d2 Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Tue, 7 Dec 2010 19:12:40 -0300 Subject: [PATCH] basecamerasrc: Removing ununsed methods Remove one unused method _finish_image_capture() --- gst/camerabin2/gstbasecamerasrc.c | 17 ----------------- gst/camerabin2/gstbasecamerasrc.h | 5 ----- gst/camerabin2/gstv4l2camerasrc.c | 23 ----------------------- 3 files changed, 45 deletions(-) diff --git a/gst/camerabin2/gstbasecamerasrc.c b/gst/camerabin2/gstbasecamerasrc.c index 86c298e4e9..7c24ac394a 100644 --- a/gst/camerabin2/gstbasecamerasrc.c +++ b/gst/camerabin2/gstbasecamerasrc.c @@ -182,23 +182,6 @@ gst_base_camera_src_get_allowed_input_caps (GstBaseCameraSrc * self) return bclass->get_allowed_input_caps (self); } -/** - * gst_base_camera_src_finish_image_capture: - * @self: camerasrc object - * - * Perform finishing operations after image capture is done and - * returning back to view finder mode. - */ -void -gst_base_camera_src_finish_image_capture (GstBaseCameraSrc * self) -{ - GstBaseCameraSrcClass *bclass = GST_BASE_CAMERA_SRC_GET_CLASS (self); - - if (bclass->finish_image_capture) { - bclass->finish_image_capture (self); - } -} - /** * gst_base_camera_src_find_better_framerate: * @self: camerasrc object diff --git a/gst/camerabin2/gstbasecamerasrc.h b/gst/camerabin2/gstbasecamerasrc.h index 8a212b158d..14b2a4d0d7 100644 --- a/gst/camerabin2/gstbasecamerasrc.h +++ b/gst/camerabin2/gstbasecamerasrc.h @@ -126,10 +126,6 @@ struct _GstBaseCameraSrcClass /* */ GstCaps * (*get_allowed_input_caps) (GstBaseCameraSrc * self); - /* optional */ - void (*finish_image_capture) (GstBaseCameraSrc * self); - - void (*private_start_capture) (GstBaseCameraSrc * src); void (*private_stop_capture) (GstBaseCameraSrc * src); gboolean (*start_capture) (GstBaseCameraSrc * src); @@ -150,7 +146,6 @@ GstColorBalance * gst_base_camera_src_get_color_balance (GstBaseCameraSrc *self) gboolean gst_base_camera_src_set_mode (GstBaseCameraSrc *self, GstCameraBinMode mode); void gst_base_camera_src_setup_zoom (GstBaseCameraSrc * self); GstCaps * gst_base_camera_src_get_allowed_input_caps (GstBaseCameraSrc * self); -void gst_base_camera_src_finish_image_capture (GstBaseCameraSrc * self); const GValue * gst_base_camera_src_find_better_framerate ( GstBaseCameraSrc * self, GstStructure * st, const GValue * orig_framerate); diff --git a/gst/camerabin2/gstv4l2camerasrc.c b/gst/camerabin2/gstv4l2camerasrc.c index 68524427c0..feecccfaa0 100644 --- a/gst/camerabin2/gstv4l2camerasrc.c +++ b/gst/camerabin2/gstv4l2camerasrc.c @@ -952,27 +952,6 @@ set_capsfilter_caps (GstV4l2CameraSrc * self, GstCaps * new_caps) GST_INFO_OBJECT (self, "udpated"); } -static void -gst_v4l2_camera_src_finish_image_capture (GstBaseCameraSrc * bcamsrc) -{ - GstV4l2CameraSrc *self = GST_V4L2_CAMERA_SRC (bcamsrc); - - if (self->image_capture_caps) { - /* If we used specific caps for image capture we need to - restore the caps and zoom/crop for view finder mode */ - if (self->src_zoom_crop) { - GST_DEBUG_OBJECT (self, "resetting crop in camerabin"); - g_object_set (self->src_zoom_crop, "left", 0, "right", 0, - "top", 0, "bottom", 0, NULL); - } - self->base_crop_left = 0; - self->base_crop_right = 0; - self->base_crop_top = 0; - self->base_crop_bottom = 0; - set_capsfilter_caps (self, self->view_finder_caps); - } -} - static gboolean gst_v4l2_camera_src_start_capture (GstBaseCameraSrc * camerasrc) { @@ -1049,8 +1028,6 @@ gst_v4l2_camera_src_class_init (GstV4l2CameraSrcClass * klass) gstbasecamerasrc_class->set_mode = gst_v4l2_camera_src_set_mode; gstbasecamerasrc_class->get_allowed_input_caps = gst_v4l2_camera_src_get_allowed_input_caps; - gstbasecamerasrc_class->finish_image_capture = - gst_v4l2_camera_src_finish_image_capture; gstbasecamerasrc_class->start_capture = gst_v4l2_camera_src_start_capture; gstbasecamerasrc_class->stop_capture = gst_v4l2_camera_src_stop_capture; }