gst-indent

Original commit message from CVS:
gst-indent

4 files changed, 265 insertions, 269 deletions

diff --git a/gst/debug/efence.c b/gst/debug/efence.c
index 571ab178..f6e576e3 100644
--- a/gst/debug/efence.c
+++ b/gst/debug/efence.c
@@ -43,79 +43,75 @@ static GstElementDetails plugin_details = {
   "Electric Fence",
   "Testing/EFence",
   "This element converts a stream of normal GStreamer buffers into a "
-"stream of buffers that are allocated in such a way that out-of-bounds "
-"access to data in the buffer is more likely to cause segmentation "
-"faults.  This allocation method is very similar to the debugging tool "
-"\"Electric Fence\".",
+      "stream of buffers that are allocated in such a way that out-of-bounds "
+      "access to data in the buffer is more likely to cause segmentation "
+      "faults.  This allocation method is very similar to the debugging tool "
+      "\"Electric Fence\".",
   "David A. Schleef <ds@schleef.org>",
 };
 
 /* Filter signals and args */
-enum {
+enum
+{
   /* FILL ME */
   LAST_SIGNAL
 };
 
-enum {
+enum
+{
   ARG_0,
   ARG_FENCE_TOP
 };
 
 static GstStaticPadTemplate gst_efence_sink_factory =
-GST_STATIC_PAD_TEMPLATE (
-  "sink",
-  GST_PAD_SINK,
-  GST_PAD_ALWAYS,
-  GST_STATIC_CAPS_ANY
-);
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS_ANY);
 
 static GstStaticPadTemplate gst_efence_src_factory =
-GST_STATIC_PAD_TEMPLATE (
-  "src",
-  GST_PAD_SRC,
-  GST_PAD_ALWAYS,
-  GST_STATIC_CAPS_ANY
-);
-
-static void     gst_efence_base_init    (gpointer g_class);
-static void	gst_efence_class_init	(GstEFenceClass *klass);
-static void	gst_efence_init	(GstEFence *filter);
-
-static void	gst_efence_set_property(GObject *object, guint prop_id,
-                                                 const GValue *value,
-					         GParamSpec *pspec);
-static void	gst_efence_get_property(GObject *object, guint prop_id,
-                                                 GValue *value,
-						 GParamSpec *pspec);
-
-static void	gst_efence_chain	(GstPad *pad, GstData *_data);
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS_ANY);
+
+static void gst_efence_base_init (gpointer g_class);
+static void gst_efence_class_init (GstEFenceClass * klass);
+static void gst_efence_init (GstEFence * filter);
+
+static void gst_efence_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_efence_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static void gst_efence_chain (GstPad * pad, GstData * _data);
 
 static GstElementClass *parent_class = NULL;
 
 typedef struct _GstFencedBuffer GstFencedBuffer;
-struct _GstFencedBuffer {
+struct _GstFencedBuffer
+{
   GstBuffer buffer;
   void *region;
   unsigned int length;
 };
 
-void gst_fenced_buffer_default_free (GstData *data);
-GstData * gst_fenced_buffer_default_copy (const GstData *data);
-void *gst_fenced_buffer_alloc(GstBuffer *buffer, unsigned int length,
+void gst_fenced_buffer_default_free (GstData * data);
+GstData *gst_fenced_buffer_default_copy (const GstData * data);
+void *gst_fenced_buffer_alloc (GstBuffer * buffer, unsigned int length,
     gboolean fence_top);
-static GstBuffer * gst_efence_buffer_alloc (GstPad *pad, guint64 offset, guint size);
+static GstBuffer *gst_efence_buffer_alloc (GstPad * pad, guint64 offset,
+    guint size);
 
-GstBuffer *gst_fenced_buffer_new(void);
+GstBuffer *gst_fenced_buffer_new (void);
 
 GType
 gst_gst_efence_get_type (void)
 {
   static GType plugin_type = 0;
 
-  if (!plugin_type)
-  {
-    static const GTypeInfo plugin_info =
-    {
+  if (!plugin_type) {
+    static const GTypeInfo plugin_info = {
       sizeof (GstEFenceClass),
       gst_efence_base_init,
       NULL,
@@ -127,8 +123,7 @@ gst_gst_efence_get_type (void)
       (GInstanceInitFunc) gst_efence_init,
     };
     plugin_type = g_type_register_static (GST_TYPE_ELEMENT,
-	                                  "GstEFence",
-	                                  &plugin_info, 0);
+	"GstEFence", &plugin_info, 0);
   }
   return plugin_type;
 }
@@ -139,27 +134,27 @@ gst_efence_base_init (gpointer g_class)
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
   gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get(&gst_efence_sink_factory));
+      gst_static_pad_template_get (&gst_efence_sink_factory));
   gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get(&gst_efence_src_factory));
