Some clean-ups requested by wingo in bug #338818.

Original commit message from CVS:
Some clean-ups requested by wingo in bug #338818.

diff --git a/ChangeLog b/ChangeLog
index 3b3c96e..d9ceb71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-19  Edgard Lima <edgard.lima@indt.org.br>
+
+       * sys/v4l2/gstv4l2.c:
+       * sys/v4l2/gstv4l2object.c:
+       * sys/v4l2/gstv4l2object.h:
+       * sys/v4l2/gstv4l2src.c:
+       Some clean-ups requested by wingo in bug #338818.       
+
 2006-05-19  Michael Smith  <msmith@fluendo.com>
 
        * ext/alsaspdif/alsaspdifsink.c: (alsaspdifsink_base_init),

diff --git a/sys/v4l2/gstv4l2.c b/sys/v4l2/gstv4l2.c
index 11b3354..0e7474e 100644 (file)
--- a/sys/v4l2/gstv4l2.c
+++ b/sys/v4l2/gstv4l2.c
@@ -3,7 +3,7 @@
  * gstv4l2.c: plugin for v4l2 elements
  *
  * Copyright (C) 2001-2002 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2001-2002 Edgard Lima <edgard.lima@indt.org.br>
+ * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index e7485eb..24120dd 100644 (file)
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -234,7 +234,7 @@ gst_v4l2_device_get_type (void)
 }
 
 void
-gst_v4l2object_install_properties_helper (GObjectClass * gobject_class)
+gst_v4l2_object_install_properties_helper (GObjectClass * gobject_class)
 {
 
   g_object_class_install_property
@@ -269,7 +269,7 @@ gst_v4l2object_install_properties_helper (GObjectClass * gobject_class)
 }
 
 GstV4l2Object *
