From 65c2296d10a5a9b4566d1d506702a8c8ac8b79bb Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 26 Sep 2006 13:18:06 +0000 Subject: sys/v4l2/Makefile.am: Fix makefile, list libs in stack order. Original commit message from CVS: * sys/v4l2/Makefile.am: Fix makefile, list libs in stack order. * sys/v4l2/gstv4l2colorbalance.c: * sys/v4l2/gstv4l2colorbalance.h: * sys/v4l2/gstv4l2object.c: (gst_v4l2_device_get_type), (gst_v4l2_object_install_properties_helper): * sys/v4l2/gstv4l2object.h: * sys/v4l2/gstv4l2src.c: (gst_v4l2src_get_read), (gst_v4l2src_get_mmap), (gst_v4l2src_create): * sys/v4l2/gstv4l2src.h: * sys/v4l2/gstv4l2tuner.h: * sys/v4l2/gstv4l2vidorient.h: * sys/v4l2/gstv4l2xoverlay.h: * sys/v4l2/v4l2_calls.h: * sys/v4l2/v4l2src_calls.h: Fix coding style: - Remove extern from functions. - Fix header indentation. Fix Flags, add defaults for properties. Remove unused enums. Fix TOO_LAZY in error messages. --- sys/v4l2/gstv4l2src.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/v4l2/gstv4l2src.c') diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index 0e5300e2..dc1893a3 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -67,6 +67,7 @@ GST_ELEMENT_DETAILS ("Video (video4linux2/raw) Source", GST_DEBUG_CATEGORY (v4l2src_debug); #define GST_CAT_DEFAULT v4l2src_debug +#define DEFAULT_PROP_USE_FIXED_FPS TRUE enum { @@ -276,6 +277,7 @@ gst_v4l2src_class_init (GstV4l2SrcClass * klass) basesrc_class = GST_BASE_SRC_CLASS (klass); pushsrc_class = GST_PUSH_SRC_CLASS (klass); + gobject_class->dispose = gst_v4l2src_dispose; gobject_class->set_property = gst_v4l2src_set_property; gobject_class->get_property = gst_v4l2src_get_property; @@ -286,7 +288,7 @@ gst_v4l2src_class_init (GstV4l2SrcClass * klass) g_param_spec_boolean ("use-fixed-fps", "Use Fixed FPS", "Drop/Insert frames to reach a certain FPS (TRUE) " "or adapt FPS to suit the number of frabbed frames", - TRUE, G_PARAM_READWRITE)); + DEFAULT_PROP_USE_FIXED_FPS, G_PARAM_READWRITE)); basesrc_class->get_caps = gst_v4l2src_get_caps; basesrc_class->set_caps = gst_v4l2src_set_caps; @@ -294,8 +296,6 @@ gst_v4l2src_class_init (GstV4l2SrcClass * klass) basesrc_class->stop = gst_v4l2src_stop; pushsrc_class->create = gst_v4l2src_create; - - gobject_class->dispose = gst_v4l2src_dispose; } static void @@ -311,7 +311,7 @@ gst_v4l2src_init (GstV4l2Src * v4l2src, GstV4l2SrcClass * klass) /* fps */ v4l2src->fps_n = 0; v4l2src->fps_d = 1; - v4l2src->use_fixed_fps = TRUE; + v4l2src->use_fixed_fps = DEFAULT_PROP_USE_FIXED_FPS; v4l2src->is_capturing = FALSE; -- cgit v1.2.1