+      gst_static_pad_template_get (&gst_efence_src_factory));
   gst_element_class_set_details (element_class, &plugin_details);
 }
 
 /* initialize the plugin's class */
 static void
-gst_efence_class_init (GstEFenceClass *klass)
+gst_efence_class_init (GstEFenceClass * klass)
 {
   GObjectClass *gobject_class;
   GstElementClass *gstelement_class;
 
-  gobject_class = (GObjectClass*) klass;
-  gstelement_class = (GstElementClass*) klass;
+  gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
 
   parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
 
   g_object_class_install_property (gobject_class, ARG_FENCE_TOP,
-    g_param_spec_boolean ("fence_top", "Fence Top", "Align buffers with top of fenced region",
-                          TRUE, G_PARAM_READWRITE));
+      g_param_spec_boolean ("fence_top", "Fence Top",
+	  "Align buffers with top of fenced region", TRUE, G_PARAM_READWRITE));
 
   gobject_class->set_property = gst_efence_set_property;
   gobject_class->get_property = gst_efence_get_property;
@@ -171,14 +166,16 @@ gst_efence_class_init (GstEFenceClass *klass)
  * initialize structure
  */
 static void
-gst_efence_init (GstEFence *filter)
+gst_efence_init (GstEFence * filter)
 {
-  filter->sinkpad = gst_pad_new_from_template (
-      gst_static_pad_template_get(&gst_efence_sink_factory), "sink");
+  filter->sinkpad =
+      gst_pad_new_from_template (gst_static_pad_template_get
+      (&gst_efence_sink_factory), "sink");
   gst_pad_set_getcaps_function (filter->sinkpad, gst_pad_proxy_getcaps);
   gst_pad_set_link_function (filter->sinkpad, gst_pad_proxy_pad_link);
-  filter->srcpad = gst_pad_new_from_template (
-      gst_static_pad_template_get(&gst_efence_src_factory), "src");
+  filter->srcpad =
+      gst_pad_new_from_template (gst_static_pad_template_get
+      (&gst_efence_src_factory), "src");
   gst_pad_set_getcaps_function (filter->srcpad, gst_pad_proxy_getcaps);
   gst_pad_set_link_function (filter->srcpad, gst_pad_proxy_pad_link);
 
@@ -195,7 +192,7 @@ gst_efence_init (GstEFence *filter)
  */
 
 static void
-gst_efence_chain (GstPad *pad, GstData *_data)
+gst_efence_chain (GstPad * pad, GstData * _data)
 {
   GstBuffer *buffer = GST_BUFFER (_data);
   GstEFence *efence;
@@ -215,27 +212,27 @@ gst_efence_chain (GstPad *pad, GstData *_data)
     return;
   }
 
-  copy = gst_fenced_buffer_new();
+  copy = gst_fenced_buffer_new ();
 
-  ptr = gst_fenced_buffer_alloc(copy, GST_BUFFER_SIZE(buffer),
+  ptr = gst_fenced_buffer_alloc (copy, GST_BUFFER_SIZE (buffer),
       efence->fence_top);
-  memcpy(ptr, GST_BUFFER_DATA(buffer), GST_BUFFER_SIZE(buffer));
-
-  GST_BUFFER_DATA (copy)         = ptr;
-  GST_BUFFER_SIZE (copy)         = GST_BUFFER_SIZE (buffer);
-  GST_BUFFER_MAXSIZE (copy)      = GST_BUFFER_SIZE (buffer);
-  GST_BUFFER_TIMESTAMP (copy)    = GST_BUFFER_TIMESTAMP (buffer);
-  GST_BUFFER_DURATION (copy)     = GST_BUFFER_DURATION (buffer);
-  GST_BUFFER_OFFSET (copy)       = GST_BUFFER_OFFSET (buffer);
+  memcpy (ptr, GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
+
+  GST_BUFFER_DATA (copy) = ptr;
+  GST_BUFFER_SIZE (copy) = GST_BUFFER_SIZE (buffer);
+  GST_BUFFER_MAXSIZE (copy) = GST_BUFFER_SIZE (buffer);
+  GST_BUFFER_TIMESTAMP (copy) = GST_BUFFER_TIMESTAMP (buffer);
+  GST_BUFFER_DURATION (copy) = GST_BUFFER_DURATION (buffer);
+  GST_BUFFER_OFFSET (copy) = GST_BUFFER_OFFSET (buffer);
   GST_BUFFER_FREE_DATA_FUNC (copy) = NULL;
-  GST_BUFFER_PRIVATE (copy)      = NULL;
+  GST_BUFFER_PRIVATE (copy) = NULL;
 
-  gst_buffer_unref(buffer);
+  gst_buffer_unref (buffer);
   gst_pad_push (efence->srcpad, GST_DATA (copy));
 }
 
 static GstBuffer *
-gst_efence_buffer_alloc (GstPad *pad, guint64 offset, guint size)
+gst_efence_buffer_alloc (GstPad * pad, guint64 offset, guint size)
 {
   GstBuffer *buffer;
   GstEFence *efence;
@@ -244,7 +241,7 @@ gst_efence_buffer_alloc (GstPad *pad, guint64 offset, guint size)
 
   buffer = gst_fenced_buffer_new ();
 
-  GST_BUFFER_DATA (buffer) = gst_fenced_buffer_alloc(buffer, size,
+  GST_BUFFER_DATA (buffer) = gst_fenced_buffer_alloc (buffer, size,
       efence->fence_top);
   GST_BUFFER_SIZE (buffer) = size;
 
@@ -252,28 +249,27 @@ gst_efence_buffer_alloc (GstPad *pad, guint64 offset, guint size)
 }
 
 static void
-gst_efence_set_property (GObject *object, guint prop_id,
-                                  const GValue *value, GParamSpec *pspec)
+gst_efence_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
 {
   GstEFence *filter;
 
   g_return_if_fail (GST_IS_EFENCE (object));
   filter = GST_EFENCE (object);
 
-  switch (prop_id)
-  {
-  case ARG_FENCE_TOP:
-    filter->fence_top = g_value_get_boolean (value);
-    break;
-  default:
-    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    break;
+  switch (prop_id) {
+    case ARG_FENCE_TOP:
+      filter->fence_top = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
   }
 }
 
 static void
-gst_efence_get_property (GObject *object, guint prop_id,
-                                  GValue *value, GParamSpec *pspec)
+gst_efence_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
 {
   GstEFence *filter;
 
@@ -281,12 +277,12 @@ gst_efence_get_property (GObject *object, guint prop_id,
   filter = GST_EFENCE (object);
 
   switch (prop_id) {
-  case ARG_FENCE_TOP:
-    g_value_set_boolean (value, filter->fence_top);
-    break;
-  default:
-    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    break;
+    case ARG_FENCE_TOP:
+      g_value_set_boolean (value, filter->fence_top);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
   }
 }
 
@@ -296,55 +292,50 @@ gst_efence_get_property (GObject *object, guint prop_id,
  * register the features
  */
 static gboolean
-plugin_init (GstPlugin *plugin)
+plugin_init (GstPlugin * plugin)
 {
   if (!gst_element_register (plugin, "efence", GST_RANK_NONE, GST_TYPE_EFENCE))
     return FALSE;
-  
+
   /* plugin initialisation succeeded */
   return TRUE;
 }
 
-GST_PLUGIN_DEFINE (
-  GST_VERSION_MAJOR,
-  GST_VERSION_MINOR,
-  "efence",
-  "This element converts a stream of normal GStreamer buffers into a "
-  "stream of buffers that are allocated in such a way that out-of-bounds "
-  "access to data in the buffer is more likely to cause segmentation "
-  "faults.  This allocation method is very similar to the debugging tool "
-  "\"Electric Fence\".",
-  plugin_init,
-  VERSION,
-  "LGPL",
-  GST_PACKAGE,
-  GST_ORIGIN)
-
-GstBuffer *gst_fenced_buffer_new(void)
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "efence",
+    "This element converts a stream of normal GStreamer buffers into a "
+    "stream of buffers that are allocated in such a way that out-of-bounds "
+    "access to data in the buffer is more likely to cause segmentation "
+    "faults.  This allocation method is very similar to the debugging tool "
+    "\"Electric Fence\".",
+    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+
+     GstBuffer *gst_fenced_buffer_new (void)
 {
   GstBuffer *newbuf;
 
-  newbuf = (GstBuffer *) g_new0(GstFencedBuffer,1);
+  newbuf = (GstBuffer *) g_new0 (GstFencedBuffer, 1);
 
   gst_data_init (GST_DATA (newbuf), _gst_buffer_type, 0,
-                  gst_fenced_buffer_default_free,
-                  gst_fenced_buffer_default_copy);
-
-  GST_BUFFER_DATA (newbuf)         = NULL;
-  GST_BUFFER_SIZE (newbuf)         = 0;
-  GST_BUFFER_MAXSIZE (newbuf)      = GST_BUFFER_MAXSIZE_NONE;
-  GST_BUFFER_TIMESTAMP (newbuf)    = GST_CLOCK_TIME_NONE;
-  GST_BUFFER_DURATION (newbuf)     = GST_CLOCK_TIME_NONE;
-  GST_BUFFER_OFFSET (newbuf)       = GST_BUFFER_OFFSET_NONE;
+      gst_fenced_buffer_default_free, gst_fenced_buffer_default_copy);
+
+  GST_BUFFER_DATA (newbuf) = NULL;
+  GST_BUFFER_SIZE (newbuf) = 0;
+  GST_BUFFER_MAXSIZE (newbuf) = GST_BUFFER_MAXSIZE_NONE;
+  GST_BUFFER_TIMESTAMP (newbuf) = GST_CLOCK_TIME_NONE;
+  GST_BUFFER_DURATION (newbuf) = GST_CLOCK_TIME_NONE;
+  GST_BUFFER_OFFSET (newbuf) = GST_BUFFER_OFFSET_NONE;
   GST_BUFFER_FREE_DATA_FUNC (newbuf) = NULL;
-  GST_BUFFER_PRIVATE (newbuf)      = NULL;
+  GST_BUFFER_PRIVATE (newbuf) = NULL;
 
   GST_DEBUG ("new buffer=%p", newbuf);
 
   return newbuf;
 }
 
-void gst_fenced_buffer_default_free (GstData *data)
+void
+gst_fenced_buffer_default_free (GstData * data)
 {
   GstFencedBuffer *fenced_buffer;
   GstBuffer *buffer = GST_BUFFER (data);
@@ -360,51 +351,52 @@ void gst_fenced_buffer_default_free (GstData *data)
       GST_BUFFER_DATA (buffer)) {
     GST_DEBUG ("free region %p %d", fenced_buffer->region,
 	fenced_buffer->length);
-    munmap(fenced_buffer->region, fenced_buffer->length);
-  }else{
+    munmap (fenced_buffer->region, fenced_buffer->length);
+  } else {
     GST_DEBUG ("not freeing region %p %d %p", fenced_buffer->region,
-	GST_BUFFER_FLAGS(buffer), GST_BUFFER_DATA(buffer));
+	GST_BUFFER_FLAGS (buffer), GST_BUFFER_DATA (buffer));
   }
 
   /* set to safe values */
   GST_BUFFER_DATA (buffer) = NULL;
   GST_BUFFER_SIZE (buffer) = 0;
-  
+
   g_free (buffer);
 }
 
-GstData* gst_fenced_buffer_default_copy (const GstData *data)
-{ 
+GstData *
+gst_fenced_buffer_default_copy (const GstData * data)
+{
   GstBuffer *buffer = GST_BUFFER (data);
   GstData *copy;
   void *ptr;
-  
+
   g_return_val_if_fail (buffer != NULL, NULL);
-  
+
   /* create a fresh new buffer */
-  copy = (GstData *) g_new0(GstFencedBuffer,1);
-  
+  copy = (GstData *) g_new0 (GstFencedBuffer, 1);
+
   gst_data_init (copy, _gst_buffer_type, 0,
-                  gst_fenced_buffer_default_free,
-                  gst_fenced_buffer_default_copy);
-  
+      gst_fenced_buffer_default_free, gst_fenced_buffer_default_copy);
+
   /* we simply copy everything from our parent */
-  ptr = gst_fenced_buffer_alloc(GST_BUFFER(copy),
-      GST_BUFFER_SIZE(buffer), TRUE);
-  memcpy(ptr, GST_BUFFER_DATA(buffer), GST_BUFFER_SIZE(buffer));
-
-  GST_BUFFER_SIZE (copy)         = GST_BUFFER_SIZE (buffer);
-  GST_BUFFER_MAXSIZE (copy)      = GST_BUFFER_SIZE (buffer);
-  GST_BUFFER_TIMESTAMP (copy)    = GST_BUFFER_TIMESTAMP (buffer);
-  GST_BUFFER_DURATION (copy)     = GST_BUFFER_DURATION (buffer);
-  GST_BUFFER_OFFSET (copy)       = GST_BUFFER_OFFSET (buffer);
+  ptr = gst_fenced_buffer_alloc (GST_BUFFER (copy),
+      GST_BUFFER_SIZE (buffer), TRUE);
+  memcpy (ptr, GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
+
+  GST_BUFFER_SIZE (copy) = GST_BUFFER_SIZE (buffer);
+  GST_BUFFER_MAXSIZE (copy) = GST_BUFFER_SIZE (buffer);
+  GST_BUFFER_TIMESTAMP (copy) = GST_BUFFER_TIMESTAMP (buffer);
+  GST_BUFFER_DURATION (copy) = GST_BUFFER_DURATION (buffer);
+  GST_BUFFER_OFFSET (copy) = GST_BUFFER_OFFSET (buffer);
   GST_BUFFER_FREE_DATA_FUNC (copy) = NULL;
-  GST_BUFFER_PRIVATE (copy)      = NULL;
-  
+  GST_BUFFER_PRIVATE (copy) = NULL;
+
   return copy;
 }
 
-void *gst_fenced_buffer_alloc(GstBuffer *buffer, unsigned int length,
+void *
+gst_fenced_buffer_alloc (GstBuffer * buffer, unsigned int length,
     gboolean fence_top)
 {
   int alloc_size;
@@ -414,41 +406,41 @@ void *gst_fenced_buffer_alloc(GstBuffer *buffer, unsigned int length,
 
   GST_DEBUG ("buffer=%p length=%d fence_top=%d", buffer, length, fence_top);
 
-  if(length==0)return NULL;
+  if (length == 0)
+    return NULL;
 
 #ifdef _SC_PAGESIZE
-  page_size = sysconf(_SC_PAGESIZE);
+  page_size = sysconf (_SC_PAGESIZE);
 #else
-  page_size = getpagesize();
+  page_size = getpagesize ();
 #endif
 
   alloc_size = ((length - 1) & ~(page_size - 1)) + page_size;
-  alloc_size += 2*page_size;
+  alloc_size += 2 * page_size;
 
-  region = mmap(NULL, alloc_size, PROT_READ|PROT_WRITE,
+  region = mmap (NULL, alloc_size, PROT_READ | PROT_WRITE,
       MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-  if(region == MAP_FAILED){
-    g_warning("mmap failed");
+  if (region == MAP_FAILED) {
+    g_warning ("mmap failed");
     return NULL;
   }
 
-  munmap(region, page_size);
-  munmap(region + alloc_size - page_size, page_size);
+  munmap (region, page_size);
+  munmap (region + alloc_size - page_size, page_size);
 
   fenced_buffer->region = region;
   fenced_buffer->length = alloc_size;
 
-  GST_DEBUG ("new region %p %d", fenced_buffer->region,
-      fenced_buffer->length);
-  
-  if(fence_top){
+  GST_DEBUG ("new region %p %d", fenced_buffer->region, fenced_buffer->length);
+
+  if (fence_top) {
     int offset;
+
     /* Align to top of region, but force alignment to 4 bytes */
     offset = alloc_size - page_size - length;
     offset &= ~0x3;
     return region + offset;
-  }else{
+  } else {
     return region + page_size;
   }
 }
-
diff --git a/gst/debug/efence.h b/gst/debug/efence.h
index bf0790dd..8447e848 100644
--- a/gst/debug/efence.h
+++ b/gst/debug/efence.h
@@ -8,8 +8,9 @@
 #include <gst/gst.h>
 
 #ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+extern "C"
+{
+#endif				/* __cplusplus */
 
 /* #define's don't like whitespacey bits */
 #define GST_TYPE_EFENCE \
@@ -23,27 +24,27 @@ extern "C" {
 #define GST_IS_EFENCE_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_EFENCE))
 
-typedef struct _GstEFence      GstEFence;
-typedef struct _GstEFenceClass GstEFenceClass;
+  typedef struct _GstEFence GstEFence;
+  typedef struct _GstEFenceClass GstEFenceClass;
 
-struct _GstEFence
-{
-  GstElement element;
+  struct _GstEFence
+  {
+    GstElement element;
 
-  GstPad *sinkpad, *srcpad;
+    GstPad *sinkpad, *srcpad;
 
-  gboolean fence_top;
-};
+    gboolean fence_top;
+  };
 
-struct _GstEFenceClass 
-{
-  GstElementClass parent_class;
-};
+  struct _GstEFenceClass
+  {
+    GstElementClass parent_class;
+  };
 
-GType gst_gst_efence_get_type (void);
+  GType gst_gst_efence_get_type (void);
 
 #ifdef __cplusplus
 }
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
-#endif /* __GST_EFENCE_H__ */
+#endif				/* __GST_EFENCE_H__ */
diff --git a/gst/debug/gstnavigationtest.c b/gst/debug/gstnavigationtest.c
index 0dad689b..e1b7486f 100644
--- a/gst/debug/gstnavigationtest.c
+++ b/gst/debug/gstnavigationtest.c
@@ -33,26 +33,34 @@
 #include <math.h>
 
 /* GstNavigationtest signals and args */
-enum {
+enum
+{
   /* FILL ME */
   LAST_SIGNAL
 };
 
-enum {
+enum
+{
   ARG_0,
   /* FILL ME */
 };
 
-static void	gst_navigationtest_base_init	(gpointer g_class);
-static void	gst_navigationtest_class_init	(gpointer g_class, gpointer class_data);
-static void	gst_navigationtest_init		(GTypeInstance *instance, gpointer g_class);
+static void gst_navigationtest_base_init (gpointer g_class);
+static void gst_navigationtest_class_init (gpointer g_class,
+    gpointer class_data);
+static void gst_navigationtest_init (GTypeInstance * instance,
+    gpointer g_class);
 
-static gboolean gst_navigationtest_handle_src_event    (GstPad *pad, GstEvent *event);
-static void	gst_navigationtest_set_property		(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void	gst_navigationtest_get_property		(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static gboolean gst_navigationtest_handle_src_event (GstPad * pad,
+    GstEvent * event);
+static void gst_navigationtest_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_navigationtest_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
 
-static void gst_navigationtest_planar411(GstVideofilter *videofilter, void *dest, void *src);
-static void gst_navigationtest_setup(GstVideofilter *videofilter);
+static void gst_navigationtest_planar411 (GstVideofilter * videofilter,
+    void *dest, void *src);
+static void gst_navigationtest_setup (GstVideofilter * videofilter);
 
 GType
 gst_navigationtest_get_type (void)
@@ -61,44 +69,43 @@ gst_navigationtest_get_type (void)
 
   if (!navigationtest_type) {
     static const GTypeInfo navigationtest_info = {
-      sizeof(GstNavigationtestClass),
+      sizeof (GstNavigationtestClass),
       gst_navigationtest_base_init,
       NULL,
       gst_navigationtest_class_init,
       NULL,
       NULL,
-      sizeof(GstNavigationtest),
+      sizeof (GstNavigationtest),
       0,
       gst_navigationtest_init,
     };
-    navigationtest_type = g_type_register_static(GST_TYPE_VIDEOFILTER,
-        "GstNavigationtest", &navigationtest_info, 0);
+    navigationtest_type = g_type_register_static (GST_TYPE_VIDEOFILTER,
+	"GstNavigationtest", &navigationtest_info, 0);
   }
   return navigationtest_type;
 }
 
 static GstVideofilterFormat gst_navigationtest_formats[] = {
-  { "I420", 12, gst_navigationtest_planar411, },
+  {"I420", 12, gst_navigationtest_planar411,},
 };
 
-  
+
 static void
 gst_navigationtest_base_init (gpointer g_class)
 {
-  static GstElementDetails navigationtest_details = GST_ELEMENT_DETAILS (
-    "Video Filter Template",
-    "Filter/Video",
-    "Template for a video filter",
-    "David Schleef <ds@schleef.org>"
-  );
+  static GstElementDetails navigationtest_details =
+      GST_ELEMENT_DETAILS ("Video Filter Template",
+      "Filter/Video",
+      "Template for a video filter",
+      "David Schleef <ds@schleef.org>");
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
   GstVideofilterClass *videofilter_class = GST_VIDEOFILTER_CLASS (g_class);
   int i;
-  
+
   gst_element_class_set_details (element_class, &navigationtest_details);
 
-  for(i=0;i<G_N_ELEMENTS(gst_navigationtest_formats);i++){
-    gst_videofilter_class_add_format(videofilter_class,
+  for (i = 0; i < G_N_ELEMENTS (gst_navigationtest_formats); i++) {
+    gst_videofilter_class_add_format (videofilter_class,
 	gst_navigationtest_formats + i);
   }
 
@@ -115,10 +122,10 @@ gst_navigationtest_class_init (gpointer g_class, gpointer class_data)
   videofilter_class = GST_VIDEOFILTER_CLASS (g_class);
 
 #if 0
-  g_object_class_install_property(gobject_class, ARG_METHOD,
-      g_param_spec_enum("method","method","method",
-      GST_TYPE_NAVIGATIONTEST_METHOD, GST_NAVIGATIONTEST_METHOD_1,
-      G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, ARG_METHOD,
+      g_param_spec_enum ("method", "method", "method",
+	  GST_TYPE_NAVIGATIONTEST_METHOD, GST_NAVIGATIONTEST_METHOD_1,
+	  G_PARAM_READWRITE));
 #endif
 
   gobject_class->set_property = gst_navigationtest_set_property;
@@ -128,14 +135,14 @@ gst_navigationtest_class_init (gpointer g_class, gpointer class_data)
 }
 
 static void
-gst_navigationtest_init (GTypeInstance *instance, gpointer g_class)
+gst_navigationtest_init (GTypeInstance * instance, gpointer g_class)
 {
   GstNavigationtest *navigationtest = GST_NAVIGATIONTEST (instance);
   GstVideofilter *videofilter;
 
-  GST_DEBUG("gst_navigationtest_init");
+  GST_DEBUG ("gst_navigationtest_init");
 
-  videofilter = GST_VIDEOFILTER(navigationtest);
+  videofilter = GST_VIDEOFILTER (navigationtest);
 
   gst_pad_set_event_function (videofilter->srcpad,
       gst_navigationtest_handle_src_event);
@@ -145,7 +152,7 @@ gst_navigationtest_init (GTypeInstance *instance, gpointer g_class)
 }
 
 static gboolean
-gst_navigationtest_handle_src_event (GstPad *pad, GstEvent *event)
+gst_navigationtest_handle_src_event (GstPad * pad, GstEvent * event)
 {
   GstNavigationtest *navigationtest;
 
@@ -153,10 +160,10 @@ gst_navigationtest_handle_src_event (GstPad *pad, GstEvent *event)
 
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_NAVIGATION:
-      gst_structure_get_double(event->event_data.structure.structure,
-          "pointer_x", &navigationtest->x);
-      gst_structure_get_double(event->event_data.structure.structure,
-          "pointer_y", &navigationtest->y);
+      gst_structure_get_double (event->event_data.structure.structure,
+	  "pointer_x", &navigationtest->x);
+      gst_structure_get_double (event->event_data.structure.structure,
+	  "pointer_y", &navigationtest->y);
       break;
     default:
       break;
@@ -165,15 +172,16 @@ gst_navigationtest_handle_src_event (GstPad *pad, GstEvent *event)
 }
 
 static void
-gst_navigationtest_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+gst_navigationtest_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
 {
   GstNavigationtest *src;
 
   /* it's not null if we got it, but it might not be ours */
-  g_return_if_fail(GST_IS_NAVIGATIONTEST(object));
-  src = GST_NAVIGATIONTEST(object);
+  g_return_if_fail (GST_IS_NAVIGATIONTEST (object));
+  src = GST_NAVIGATIONTEST (object);
 
-  GST_DEBUG("gst_navigationtest_set_property");
+  GST_DEBUG ("gst_navigationtest_set_property");
   switch (prop_id) {
 #if 0
     case ARG_METHOD:
@@ -186,13 +194,14 @@ gst_navigationtest_set_property (GObject *object, guint prop_id, const GValue *v
 }
 
 static void
-gst_navigationtest_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+gst_navigationtest_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
 {
   GstNavigationtest *src;
 
   /* it's not null if we got it, but it might not be ours */
-  g_return_if_fail(GST_IS_NAVIGATIONTEST(object));
-  src = GST_NAVIGATIONTEST(object);
+  g_return_if_fail (GST_IS_NAVIGATIONTEST (object));
+  src = GST_NAVIGATIONTEST (object);
 
   switch (prop_id) {
 #if 0
@@ -206,89 +215,85 @@ gst_navigationtest_get_property (GObject *object, guint prop_id, GValue *value,
   }
 }
 
-static gboolean plugin_init (GstPlugin *plugin)
+static gboolean
+plugin_init (GstPlugin * plugin)
 {
-  if(!gst_library_load("gstvideofilter"))
+  if (!gst_library_load ("gstvideofilter"))
     return FALSE;
 
   return gst_element_register (plugin, "navigationtest", GST_RANK_NONE,
       GST_TYPE_NAVIGATIONTEST);
 }
 
-GST_PLUGIN_DEFINE (
-  GST_VERSION_MAJOR,
-  GST_VERSION_MINOR,
-  "navigationtest",
-  "Template for a video filter",
-  plugin_init,
-  VERSION,
-  GST_LICENSE,
-  GST_PACKAGE,
-  GST_ORIGIN
-)
-
-static void gst_navigationtest_setup(GstVideofilter *videofilter)
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "navigationtest",
+    "Template for a video filter",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+
+     static void gst_navigationtest_setup (GstVideofilter * videofilter)
 {
   GstNavigationtest *navigationtest;
 
-  g_return_if_fail(GST_IS_NAVIGATIONTEST(videofilter));
-  navigationtest = GST_NAVIGATIONTEST(videofilter);
+  g_return_if_fail (GST_IS_NAVIGATIONTEST (videofilter));
+  navigationtest = GST_NAVIGATIONTEST (videofilter);
 
   /* if any setup needs to be done, do it here */
 
 }
 
-static void gst_navigationtest_planar411(GstVideofilter *videofilter,
+static void
+gst_navigationtest_planar411 (GstVideofilter * videofilter,
     void *dest, void *src)
 {
   GstNavigationtest *navigationtest;
-  int width = gst_videofilter_get_input_width(videofilter);
-  int height = gst_videofilter_get_input_height(videofilter);
-  int x,y;
+  int width = gst_videofilter_get_input_width (videofilter);
+  int height = gst_videofilter_get_input_height (videofilter);
+  int x, y;
   int x1, x2, y1, y2;
 
-  g_return_if_fail(GST_IS_NAVIGATIONTEST(videofilter));
-  navigationtest = GST_NAVIGATIONTEST(videofilter);
+  g_return_if_fail (GST_IS_NAVIGATIONTEST (videofilter));
+  navigationtest = GST_NAVIGATIONTEST (videofilter);
 
   /* do something interesting here.  This simply copies the source
    * to the destination. */
-  memcpy(dest,src,width * height + (width/2) * (height/2) * 2);
+  memcpy (dest, src, width * height + (width / 2) * (height / 2) * 2);
 
-  x = rint(navigationtest->x);
-  y = rint(navigationtest->y);
+  x = rint (navigationtest->x);
+  y = rint (navigationtest->y);
 
-  if(x<0 || y<0 || x>=width || y>=height)return;
+  if (x < 0 || y < 0 || x >= width || y >= height)
+    return;
 
-  x1 = MAX(x-5, 0);
-  x2 = MIN(x+5, width);
-  y1 = MAX(y-5, 0);
-  y2 = MIN(y+5, height);
+  x1 = MAX (x - 5, 0);
+  x2 = MIN (x + 5, width);
+  y1 = MAX (y - 5, 0);
+  y2 = MIN (y + 5, height);
 
-  for(y=y1;y<y2;y++){
-    for(x=x1;x<x2;x++){
-      ((guint8 *)dest)[y*width + x] = 0;
+  for (y = y1; y < y2; y++) {
+    for (x = x1; x < x2; x++) {
+      ((guint8 *) dest)[y * width + x] = 0;
     }
   }
 
-  dest += height*width;
+  dest += height * width;
   width /= 2;
   height /= 2;
   x1 /= 2;
   x2 /= 2;
   y1 /= 2;
   y2 /= 2;
-  for(y=y1;y<y2;y++){
-    for(x=x1;x<x2;x++){
-      ((guint8 *)dest)[y*width + x] = 128;
+  for (y = y1; y < y2; y++) {
+    for (x = x1; x < x2; x++) {
+      ((guint8 *) dest)[y * width + x] = 128;
     }
   }
 
-  dest += height*width;
-  for(y=y1;y<y2;y++){
-    for(x=x1;x<x2;x++){
-      ((guint8 *)dest)[y*width + x] = 128;
+  dest += height * width;
+  for (y = y1; y < y2; y++) {
+    for (x = x1; x < x2; x++) {
+      ((guint8 *) dest)[y * width + x] = 128;
     }
   }
 
 }
-
diff --git a/gst/debug/gstnavigationtest.h b/gst/debug/gstnavigationtest.h
index 61798c93..00d3e6d1 100644
--- a/gst/debug/gstnavigationtest.h
+++ b/gst/debug/gstnavigationtest.h
@@ -28,7 +28,6 @@
 
 
 G_BEGIN_DECLS
-
 #define GST_TYPE_NAVIGATIONTEST \
   (gst_navigationtest_get_type())
 #define GST_NAVIGATIONTEST(obj) \
@@ -39,24 +38,23 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_NAVIGATIONTEST))
 #define GST_IS_NAVIGATIONTEST_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NAVIGATIONTEST))
-
 typedef struct _GstNavigationtest GstNavigationtest;
 typedef struct _GstNavigationtestClass GstNavigationtestClass;
 
-struct _GstNavigationtest {
+struct _GstNavigationtest
+{
   GstVideofilter videofilter;
 
   double x;
   double y;
 };
 
-struct _GstNavigationtestClass {
+struct _GstNavigationtestClass
+{
   GstVideofilterClass parent_class;
 };
 
-GType gst_navigationtest_get_type(void);
+GType gst_navigationtest_get_type (void);
 
 G_END_DECLS
-
 #endif /* __GST_NAVIGATIONTEST_H__ */
-