-gst_v4l2object_new (GstElement * element,
+gst_v4l2_object_new (GstElement * element,
     GstV4l2GetInOutFunction get_in_out_func,
     GstV4l2SetInOutFunction set_in_out_func,
     GstV4l2UpdateFpsFunction update_fps_func)
@@ -304,7 +304,7 @@ gst_v4l2object_new (GstElement * element,
 
 
 void
-gst_v4l2object_destroy (GstV4l2Object ** v4l2object)
+gst_v4l2_object_destroy (GstV4l2Object ** v4l2object)
 {
 
   if (*v4l2object) {
@@ -323,7 +323,7 @@ gst_v4l2object_destroy (GstV4l2Object ** v4l2object)
 
 
 gboolean
-gst_v4l2object_set_property_helper (GstV4l2Object * v4l2object,
+gst_v4l2_object_set_property_helper (GstV4l2Object * v4l2object,
     guint prop_id, const GValue * value, GParamSpec * pspec)
 {
 
@@ -395,7 +395,7 @@ gst_v4l2object_set_property_helper (GstV4l2Object * v4l2object,
 
 
 gboolean
-gst_v4l2object_get_property_helper (GstV4l2Object * v4l2object,
+gst_v4l2_object_get_property_helper (GstV4l2Object * v4l2object,
     guint prop_id, GValue * value, GParamSpec * pspec)
 {
   switch (prop_id) {
@@ -495,7 +495,7 @@ gst_v4l2_set_defaults (GstV4l2Object * v4l2object)
 
 
 gboolean
-gst_v4l2object_start (GstV4l2Object * v4l2object)
+gst_v4l2_object_start (GstV4l2Object * v4l2object)
 {
   if (gst_v4l2_open (v4l2object))
     gst_v4l2_set_defaults (v4l2object);
@@ -511,7 +511,7 @@ gst_v4l2object_start (GstV4l2Object * v4l2object)
 }
 
 gboolean
-gst_v4l2object_stop (GstV4l2Object * v4l2object)
+gst_v4l2_object_stop (GstV4l2Object * v4l2object)
 {
 
 #ifdef HAVE_XVIDEO

diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h
index 5692b26..599a728 100644 (file)
--- a/sys/v4l2/gstv4l2object.h
+++ b/sys/v4l2/gstv4l2object.h
@@ -21,8 +21,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GST_V4L2OBJECT_H__
-#define __GST_V4L2OBJECT_H__
+#ifndef __GST_V4L2_OBJECT_H__
+#define __GST_V4L2_OBJECT_H__
 
 /* Because of some really cool feature in video4linux1, also known as
  * 'not including sys/types.h and sys/time.h', we had to include it
@@ -49,7 +49,7 @@
 
 G_BEGIN_DECLS
 
-#define GST_V4L2OBJECT(obj) (GstV4l2Object *)(obj)
+#define GST_V4L2_OBJECT(obj) (GstV4l2Object *)(obj)
 
 typedef struct _GstV4l2Object GstV4l2Object;
 typedef struct _GstV4l2ObjectClassHelper GstV4l2ObjectClassHelper;
@@ -109,7 +109,7 @@ struct _GstV4l2ObjectClassHelper {
 };
 
 
-GType gst_v4l2object_get_type(void);
+GType gst_v4l2_object_get_type(void);
 
 
 #define V4L2_STD_OBJECT_PROPS                  \
@@ -122,26 +122,26 @@ GType gst_v4l2object_get_type(void);
 
 
 extern GstV4l2Object *
-gst_v4l2object_new (GstElement * element,
+gst_v4l2_object_new (GstElement * element,
                     GstV4l2GetInOutFunction get_in_out_func,
                     GstV4l2SetInOutFunction set_in_out_func,
                    GstV4l2UpdateFpsFunction   update_fps_func);
 
 extern void
-gst_v4l2object_destroy (GstV4l2Object ** v4l2object);
+gst_v4l2_object_destroy (GstV4l2Object ** v4l2object);
 
 extern void
-gst_v4l2object_install_properties_helper (GObjectClass *gobject_class);
+gst_v4l2_object_install_properties_helper (GObjectClass *gobject_class);
 
 extern gboolean
-gst_v4l2object_set_property_helper (GstV4l2Object *v4l2object,
+gst_v4l2_object_set_property_helper (GstV4l2Object *v4l2object,
                                    guint prop_id, const GValue * value, GParamSpec * pspec);
 extern gboolean
-gst_v4l2object_get_property_helper (GstV4l2Object *v4l2object,
+gst_v4l2_object_get_property_helper (GstV4l2Object *v4l2object,
                                    guint prop_id, GValue * value, GParamSpec * pspec);
 
-extern gboolean gst_v4l2object_start (GstV4l2Object *v4l2object);
-extern gboolean gst_v4l2object_stop (GstV4l2Object *v4l2object);
+extern gboolean gst_v4l2_object_start (GstV4l2Object *v4l2object);
+extern gboolean gst_v4l2_object_stop (GstV4l2Object *v4l2object);
 
 extern const GList *
 gst_v4l2_probe_get_properties (GstPropertyProbe * probe);
@@ -207,4 +207,4 @@ interface_as_function ## _property_probe_interface_init (GstPropertyProbeInterfa
 
 G_END_DECLS
 
-#endif /* __GST_V4L2OBJECT_H__ */
+#endif /* __GST_V4L2_OBJECT_H__ */

diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 6dfbf0b..5ece226 100644 (file)
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -268,7 +268,7 @@ gst_v4l2src_class_init (GstV4l2SrcClass * klass)
   gobject_class->set_property = gst_v4l2src_set_property;
   gobject_class->get_property = gst_v4l2src_get_property;
 
-  gst_v4l2object_install_properties_helper (gobject_class);
+  gst_v4l2_object_install_properties_helper (gobject_class);
 
   g_object_class_install_property
       (gobject_class, PROP_USE_FIXED_FPS,
@@ -292,7 +292,7 @@ static void
 gst_v4l2src_init (GstV4l2Src * v4l2src, GstV4l2SrcClass * klass)
 {
 
-  v4l2src->v4l2object = gst_v4l2object_new (GST_ELEMENT (v4l2src),
+  v4l2src->v4l2object = gst_v4l2_object_new (GST_ELEMENT (v4l2src),
       gst_v4l2_get_input, gst_v4l2_set_input, gst_v4l2src_update_fps);
 
   v4l2src->breq.count = 0;
@@ -337,7 +337,7 @@ gst_v4l2src_set_property (GObject * object,
   v4l2src = GST_V4L2SRC (object);
 
 
-  if (!gst_v4l2object_set_property_helper (v4l2src->v4l2object,
+  if (!gst_v4l2_object_set_property_helper (v4l2src->v4l2object,
           prop_id, value, pspec)) {
 
     switch (prop_id) {
@@ -366,7 +366,7 @@ gst_v4l2src_get_property (GObject * object,
   g_return_if_fail (GST_IS_V4L2SRC (object));
   v4l2src = GST_V4L2SRC (object);
 
-  if (!gst_v4l2object_get_property_helper (v4l2src->v4l2object,
+  if (!gst_v4l2_object_get_property_helper (v4l2src->v4l2object,
           prop_id, value, pspec)) {
 
     switch (prop_id) {
@@ -831,7 +831,7 @@ gst_v4l2src_start (GstBaseSrc * src)
 {
   GstV4l2Src *v4l2src = GST_V4L2SRC (src);
 
-  if (!gst_v4l2object_start (v4l2src->v4l2object))
+  if (!gst_v4l2_object_start (v4l2src->v4l2object))
     return FALSE;
 
   v4l2src->offset = 0;
@@ -853,7 +853,7 @@ gst_v4l2src_stop (GstBaseSrc * src)
       return FALSE;
   }
 
-  if (!gst_v4l2object_stop (v4l2src->v4l2object))
+  if (!gst_v4l2_object_stop (v4l2src->v4l2object))
     return FALSE;
 
   return TRUE;