gst-indent

Original commit message from CVS:
gst-indent

5 files changed, 375 insertions, 428 deletions

diff --git a/gst-libs/gst/media-info/media-info-priv.c b/gst-libs/gst/media-info/media-info-priv.c
index 8f4a1f56..fb012209 100644
--- a/gst-libs/gst/media-info/media-info-priv.c
+++ b/gst-libs/gst/media-info/media-info-priv.c
@@ -49,9 +49,10 @@ gmi_stream_new (void)
 }
 
 void
-gmi_stream_free (GstMediaInfoStream *stream)
+gmi_stream_free (GstMediaInfoStream * stream)
 {
-  if (stream->mime) g_free (stream->mime);
+  if (stream->mime)
+    g_free (stream->mime);
   /* FIXME: free tracks */
   g_free (stream);
 }
@@ -78,7 +79,8 @@ gmi_track_new (void)
 
 /* callbacks */
 static void
-have_type_callback (GstElement *typefind, guint probability, GstCaps *type, GstMediaInfoPriv *priv)
+have_type_callback (GstElement * typefind, guint probability, GstCaps * type,
+    GstMediaInfoPriv * priv)
 {
   GstStructure *str;
   const gchar *mime;
@@ -90,8 +92,7 @@ have_type_callback (GstElement *typefind, guint probability, GstCaps *type, GstM
 
   /* FIXME: this code doesn't yet work, test it later */
 #ifdef DONTWORK
-  if (strcmp (mime, "application/x-id3") == 0)
-  {
+  if (strcmp (mime, "application/x-id3") == 0) {
     /* dig a little deeper */
     GST_DEBUG ("dealing with id3, digging deeper");
     gst_element_set_state (priv->pipeline, GST_STATE_READY);
@@ -102,70 +103,72 @@ have_type_callback (GstElement *typefind, guint probability, GstCaps *type, GstM
     if (priv->decontainer == NULL)
       /* FIXME: signal error */
       g_warning ("Couldn't create id3tag");
-    if (!gst_element_link_many (priv->source, priv->decontainer, priv->typefind, NULL));
-      g_warning ("Couldn't link in id3tag");
+    if (!gst_element_link_many (priv->source, priv->decontainer, priv->typefind,
+	    NULL));
+    g_warning ("Couldn't link in id3tag");
 
     if (gst_element_set_state (priv->pipeline, GST_STATE_PLAYING)
-		               == GST_STATE_FAILURE)
+	== GST_STATE_FAILURE)
       g_warning ("Couldn't set to playing");
   }
 #endif
 }
 
 void
-deep_notify_callback (GObject *object, GstObject *origin,
-		      GParamSpec *pspec, GstMediaInfoPriv *priv)
+deep_notify_callback (GObject * object, GstObject * origin,
+    GParamSpec * pspec, GstMediaInfoPriv * priv)
 {
   GValue value = { 0, };
 
   /* we only care about pad notifies */
-  if (!GST_IS_PAD (origin)) return;
+  if (!GST_IS_PAD (origin))
+    return;
 
   /*
-  GST_DEBUG ("DEBUG: deep_notify: have notify of %s from object %s:%s !",
-             pspec->name, gst_element_get_name (gst_pad_get_parent (GST_PAD (origin))),
-             gst_object_get_name (origin));
-  */
-  else if (strcmp (pspec->name, "caps") == 0)
-  {
+     GST_DEBUG ("DEBUG: deep_notify: have notify of %s from object %s:%s !",
+     pspec->name, gst_element_get_name (gst_pad_get_parent (GST_PAD (origin))),
+     gst_object_get_name (origin));
+   */
+  else if (strcmp (pspec->name, "caps") == 0) {
     /* check if we're getting it from fakesink */
-    if (GST_IS_PAD (origin) && GST_PAD_PARENT (origin) == priv->fakesink)
-    {
+    if (GST_IS_PAD (origin) && GST_PAD_PARENT (origin) == priv->fakesink) {
       GST_DEBUG ("have caps on fakesink pad !");
       g_value_init (&value, pspec->value_type);
       g_object_get_property (G_OBJECT (origin), pspec->name, &value);
       priv->format = g_value_peek_pointer (&value);
       GST_DEBUG ("caps: %" GST_PTR_FORMAT, priv->format);
-    }
-    else GST_DEBUG ("ignoring caps on object %s:%s",
-		   gst_object_get_name (gst_object_get_parent (origin)),
-		   gst_object_get_name (origin));
-  }
-  else if (strcmp (pspec->name, "offset") == 0)
-  {
+    } else
+      GST_DEBUG ("ignoring caps on object %s:%s",
+	  gst_object_get_name (gst_object_get_parent (origin)),
+	  gst_object_get_name (origin));
+  } else if (strcmp (pspec->name, "offset") == 0) {
     /* we REALLY ignore offsets, we hate them */
   }
-    //else GST_DEBUG ("ignoring notify of %s", pspec->name);
+  //else GST_DEBUG ("ignoring notify of %s", pspec->name);
 }
 
-typedef struct {
+typedef struct
+{
   guint meta;
   guint encoded;
 } TagFlagScore;
 
 static void
-tag_flag_score (const GstTagList *list, const gchar *tag, gpointer user_data)
+tag_flag_score (const GstTagList * list, const gchar * tag, gpointer user_data)
 {
   TagFlagScore *score = (TagFlagScore *) user_data;
   GstTagFlag flag;
 
   flag = gst_tag_get_flag (tag);
-  if (flag == GST_TAG_FLAG_META) score->meta++;
-  if (flag == GST_TAG_FLAG_ENCODED) score->encoded++;
+  if (flag == GST_TAG_FLAG_META)
+    score->meta++;
+  if (flag == GST_TAG_FLAG_ENCODED)
+    score->encoded++;
 }
 
 void
-found_tag_callback (GObject *pipeline, GstElement *source, GstTagList *tags, GstMediaInfoPriv *priv)
+found_tag_callback (GObject * pipeline, GstElement * source, GstTagList * tags,
+    GstMediaInfoPriv * priv)
 {
   TagFlagScore score;
 
@@ -179,20 +182,18 @@ found_tag_callback (GObject *pipeline, GstElement *source, GstTagList *tags, Gst
 
   gst_tag_list_foreach (tags, tag_flag_score, &score);
 
-  if (score.meta > score.encoded)
-  {
+  if (score.meta > score.encoded) {
     GST_DEBUG ("found tags from decoder, adding them as metadata");
     priv->metadata = gst_tag_list_copy (tags);
-  }
-  else
-  {
+  } else {
     GST_DEBUG ("found tags, adding them as streaminfo");
     priv->streaminfo = gst_tag_list_copy (tags);
   }
 }
 
 void
-error_callback (GObject *element, GstElement *source, GError *error, gchar *debug, GstMediaInfoPriv *priv)
+error_callback (GObject * element, GstElement * source, GError * error,
+    gchar * debug, GstMediaInfoPriv * priv)
 {
   g_print ("ERROR: %s\n", error->message);
   g_error_free (error);
@@ -202,7 +203,7 @@ error_callback (GObject *element, GstElement *source, GError *error, gchar *debu
 
 /* General GError creation */
 static void
-gst_media_info_error_create (GError **error, const gchar *message)
+gst_media_info_error_create (GError ** error, const gchar * message)
 {
   /* check if caller wanted an error reported */
   if (error == NULL)
@@ -214,15 +215,14 @@ gst_media_info_error_create (GError **error, const gchar *message)
 
 /* GError creation when element is missing */
 static void
-gst_media_info_error_element (const gchar *element, GError **error)
+gst_media_info_error_element (const gchar * element, GError ** error)
 {
   gchar *message;
 
   message = g_strdup_printf ("The %s element could not be found. "
-                             "This element is essential for reading. "
-                             "Please install the right plug-in and verify "
-                             "that it works by running 'gst-inspect %s'",
-                             element, element);
+      "This element is essential for reading. "
+      "Please install the right plug-in and verify "
+      "that it works by running 'gst-inspect %s'", element, element);
   gst_media_info_error_create (error, message);
   g_free (message);
   return;
@@ -230,7 +230,7 @@ gst_media_info_error_element (const gchar *element, GError **error)
 
 /* initialise priv; done the first time */
 gboolean
-gmip_init (GstMediaInfoPriv *priv, GError **error)
+gmip_init (GstMediaInfoPriv * priv, GError ** error)
 {
 #define GST_MEDIA_INFO_MAKE_OR_ERROR(el, factory, name, error)  \
 G_STMT_START {                                                  \
@@ -257,7 +257,7 @@ G_STMT_START {                                                  \
 /* called at the beginning of each use cycle */
 /* reset info to a state where it can be used to query for media info */
 void
-gmip_reset (GstMediaInfoPriv *priv)
+gmip_reset (GstMediaInfoPriv * priv)
 {
 
 #define STRING_RESET(string)	\
@@ -266,8 +266,8 @@ G_STMT_START {			\
   string = NULL;		\
 } G_STMT_END
 
-  STRING_RESET(priv->pipeline_desc);
-  STRING_RESET(priv->location);
+  STRING_RESET (priv->pipeline_desc);
+  STRING_RESET (priv->location);
 #undef STRING_RESET
 
 #define CAPS_RESET(target)		\
@@ -275,8 +275,8 @@ G_STMT_START {				\
   if (target) gst_caps_free (target);	\
   target = NULL;			\
 } G_STMT_END
-  CAPS_RESET(priv->type);
-  CAPS_RESET(priv->format);
+  CAPS_RESET (priv->type);
+  CAPS_RESET (priv->format);
 #undef CAPS_RESET
 
 #define TAGS_RESET(target)		\
@@ -285,12 +285,11 @@ G_STMT_START {				\
     gst_tag_list_free (target);		\
   target = NULL;			\
 } G_STMT_END
-  TAGS_RESET(priv->metadata);
-  TAGS_RESET(priv->streaminfo);
+  TAGS_RESET (priv->metadata);
+  TAGS_RESET (priv->streaminfo);
 #undef TAGS_RESET
 
-  if (priv->stream)
-  {
+  if (priv->stream) {
     gmi_stream_free (priv->stream);
     priv->stream = NULL;
   }
@@ -302,7 +301,7 @@ G_STMT_START {				\
 
 /* seek to a track and reset metadata and streaminfo structs */
 gboolean
-gmi_seek_to_track (GstMediaInfo *info, long track)
+gmi_seek_to_track (GstMediaInfo * info, long track)
 {
   GstEvent *event;
   GstFormat track_format = 0;
@@ -311,32 +310,28 @@ gmi_seek_to_track (GstMediaInfo *info, long track)
 
   /* FIXME: consider more nicks as "track" */
   track_format = gst_format_get_by_nick ("logical_stream");
-  if (track_format == 0) return FALSE;
+  if (track_format == 0)
+    return FALSE;
   GST_DEBUG ("Track format: %d", track_format);
 
   if (gst_element_set_state (priv->pipeline, GST_STATE_PLAYING)
-		            == GST_STATE_FAILURE)
+      == GST_STATE_FAILURE)
     g_warning ("Couldn't set to play");
   g_assert (GST_IS_PAD (info->priv->decoder_pad));
   event = gst_event_new_seek (track_format |
-		              GST_SEEK_METHOD_SET |
-			      GST_SEEK_FLAG_FLUSH,
-			      track);
+      GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, track);
   res = gst_pad_send_event (info->priv->decoder_pad, event);
-  if (!res)
-  {
+  if (!res) {
     g_warning ("seek to logical track on pad %s:%s failed",
-               GST_DEBUG_PAD_NAME(info->priv->decoder_pad));
+	GST_DEBUG_PAD_NAME (info->priv->decoder_pad));
     return FALSE;
   }
   /* clear structs because of the seek */
-  if (priv->metadata)
-  {
+  if (priv->metadata) {
     gst_tag_list_free (priv->metadata);
     priv->metadata = NULL;
   }
-  if (priv->streaminfo)
-  {
+  if (priv->streaminfo) {
     gst_tag_list_free (priv->streaminfo);
     priv->streaminfo = NULL;
   }
@@ -345,7 +340,7 @@ gmi_seek_to_track (GstMediaInfo *info, long track)
 
 /* set the mime type on the media info getter */
 gboolean
-gmi_set_mime (GstMediaInfo *info, const char *mime)
+gmi_set_mime (GstMediaInfo * info, const char *mime)
 {
   gchar *desc = NULL;
   GError *error = NULL;
@@ -354,31 +349,45 @@ gmi_set_mime (GstMediaInfo *info, const char *mime)
   /* FIXME: please figure out proper mp3 mimetypes */
   if ((strcmp (mime, "application/x-ogg") == 0) ||
       (strcmp (mime, "application/ogg") == 0))
-    desc = g_strdup_printf ("%s name=source ! oggdemux ! vorbisdec name=decoder ! fakesink name=sink", priv->source_name);
-  else if ((strcmp (mime, "audio/mpeg") == 0) ||
-           (strcmp (mime, "audio/x-mp3") == 0) ||
-           (strcmp (mime, "audio/mp3") == 0) ||
-           (strcmp (mime, "application/x-id3") == 0) ||
-	   (strcmp (mime, "audio/x-id3") == 0))
-    desc = g_strdup_printf ("%s name=source ! id3tag ! mad name=decoder ! audio/x-raw-int ! fakesink name=sink", priv->source_name);
-  else if ((strcmp (mime, "application/x-flac") == 0) ||
-           (strcmp (mime, "audio/x-flac") == 0))
-    desc = g_strdup_printf ("%s name=source ! flacdec name=decoder ! audio/x-raw-int ! fakesink name=sink", priv->source_name);
-  else if ((strcmp (mime, "audio/wav") == 0) ||
-           (strcmp (mime, "audio/x-wav") == 0))
-    desc = g_strdup_printf ("%s ! wavparse name=decoder ! audio/x-raw-int ! fakesink name=sink", priv->source_name);
-  else if (strcmp (mime, "audio/x-mod") == 0 ||
-	   strcmp (mime, "audio/x-s3m") == 0 ||
-           strcmp (mime, "audio/x-xm") == 0 ||
-	   strcmp (mime, "audio/x-it") == 0)
-    desc = g_strdup_printf ("%s name=source ! modplug name=decoder ! audio/x-raw-int ! fakesink name=sink", priv->source_name);
-  else return FALSE;
+    desc =
+	g_strdup_printf
+	("%s name=source ! oggdemux ! vorbisdec name=decoder ! fakesink name=sink",
+	priv->source_name);
+  else if ((strcmp (mime, "audio/mpeg") == 0)
+      || (strcmp (mime, "audio/x-mp3") == 0)
+      || (strcmp (mime, "audio/mp3") == 0)
+      || (strcmp (mime, "application/x-id3") == 0)
+      || (strcmp (mime, "audio/x-id3") == 0))
+    desc =
+	g_strdup_printf
+	("%s name=source ! id3tag ! mad name=decoder ! audio/x-raw-int ! fakesink name=sink",
+	priv->source_name);
+  else if ((strcmp (mime, "application/x-flac") == 0)
+      || (strcmp (mime, "audio/x-flac") == 0))
+    desc =
+	g_strdup_printf
+	("%s name=source ! flacdec name=decoder ! audio/x-raw-int ! fakesink name=sink",
+	priv->source_name);
+  else if ((strcmp (mime, "audio/wav") == 0)
+      || (strcmp (mime, "audio/x-wav") == 0))
+    desc =
+	g_strdup_printf
+	("%s ! wavparse name=decoder ! audio/x-raw-int ! fakesink name=sink",
+	priv->source_name);
+  else if (strcmp (mime, "audio/x-mod") == 0
+      || strcmp (mime, "audio/x-s3m") == 0 || strcmp (mime, "audio/x-xm") == 0
+      || strcmp (mime, "audio/x-it") == 0)
+    desc =
+	g_strdup_printf
+	("%s name=source ! modplug name=decoder ! audio/x-raw-int ! fakesink name=sink",
+	priv->source_name);
+  else
+    return FALSE;
 
   GST_DEBUG ("using description %s", desc);
   priv->pipeline_desc = desc;
   priv->pipeline = gst_parse_launch (desc, &error);
-  if (error)
-  {
+  if (error) {
     g_warning ("Error parsing pipeline description: %s\n", error->message);
     g_error_free (error);
     return FALSE;
@@ -398,25 +407,27 @@ gmi_set_mime (GstMediaInfo *info, const char *mime)
   /* get the "decoder" source pad */
   priv->decoder_pad = gst_element_get_pad (priv->decoder, "src");
   g_assert (GST_IS_PAD (priv->decoder_pad));
-  GST_DEBUG ("decoder pad: %s:%s", gst_object_get_name (gst_object_get_parent (GST_OBJECT (priv->decoder_pad))), gst_pad_get_name (priv->decoder_pad));
+  GST_DEBUG ("decoder pad: %s:%s",
+      gst_object_get_name (gst_object_get_parent (GST_OBJECT (priv->
+		  decoder_pad))), gst_pad_get_name (priv->decoder_pad));
 
   /* attach notify handler */
   g_signal_connect (G_OBJECT (info->priv->pipeline), "deep_notify",
-                    G_CALLBACK (deep_notify_callback), info->priv);
-  g_signal_connect (G_OBJECT (info->priv->pipeline), "found-tag",                     G_CALLBACK (found_tag_callback), info->priv);
+      G_CALLBACK (deep_notify_callback), info->priv);
+  g_signal_connect (G_OBJECT (info->priv->pipeline), "found-tag",
+      G_CALLBACK (found_tag_callback), info->priv);
   g_signal_connect (G_OBJECT (info->priv->pipeline), "error",
-                    G_CALLBACK (error_callback), info->priv);
+      G_CALLBACK (error_callback), info->priv);
 
   return TRUE;
 }
 
 /* clear the decoding pipeline */
 void
-gmi_clear_decoder (GstMediaInfo *info)
+gmi_clear_decoder (GstMediaInfo * info)
 {
-  if (info->priv->pipeline)
-  {
-    GST_DEBUG("Unreffing pipeline");
+  if (info->priv->pipeline) {
+    GST_DEBUG ("Unreffing pipeline");
     gst_object_unref (GST_OBJECT (info->priv->pipeline));
   }
   info->priv->pipeline = NULL;
@@ -430,7 +441,7 @@ gmi_clear_decoder (GstMediaInfo *info)
 
 /* prepare for typefind, move from NULL to TYPEFIND */
 gboolean
-gmip_find_type_pre (GstMediaInfoPriv *priv, GError **error)
+gmip_find_type_pre (GstMediaInfoPriv * priv, GError ** error)
 {
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
@@ -440,23 +451,21 @@ gmip_find_type_pre (GstMediaInfoPriv *priv, GError **error)
    * just use it through this function only */
 
   priv->pipeline = gst_pipeline_new ("pipeline-typefind");
-  if (!GST_IS_PIPELINE (priv->pipeline))
-  {
+  if (!GST_IS_PIPELINE (priv->pipeline)) {
     gst_media_info_error_create (error, "Internal GStreamer error.");
     return FALSE;
   }
   gst_bin_add (GST_BIN (priv->pipeline), priv->typefind);
   GST_MEDIA_INFO_MAKE_OR_ERROR (priv->source, priv->source_name, "source",
-                             error);
+      error);
   g_object_set (G_OBJECT (priv->source), "location", priv->location, NULL);
   gst_bin_add (GST_BIN (priv->pipeline), priv->source);
   if (!gst_element_link (priv->source, priv->typefind))
     g_warning ("Couldn't connect source and typefind\n");
   g_signal_connect (G_OBJECT (priv->typefind), "have-type",
-		    G_CALLBACK (have_type_callback), priv);
+      G_CALLBACK (have_type_callback), priv);
   if (gst_element_set_state (priv->pipeline, GST_STATE_PLAYING)
-		            == GST_STATE_FAILURE)
-  {
+      == GST_STATE_FAILURE) {
     g_warning ("Couldn't set to play");
     return FALSE;
   }
@@ -467,24 +476,20 @@ gmip_find_type_pre (GstMediaInfoPriv *priv, GError **error)
 
 /* finish off typefind */
 gboolean
-gmip_find_type_post (GstMediaInfoPriv *priv)
+gmip_find_type_post (GstMediaInfoPriv * priv)
 {
   /*clear up typefind */
   gst_element_set_state (priv->pipeline, GST_STATE_READY);
-  if (priv->decontainer)
-  {
+  if (priv->decontainer) {
     gst_element_unlink (priv->source, priv->decontainer);
     gst_element_unlink (priv->decontainer, priv->typefind);
     gst_bin_remove (GST_BIN (priv->pipeline), priv->decontainer);
-  }
-  else
-  {
+  } else {
     gst_element_unlink (priv->source, priv->typefind);
   }
   gst_bin_remove (GST_BIN (priv->pipeline), priv->typefind);
 
-  if (priv->type == NULL)
-  {
+  if (priv->type == NULL) {
     g_warning ("iteration ended, type not found !\n");
     return FALSE;
   }
@@ -495,25 +500,23 @@ gmip_find_type_post (GstMediaInfoPriv *priv)
 
 /* complete version */
 gboolean
-gmip_find_type (GstMediaInfoPriv *priv, GError ** error)
+gmip_find_type (GstMediaInfoPriv * priv, GError ** error)
 {
   if (!gmip_find_type_pre (priv, error))
     return FALSE;
   GST_DEBUG ("gmip_find_type: iterating");
-  while ((priv->type == NULL) &&
-	 gst_bin_iterate (GST_BIN (priv->pipeline)))
-    GMI_DEBUG("+");
-  GMI_DEBUG("\n");
+  while ((priv->type == NULL) && gst_bin_iterate (GST_BIN (priv->pipeline)))
+    GMI_DEBUG ("+");
+  GMI_DEBUG ("\n");
   return gmip_find_type_post (priv);
 }
 
 /* FIXME: why not have these functions work on priv types ? */
 gboolean
-gmip_find_stream_pre (GstMediaInfoPriv *priv)
+gmip_find_stream_pre (GstMediaInfoPriv * priv)
 {
   if (gst_element_set_state (priv->pipeline, GST_STATE_PLAYING)
-		            == GST_STATE_FAILURE)
-  {
+      == GST_STATE_FAILURE) {
     g_warning ("Couldn't set to play");
     return FALSE;
   }
@@ -522,7 +525,7 @@ gmip_find_stream_pre (GstMediaInfoPriv *priv)
 }
 
 gboolean
-gmip_find_stream_post (GstMediaInfoPriv *priv)
+gmip_find_stream_post (GstMediaInfoPriv * priv)
 {
   GstMediaInfoStream *stream = priv->stream;
   const GstFormat *formats;
@@ -541,8 +544,7 @@ gmip_find_stream_post (GstMediaInfoPriv *priv)
 
   /* get supported formats on decoder pad */
   formats = gst_pad_get_formats (priv->decoder_pad);
-  while (*formats)
-  {
+  while (*formats) {
     const GstFormatDefinition *definition;
 
     format = *formats;
@@ -551,16 +553,13 @@ gmip_find_stream_post (GstMediaInfoPriv *priv)
     definition = gst_format_get_details (*formats);
     GST_DEBUG ("trying to figure out length for format %s", definition->nick);
 
-    res = gst_pad_query (priv->decoder_pad, GST_QUERY_TOTAL,
-                         &format, &value);
+    res = gst_pad_query (priv->decoder_pad, GST_QUERY_TOTAL, &format, &value);
 
-    if (res)
-    {
-      switch (format)
-      {
-        case GST_FORMAT_TIME:
-          stream->length_time = value;
-          GST_DEBUG ("  total %s: %lld", definition->nick, value);
+    if (res) {
+      switch (format) {
+	case GST_FORMAT_TIME:
+	  stream->length_time = value;
+	  GST_DEBUG ("  total %s: %lld", definition->nick, value);
 	  break;
 	case GST_FORMAT_DEFAULT:
 	case GST_FORMAT_BYTES:
@@ -568,35 +567,33 @@ gmip_find_stream_post (GstMediaInfoPriv *priv)
 	default:
 	  /* separation is necessary because track_format doesn't resolve to
 	   * int */
-	  if (format == track_format)
-	  {
+	  if (format == track_format) {
 	    stream->length_tracks = value;
-            GST_DEBUG ("  total %s: %lld", definition->nick, value);
-	  }
-	  else
+	    GST_DEBUG ("  total %s: %lld", definition->nick, value);
+	  } else
 	    GST_DEBUG ("unhandled format %s", definition->nick);
       }
-    }
-    else
+    } else
       GST_DEBUG ("query didn't return result for %s", definition->nick);
 
     formats++;
   }
-  if (stream->length_tracks == 0) stream->length_tracks = 1;
+  if (stream->length_tracks == 0)
+    stream->length_tracks = 1;
 
   /* now get number of bytes from the sink pad to get the bitrate */
   format = GST_FORMAT_BYTES;
   g_assert (GST_IS_PAD (priv->source_pad));
-  res = gst_pad_query (priv->source_pad, GST_QUERY_TOTAL,
-                       &format, &value);
-  if (!res) g_warning ("Failed to query on sink pad !");
+  res = gst_pad_query (priv->source_pad, GST_QUERY_TOTAL, &format, &value);
+  if (!res)
+    g_warning ("Failed to query on sink pad !");
   bytes = value;
   GST_DEBUG ("bitrate calc: bytes gotten: %ld", bytes);
 
-  if (bytes)
-  {
+  if (bytes) {
     double seconds = (double) stream->length_time / GST_SECOND;
     double bits = bytes * 8;
+
     stream->bitrate = (long) (bits / seconds);
   }
   GST_DEBUG ("moving to STATE_METADATA\n");
@@ -607,7 +604,7 @@ gmip_find_stream_post (GstMediaInfoPriv *priv)
 /* get properties of complete physical stream
  * and return them in pre-alloced stream struct in priv->stream */
 gboolean
-gmip_find_stream (GstMediaInfoPriv *priv)
+gmip_find_stream (GstMediaInfoPriv * priv)
 {
   GST_DEBUG ("mip_find_stream start");
 
@@ -615,16 +612,13 @@ gmip_find_stream (GstMediaInfoPriv *priv)
   /* iterate until caps are found */
   /* FIXME: this should be done through the plugin sending some signal
    * that it is ready for queries */
-  while (gst_bin_iterate (GST_BIN (priv->pipeline)) &&
-	 priv->format == NULL)
-    ;
+  while (gst_bin_iterate (GST_BIN (priv->pipeline)) && priv->format == NULL);
   if (gst_element_set_state (priv->pipeline, GST_STATE_PAUSED)
-		            == GST_STATE_FAILURE)
+      == GST_STATE_FAILURE)
     g_warning ("Couldn't set to paused");
 
-  if (priv->format == NULL)
-  {
-    GMI_DEBUG("gmip_find_stream: couldn't get caps !");
+  if (priv->format == NULL) {
+    GMI_DEBUG ("gmip_find_stream: couldn't get caps !");
     return FALSE;
   }
   return gmip_find_stream_post (priv);
@@ -632,14 +626,13 @@ gmip_find_stream (GstMediaInfoPriv *priv)
 
 /* find metadata encoded in media and store in priv->metadata */
 gboolean
-gmip_find_track_metadata_pre (GstMediaInfoPriv *priv)
+gmip_find_track_metadata_pre (GstMediaInfoPriv * priv)
 {
   /* FIXME: this is a hack to set max allowed iterations for metadata
    * querying - we should make gst smarter by itself instead */
   priv->metadata_iters = 0;
   if (gst_element_set_state (priv->pipeline, GST_STATE_PLAYING)
-		            == GST_STATE_FAILURE)
-  {
+      == GST_STATE_FAILURE) {
     g_warning ("Couldn't set to play");
     return FALSE;
   }
@@ -647,10 +640,10 @@ gmip_find_track_metadata_pre (GstMediaInfoPriv *priv)
 }
 
 gboolean
-gmip_find_track_metadata_post (GstMediaInfoPriv *priv)
+gmip_find_track_metadata_post (GstMediaInfoPriv * priv)
 {
   if (gst_element_set_state (priv->pipeline, GST_STATE_PAUSED)
-		            == GST_STATE_FAILURE)
+      == GST_STATE_FAILURE)
     return FALSE;
   priv->current_track->metadata = priv->metadata;
   priv->metadata = NULL;
@@ -658,14 +651,13 @@ gmip_find_track_metadata_post (GstMediaInfoPriv *priv)
 }
 
 gboolean
-gmip_find_track_metadata (GstMediaInfoPriv *priv)
+gmip_find_track_metadata (GstMediaInfoPriv * priv)
 {
   gmip_find_track_metadata_pre (priv);
   GST_DEBUG ("gmip_find_metadata: iterating");
-  while ((priv->metadata == NULL) &&
-	 gst_bin_iterate (GST_BIN (priv->pipeline)))
-    GMI_DEBUG("+");
-  GMI_DEBUG("\n");
+  while ((priv->metadata == NULL) && gst_bin_iterate (GST_BIN (priv->pipeline)))
+    GMI_DEBUG ("+");
+  GMI_DEBUG ("\n");
   gmip_find_track_metadata_post (priv);
 
   return TRUE;
@@ -674,11 +666,10 @@ gmip_find_track_metadata (GstMediaInfoPriv *priv)
 /* find streaminfo found by decoder and store in priv->streaminfo */
 /* FIXME: this is an exact copy, so reuse this function instead */
 gboolean
-gmip_find_track_streaminfo_pre (GstMediaInfoPriv *priv)
+gmip_find_track_streaminfo_pre (GstMediaInfoPriv * priv)
 {
   if (gst_element_set_state (priv->pipeline, GST_STATE_PLAYING)
-		            == GST_STATE_FAILURE)
-  {
+      == GST_STATE_FAILURE) {
     g_warning ("Couldn't set to play");
     return FALSE;
   }
@@ -686,7 +677,7 @@ gmip_find_track_streaminfo_pre (GstMediaInfoPriv *priv)
 }
 
 gboolean
-gmip_find_track_streaminfo_post (GstMediaInfoPriv *priv)
+gmip_find_track_streaminfo_post (GstMediaInfoPriv * priv)
 {
   GstFormat format, track_format;
 
@@ -694,33 +685,26 @@ gmip_find_track_streaminfo_post (GstMediaInfoPriv *priv)
 
   /* now add total length to this, and maybe even bitrate ? FIXME */
   track_format = gst_format_get_by_nick ("logical_stream");
-  if (track_format == 0)
-  {
+  if (track_format == 0) {
     g_print ("FIXME: implement getting length of whole track\n");
-  }
-  else
-  {
+  } else {
     /* which one are we at ? */
     long track_num;
     gint64 value_start, value_end;
     gboolean res;
 
     res = gst_pad_query (priv->decoder_pad, GST_QUERY_POSITION,
-		         &track_format, &value_start);
-    if (res)
-    {
+	&track_format, &value_start);
+    if (res) {
       format = GST_FORMAT_TIME;
       track_num = value_start;
       GST_DEBUG ("we are currently at %ld", track_num);
-      res = gst_pad_convert  (priv->decoder_pad,
-		              track_format, track_num,
-			      &format, &value_start);
+      res = gst_pad_convert (priv->decoder_pad,
+	  track_format, track_num, &format, &value_start);
       res &= gst_pad_convert (priv->decoder_pad,
-			      track_format, track_num + 1,
-                              &format, &value_end);
-      if (res)
-      {
-        /* substract to get the length */
+	  track_format, track_num + 1, &format, &value_end);
+      if (res) {
+	/* substract to get the length */
 	GST_DEBUG ("start %lld, end %lld", value_start, value_end);
 	value_end -= value_start;
 	/* FIXME: check units; this is in seconds */
@@ -737,14 +721,14 @@ gmip_find_track_streaminfo_post (GstMediaInfoPriv *priv)
 }
 
 gboolean
-gmip_find_track_streaminfo (GstMediaInfoPriv *priv)
+gmip_find_track_streaminfo (GstMediaInfoPriv * priv)
 {
   gmip_find_track_streaminfo_pre (priv);
   GST_DEBUG ("DEBUG: gmip_find_streaminfo: iterating");
   while ((priv->streaminfo == NULL) &&
-	 gst_bin_iterate (GST_BIN (priv->pipeline)))
-    GMI_DEBUG("+");
-  GMI_DEBUG("\n");
+      gst_bin_iterate (GST_BIN (priv->pipeline)))
+    GMI_DEBUG ("+");
+  GMI_DEBUG ("\n");
   gmip_find_track_streaminfo_post (priv);
 
   return TRUE;
@@ -752,11 +736,10 @@ gmip_find_track_streaminfo (GstMediaInfoPriv *priv)
 
 /* find format found by decoder and store in priv->format */
 gboolean
-gmip_find_track_format_pre (GstMediaInfoPriv *priv)
+gmip_find_track_format_pre (GstMediaInfoPriv * priv)
 {
   if (gst_element_set_state (priv->pipeline, GST_STATE_PLAYING)
-		            == GST_STATE_FAILURE)
-  {
+      == GST_STATE_FAILURE) {
     g_warning ("Couldn't set to play");
     return FALSE;
   }
@@ -764,10 +747,10 @@ gmip_find_track_format_pre (GstMediaInfoPriv *priv)
 }
 
 gboolean
-gmip_find_track_format_post (GstMediaInfoPriv *priv)
+gmip_find_track_format_post (GstMediaInfoPriv * priv)
 {
   if (gst_element_set_state (priv->pipeline, GST_STATE_PAUSED)
-		            == GST_STATE_FAILURE)
+      == GST_STATE_FAILURE)
     return FALSE;
   priv->current_track->format = priv->format;
   priv->format = NULL;
@@ -775,17 +758,14 @@ gmip_find_track_format_post (GstMediaInfoPriv *priv)
 }
 
 gboolean
-gmip_find_track_format (GstMediaInfoPriv *priv)
+gmip_find_track_format (GstMediaInfoPriv * priv)
 {
   gmip_find_track_format_pre (priv);
   GST_DEBUG ("DEBUG: gmip_find_format: iterating");
-  while ((priv->format == NULL) &&
-	 gst_bin_iterate (GST_BIN (priv->pipeline)))
-    GMI_DEBUG("+");
-  GMI_DEBUG("\n");
+  while ((priv->format == NULL) && gst_bin_iterate (GST_BIN (priv->pipeline)))
+    GMI_DEBUG ("+");
+  GMI_DEBUG ("\n");
   gmip_find_track_format_post (priv);
 
   return TRUE;
 }
-
-
diff --git a/gst-libs/gst/media-info/media-info-priv.h b/gst-libs/gst/media-info/media-info-priv.h
index 81ee24ab..8f0f453f 100644
--- a/gst-libs/gst/media-info/media-info-priv.h
+++ b/gst-libs/gst/media-info/media-info-priv.h
@@ -72,69 +72,65 @@ struct GstMediaInfoPriv
   gint metadata_iters;
   GstTagList *streaminfo;
 
-  GstElement *pipeline;                 /* will be != NULL during collection */
-  gchar *pipeline_desc;                 /* will be != NULL during collection */
-  GstElement *fakesink;			/* so we can get caps from the
-                                           decoder sink pad */
-  gchar *source_name;                   /* type of element used as source */
+  GstElement *pipeline;		/* will be != NULL during collection */
+  gchar *pipeline_desc;		/* will be != NULL during collection */
+  GstElement *fakesink;		/* so we can get caps from the
+				   decoder sink pad */
+  gchar *source_name;		/* type of element used as source */
   GstElement *source;
-  GstPad *source_pad;                   /* pad for querying encoded caps */
+  GstPad *source_pad;		/* pad for querying encoded caps */
   GstElement *decoder;
-  GstPad *decoder_pad;                  /* pad for querying decoded caps */
-  GstElement *decontainer;		/* element to typefind in containers */
+  GstPad *decoder_pad;		/* pad for querying decoded caps */
+  GstElement *decontainer;	/* element to typefind in containers */
 
-  GstMediaInfoState state;              /* current state of state machine */
-  gchar *location;                      /* location set on the info object */
-  guint16 flags;                        /* flags supplied for detection */
-  GstMediaInfoTrack *current_track;     /* track pointer under inspection */
-  glong current_track_num;              /* current track under inspection */
+  GstMediaInfoState state;	/* current state of state machine */
+  gchar *location;		/* location set on the info object */
+  guint16 flags;		/* flags supplied for detection */
+  GstMediaInfoTrack *current_track;	/* track pointer under inspection */
+  glong current_track_num;	/* current track under inspection */
 
-  GstMediaInfoStream *stream;           /* total stream properties */
-  char *cache;                          /* location of cache */
+  GstMediaInfoStream *stream;	/* total stream properties */
+  char *cache;			/* location of cache */
 
-  GError *error;			/* error for creation problems */
+  GError *error;		/* error for creation problems */
 };
 
 /* declarations */
-GstMediaInfoStream *
-		gmi_stream_new			(void);
-void		gmi_stream_free			(GstMediaInfoStream *stream);
-
-GstMediaInfoTrack *
-		gmi_track_new			(void);
-
-void		gmip_reset			(GstMediaInfoPriv *priv);
-gboolean	gmip_init			(GstMediaInfoPriv *priv, GError **error);
-
-void		gmi_clear_decoder		(GstMediaInfo *info);
-
-gboolean	gmi_seek_to_track		(GstMediaInfo *info,
-		                                 long track);
-
-gboolean	gmi_set_mime			(GstMediaInfo *info,
-		                                 const char *mime);
-
-void		deep_notify_callback            (GObject *object,
-		                                 GstObject *origin,
-						 GParamSpec *pspec,
-						 GstMediaInfoPriv *priv);
-void		found_tag_callback		(GObject *pipeline, GstElement *source, GstTagList *tags, GstMediaInfoPriv *priv);
-void		error_callback			(GObject *element, GstElement *source, GError *error, gchar *debug, GstMediaInfoPriv *priv);
-
-gboolean	gmip_find_type_pre		(GstMediaInfoPriv *priv, GError **error);
-gboolean	gmip_find_type_post		(GstMediaInfoPriv *priv);
-gboolean	gmip_find_type			(GstMediaInfoPriv *priv, GError **error);
-gboolean	gmip_find_stream_pre		(GstMediaInfoPriv *priv);
-gboolean	gmip_find_stream_post		(GstMediaInfoPriv *priv);
-gboolean	gmip_find_stream			(GstMediaInfoPriv *priv);
-gboolean	gmip_find_track_metadata_pre	(GstMediaInfoPriv *priv);
-gboolean	gmip_find_track_metadata_post	(GstMediaInfoPriv *priv);
-gboolean	gmip_find_track_metadata		(GstMediaInfoPriv *priv);
-gboolean	gmip_find_track_streaminfo_pre	(GstMediaInfoPriv *priv);
-gboolean	gmip_find_track_streaminfo_post	(GstMediaInfoPriv *priv);
-gboolean	gmip_find_track_streaminfo	(GstMediaInfoPriv *priv);
-gboolean	gmip_find_track_format_pre	(GstMediaInfoPriv *priv);
-gboolean	gmip_find_track_format_post	(GstMediaInfoPriv *priv);
-gboolean	gmip_find_track_format		(GstMediaInfoPriv *priv);
+GstMediaInfoStream *gmi_stream_new (void);
+void gmi_stream_free (GstMediaInfoStream * stream);
+
+GstMediaInfoTrack *gmi_track_new (void);
+
+void gmip_reset (GstMediaInfoPriv * priv);
+gboolean gmip_init (GstMediaInfoPriv * priv, GError ** error);
+
+void gmi_clear_decoder (GstMediaInfo * info);
+
+gboolean gmi_seek_to_track (GstMediaInfo * info, long track);
+
+gboolean gmi_set_mime (GstMediaInfo * info, const char *mime);
+
+void deep_notify_callback (GObject * object,
+    GstObject * origin, GParamSpec * pspec, GstMediaInfoPriv * priv);
+void found_tag_callback (GObject * pipeline, GstElement * source,
+    GstTagList * tags, GstMediaInfoPriv * priv);
+void error_callback (GObject * element, GstElement * source, GError * error,
+    gchar * debug, GstMediaInfoPriv * priv);
+
+gboolean gmip_find_type_pre (GstMediaInfoPriv * priv, GError ** error);
+gboolean gmip_find_type_post (GstMediaInfoPriv * priv);
+gboolean gmip_find_type (GstMediaInfoPriv * priv, GError ** error);
+gboolean gmip_find_stream_pre (GstMediaInfoPriv * priv);
+gboolean gmip_find_stream_post (GstMediaInfoPriv * priv);
+gboolean gmip_find_stream (GstMediaInfoPriv * priv);
+gboolean gmip_find_track_metadata_pre (GstMediaInfoPriv * priv);
+gboolean gmip_find_track_metadata_post (GstMediaInfoPriv * priv);
+gboolean gmip_find_track_metadata (GstMediaInfoPriv * priv);
+gboolean gmip_find_track_streaminfo_pre (GstMediaInfoPriv * priv);
+gboolean gmip_find_track_streaminfo_post (GstMediaInfoPriv * priv);
+gboolean gmip_find_track_streaminfo (GstMediaInfoPriv * priv);
+gboolean gmip_find_track_format_pre (GstMediaInfoPriv * priv);
+gboolean gmip_find_track_format_post (GstMediaInfoPriv * priv);
+gboolean gmip_find_track_format (GstMediaInfoPriv * priv);
 
 #endif /* __GST_MEDIA_INFO_PRIV_H__ */
diff --git a/gst-libs/gst/media-info/media-info-test.c b/gst-libs/gst/media-info/media-info-test.c
index 496267d9..67a16cdc 100644
--- a/gst-libs/gst/media-info/media-info-test.c
+++ b/gst-libs/gst/media-info/media-info-test.c
@@ -5,7 +5,7 @@
 #include "media-info.h"
 
 static void
-print_tag (const GstTagList *list, const gchar *tag, gpointer unused)
+print_tag (const GstTagList * list, const gchar * tag, gpointer unused)
 {
   gint i, count;
 
@@ -17,8 +17,8 @@ print_tag (const GstTagList *list, const gchar *tag, gpointer unused)
     if (gst_tag_get_type (tag) == G_TYPE_STRING) {
       g_assert (gst_tag_list_get_string_index (list, tag, i, &str));
     } else {
-      str = g_strdup_value_contents (
-              gst_tag_list_get_value_index (list, tag, i));
+      str =
+	  g_strdup_value_contents (gst_tag_list_get_value_index (list, tag, i));
     }
 
     if (i == 0) {
@@ -32,7 +32,7 @@ print_tag (const GstTagList *list, const gchar *tag, gpointer unused)
 }
 
 static void
-info_print (GstMediaInfoStream *stream)
+info_print (GstMediaInfoStream * stream)
 {
   int i;
   GList *p;
@@ -40,17 +40,15 @@ info_print (GstMediaInfoStream *stream)
 
   g_print ("- mime type: %s\n", stream->mime);
   g_print ("- length: %.3f seconds\n",
-	   (gdouble) stream->length_time / GST_SECOND);
+      (gdouble) stream->length_time / GST_SECOND);
   g_print ("- bitrate: %.3f kbps\n", stream->bitrate / 1000.0);
   g_print ("- number of tracks: %ld\n", stream->length_tracks);
   p = stream->tracks;
-  if (p == NULL)
-  {
+  if (p == NULL) {
     g_print ("- no track information, probably an error\n");
     return;
   }
-  for (i = 0; i < stream->length_tracks; ++i)
-  {
+  for (i = 0; i < stream->length_tracks; ++i) {
     g_print ("- track %d\n", i);
     track = (GstMediaInfoTrack *) p->data;
     g_print ("  - metadata:\n");
@@ -80,16 +78,14 @@ main (int argc, char *argv[])
   gst_init (&argc, &argv);
 
   info = gst_media_info_new (&error);
-  if (error != NULL)
-  {
+  if (error != NULL) {
     g_print ("Error creating media-info object: %s\n", error->message);
     g_error_free (error);
     return -1;
   }
 
   g_assert (G_IS_OBJECT (info));
-  if (!gst_media_info_set_source (info, "gnomevfssrc", &error))
-  {
+  if (!gst_media_info_set_source (info, "gnomevfssrc", &error)) {
     g_print ("Could not set gnomevfssrc as a source\n");
     g_print ("reason: %s\n", error->message);
     g_error_free (error);
@@ -97,19 +93,18 @@ main (int argc, char *argv[])
   }
 
   g_print ("stream: %p, &stream: %p\n", stream, &stream);
-  for (i = 1; i < argc; ++i)
-  {
+  for (i = 1; i < argc; ++i) {
 
     /*
-    stream = gst_media_info_read (info, argv[i], GST_MEDIA_INFO_ALL);
-    */
+       stream = gst_media_info_read (info, argv[i], GST_MEDIA_INFO_ALL);
+     */
     gst_media_info_read_with_idler (info, argv[i], GST_MEDIA_INFO_ALL, &error);
     while (gst_media_info_read_idler (info, &stream, &error) && stream == NULL)
-      /* keep idling */ g_print ("+");
+      /* keep idling */
+      g_print ("+");
     g_print ("\nFILE: %s\n", argv[i]);
     g_print ("stream: %p, &stream: %p\n", stream, &stream);
-    if (error)
-    {
+    if (error) {
       g_print ("Error reading media info: %s\n", error->message);
       g_error_free (error);
     }
diff --git a/gst-libs/gst/media-info/media-info.c b/gst-libs/gst/media-info/media-info.c
index 902b6cef..4f995359 100644
--- a/gst-libs/gst/media-info/media-info.c
+++ b/gst-libs/gst/media-info/media-info.c
@@ -26,12 +26,11 @@
 #include "media-info.h"
 #include "media-info-priv.h"
 
-static void	gst_media_info_class_init	(GstMediaInfoClass *klass);
-static void	gst_media_info_instance_init	(GstMediaInfo *info);
+static void gst_media_info_class_init (GstMediaInfoClass * klass);
+static void gst_media_info_instance_init (GstMediaInfo * info);
 
-static void	gst_media_info_get_property     (GObject *object, guint prop_id,
-						 GValue *value,
-						 GParamSpec *pspec);
+static void gst_media_info_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
 
 
 static gboolean _media_info_inited = FALSE;
@@ -64,6 +63,7 @@ GQuark
 gst_media_info_error_quark (void)
 {
   static GQuark quark = 0;
+
   if (quark == 0)
     quark = g_quark_from_static_string ("gst-media-info-error-quark");
   return quark;
@@ -86,11 +86,12 @@ GST_DEBUG_CATEGORY (gst_media_info_debug);
 void
 gst_media_info_init (void)
 {
-  if (_media_info_inited) return;
+  if (_media_info_inited)
+    return;
 
   /* register our debugging category */
   GST_DEBUG_CATEGORY_INIT (gst_media_info_debug, "GST_MEDIA_INFO", 0,
-                           "GStreamer media-info library");
+      "GStreamer media-info library");
   GST_DEBUG ("Initialized media-info library");
   _media_info_inited = TRUE;
 }
@@ -99,8 +100,8 @@ GType
 gst_media_info_get_type (void)
 {
   static GType gst_media_info_type = 0;
-  if (!gst_media_info_type)
-  {
+
+  if (!gst_media_info_type) {
     static const GTypeInfo gst_media_info_info = {
       sizeof (GstMediaInfoClass),
       (GBaseInitFunc) NULL,
@@ -113,14 +114,13 @@ gst_media_info_get_type (void)
       NULL
     };
     gst_media_info_type = g_type_register_static (G_TYPE_OBJECT,
-		                                  "GstMediaInfo",
-		                                  &gst_media_info_info, 0);
+	"GstMediaInfo", &gst_media_info_info, 0);
   }
   return gst_media_info_type;
 }
 
 static void
-gst_media_info_class_init (GstMediaInfoClass *klass)
+gst_media_info_class_init (GstMediaInfoClass * klass)
 {
   GObjectClass *g_object_class = G_OBJECT_CLASS (klass);
 
@@ -129,36 +129,36 @@ gst_media_info_class_init (GstMediaInfoClass *klass)
 
 
   /*
-  object_class->finalize = gst_media_info_finalize;
-  object_class->dispose  = gst_media_info_dispose;
-  */
+     object_class->finalize = gst_media_info_finalize;
+     object_class->dispose  = gst_media_info_dispose;
+   */
 
   /*
-  g_object_class->set_property = gst_media_info_set_property;
-  */
+     g_object_class->set_property = gst_media_info_set_property;
+   */
   g_object_class->get_property = gst_media_info_get_property;
 
   klass->media_info_signal = NULL;
 
-  gst_media_info_signals [MEDIA_INFO_SIGNAL] =
-    g_signal_new ("media-info",
-		  G_TYPE_FROM_CLASS (klass),
-		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GstMediaInfoClass, media_info_signal),
-		  NULL, NULL,
-		  gst_marshal_VOID__VOID,
-		  G_TYPE_NONE, 0);
+  gst_media_info_signals[MEDIA_INFO_SIGNAL] =
+      g_signal_new ("media-info",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST,
+      G_STRUCT_OFFSET (GstMediaInfoClass, media_info_signal),
+      NULL, NULL, gst_marshal_VOID__VOID, G_TYPE_NONE, 0);
 }
 
 static void
-gst_media_info_instance_init (GstMediaInfo *info)
+gst_media_info_instance_init (GstMediaInfo * info)
 {
   GError **error;
 
   info->priv = g_new0 (GstMediaInfoPriv, 1);
   error = &info->priv->error;
 
-  if (!_media_info_inited) { gst_media_info_init (); }
+  if (!_media_info_inited) {
+    gst_media_info_init ();
+  }
 
   gmip_init (info->priv, error);
   gmip_reset (info->priv);
@@ -166,13 +166,12 @@ gst_media_info_instance_init (GstMediaInfo *info)
 
 /* get/set */
 static void
-gst_media_info_get_property (GObject *object, guint prop_id,
-			     GValue *value, GParamSpec *pspec)
+gst_media_info_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
 {
   GstMediaInfo *info = GST_MEDIA_INFO (object);
 
-  switch (prop_id)
-  {
+  switch (prop_id) {
     case PROP_SOURCE:
       g_value_set_string (value, info->priv->source_name);
       break;
@@ -183,21 +182,17 @@ gst_media_info_get_property (GObject *object, guint prop_id,
 }
 
 GstMediaInfo *
-gst_media_info_new (GError **error)
+gst_media_info_new (GError ** error)
 {
   GstMediaInfo *info = g_object_new (GST_MEDIA_INFO_TYPE, NULL);
 
-  if (info->priv->error)
-  {
-    if (error)
-    {
+  if (info->priv->error) {
+    if (error) {
       *error = info->priv->error;
       info->priv->error = NULL;
-    }
-    else
-    {
+    } else {
       g_warning ("Error creating GstMediaInfo object.\n%s",
-                 info->priv->error->message);
+	  info->priv->error->message);
       g_error_free (info->priv->error);
     }
   }
@@ -208,7 +203,8 @@ gst_media_info_new (GError **error)
  * public methods
  */
 gboolean
-gst_media_info_set_source (GstMediaInfo *info, const char *source, GError **error)
+gst_media_info_set_source (GstMediaInfo * info, const char *source,
+    GError ** error)
 {
   info->priv->source_name = g_strdup (source);
   return TRUE;
@@ -221,12 +217,12 @@ gst_media_info_set_source (GstMediaInfo *info, const char *source, GError **erro
  * previous one is done ?
  */
 void
-gst_media_info_read_with_idler (GstMediaInfo *info, const char *location,
-		                guint16 flags, GError **error)
+gst_media_info_read_with_idler (GstMediaInfo * info, const char *location,
+    guint16 flags, GError ** error)
 {
   GstMediaInfoPriv *priv = info->priv;
 
-  gmip_reset (info->priv);		/* reset all structs */
+  gmip_reset (info->priv);	/* reset all structs */
   priv->location = g_strdup (location);
   priv->flags = flags;
 }
@@ -236,12 +232,14 @@ gst_media_info_read_with_idler (GstMediaInfo *info, const char *location,
  * returns: TRUE if it was able to idle, FALSE if there was an error
  */
 gboolean
-gst_media_info_read_idler (GstMediaInfo *info, GstMediaInfoStream **streamp, GError **error)
+gst_media_info_read_idler (GstMediaInfo * info, GstMediaInfoStream ** streamp,
+    GError ** error)
 {
   GstMediaInfoPriv *priv;
 
   /* if it's NULL then we're sure something went wrong higher up) */
-  if (info == NULL) return FALSE;
+  if (info == NULL)
+    return FALSE;
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
   priv = info->priv;
@@ -249,15 +247,13 @@ gst_media_info_read_idler (GstMediaInfo *info, GstMediaInfoStream **streamp, GEr
   g_assert (streamp != NULL);
   g_assert (priv);
 
-  switch (priv->state)
-  {
+  switch (priv->state) {
     case GST_MEDIA_INFO_STATE_NULL:
       /* make sure we have a source */
-      if (!priv->source_name)
-      {
-        *error = g_error_new (GST_MEDIA_INFO_ERROR, 0,
-                              "No source set on media info.");
-        return FALSE;
+      if (!priv->source_name) {
+	*error = g_error_new (GST_MEDIA_INFO_ERROR, 0,
+	    "No source set on media info.");
+	return FALSE;
       }
 
       /* need to find type */
@@ -269,29 +265,27 @@ gst_media_info_read_idler (GstMediaInfo *info, GstMediaInfoStream **streamp, GEr
       gchar *mime;
 
       GST_LOG ("STATE_TYPEFIND");
-      if ((priv->type == NULL) && gst_bin_iterate (GST_BIN (priv->pipeline)))
-      {
+      if ((priv->type == NULL) && gst_bin_iterate (GST_BIN (priv->pipeline))) {
 	GST_DEBUG ("iterating while in STATE_TYPEFIND");
-	GMI_DEBUG("?");
-        return TRUE;
+	GMI_DEBUG ("?");
+	return TRUE;
       }
-      if (priv->type == NULL)
-      {
-        g_warning ("Couldn't find type\n");
+      if (priv->type == NULL) {
+	g_warning ("Couldn't find type\n");
 	return FALSE;
       }
       /* do the state transition */
       GST_DEBUG ("doing find_type_post");
       gmip_find_type_post (priv);
       GST_DEBUG ("finding out mime type");
-      mime = g_strdup (gst_structure_get_name (
-	    gst_caps_get_structure(priv->type, 0)));
+      mime =
+	  g_strdup (gst_structure_get_name (gst_caps_get_structure (priv->type,
+		  0)));
       GST_DEBUG ("found out mime type: %s", mime);
-      if (!gmi_set_mime (info, mime))
-      {
-        /* FIXME: pop up error */
-        GST_DEBUG ("no decoder pipeline found for mime %s", mime);
-        return FALSE;
+      if (!gmi_set_mime (info, mime)) {
+	/* FIXME: pop up error */
+	GST_DEBUG ("no decoder pipeline found for mime %s", mime);
+	return FALSE;
       }
       priv->stream = gmi_stream_new ();
       GST_DEBUG ("new stream: %p", priv->stream);
@@ -303,14 +297,12 @@ gst_media_info_read_idler (GstMediaInfo *info, GstMediaInfoStream **streamp, GEr
     case GST_MEDIA_INFO_STATE_STREAM:
     {
       GST_LOG ("STATE_STREAM");
-      if ((priv->format == NULL) && gst_bin_iterate (GST_BIN (priv->pipeline)))
-      {
-	GMI_DEBUG("?");
-        return TRUE;
+      if ((priv->format == NULL) && gst_bin_iterate (GST_BIN (priv->pipeline))) {
+	GMI_DEBUG ("?");
+	return TRUE;
       }
-      if (priv->format == NULL)
-      {
-        g_warning ("Couldn't find format\n");
+      if (priv->format == NULL) {
+	g_warning ("Couldn't find format\n");
 	return FALSE;
       }
       /* do state transition; stream -> first track metadata */
@@ -320,26 +312,25 @@ gst_media_info_read_idler (GstMediaInfo *info, GstMediaInfoStream **streamp, GEr
       gmip_find_track_metadata_pre (priv);
       return TRUE;
     }
-    /* these ones are repeated per track */
+      /* these ones are repeated per track */
     case GST_MEDIA_INFO_STATE_METADATA:
     {
       if ((priv->metadata == NULL) &&
 	  gst_bin_iterate (GST_BIN (priv->pipeline)) &&
-	  priv->metadata_iters < MAX_METADATA_ITERS)
-      {
-	GMI_DEBUG("?");
+	  priv->metadata_iters < MAX_METADATA_ITERS) {
+	GMI_DEBUG ("?");
 	priv->metadata_iters++;
-        return TRUE;
+	return TRUE;
       }
       if (priv->metadata_iters == MAX_METADATA_ITERS)
-	      g_print ("iterated a few times, didn't find metadata\n");
-      if (priv->metadata == NULL)
-      {
+	g_print ("iterated a few times, didn't find metadata\n");
+      if (priv->metadata == NULL) {
 	/* this is not a permanent failure */
-        GST_DEBUG ("Couldn't find metadata");
+	GST_DEBUG ("Couldn't find metadata");
       }
       GST_DEBUG ("found metadata of track %ld", priv->current_track_num);
-      if (!gmip_find_track_metadata_post (priv)) return FALSE;
+      if (!gmip_find_track_metadata_post (priv))
+	return FALSE;
       GST_DEBUG ("METADATA: going to STREAMINFO\n");
       priv->state = GST_MEDIA_INFO_STATE_STREAMINFO;
       return gmip_find_track_streaminfo_pre (priv);
@@ -347,53 +338,47 @@ gst_media_info_read_idler (GstMediaInfo *info, GstMediaInfoStream **streamp, GEr
     case GST_MEDIA_INFO_STATE_STREAMINFO:
     {
       if ((priv->streaminfo == NULL) &&
-	  gst_bin_iterate (GST_BIN (priv->pipeline)))
-      {
-	      GMI_DEBUG("?");
-        return TRUE;
+	  gst_bin_iterate (GST_BIN (priv->pipeline))) {
+	GMI_DEBUG ("?");
+	return TRUE;
       }
-      if (priv->streaminfo == NULL)
-      {
+      if (priv->streaminfo == NULL) {
 	/* this is not a permanent failure */
-        GST_DEBUG ("Couldn't find streaminfo");
-      }
-      else
-        GST_DEBUG ("found streaminfo of track %ld", priv->current_track_num);
-      if (!gmip_find_track_streaminfo_post (priv)) return FALSE;
+	GST_DEBUG ("Couldn't find streaminfo");
+      } else
+	GST_DEBUG ("found streaminfo of track %ld", priv->current_track_num);
+      if (!gmip_find_track_streaminfo_post (priv))
+	return FALSE;
       priv->state = GST_MEDIA_INFO_STATE_FORMAT;
       return gmip_find_track_format_pre (priv);
     }
     case GST_MEDIA_INFO_STATE_FORMAT:
     {
-      if ((priv->format == NULL) &&
-	  gst_bin_iterate (GST_BIN (priv->pipeline)))
-      {
-	      GMI_DEBUG("?");
-        return TRUE;
+      if ((priv->format == NULL) && gst_bin_iterate (GST_BIN (priv->pipeline))) {
+	GMI_DEBUG ("?");
+	return TRUE;
       }
-      if (priv->format == NULL)
-      {
-        g_warning ("Couldn't find format\n");
+      if (priv->format == NULL) {
+	g_warning ("Couldn't find format\n");
 	return FALSE;
       }
       GST_DEBUG ("found format of track %ld", priv->current_track_num);
-      if (!gmip_find_track_format_post (priv)) return FALSE;
+      if (!gmip_find_track_format_post (priv))
+	return FALSE;
       /* save the track info */
       priv->stream->tracks = g_list_append (priv->stream->tracks,
-		                            priv->current_track);
+	  priv->current_track);
       /* these alloc'd data types have been handed off */
       priv->current_track = NULL;
       priv->location = NULL;
       /* now see if we need to seek to a next track or not */
       priv->current_track_num++;
-      if (priv->current_track_num < priv->stream->length_tracks)
-      {
-        gmi_seek_to_track (info, priv->current_track_num);
-        priv->current_track = gmi_track_new ();
-	if (!gmip_find_track_metadata_pre (priv))
-	{
+      if (priv->current_track_num < priv->stream->length_tracks) {
+	gmi_seek_to_track (info, priv->current_track_num);
+	priv->current_track = gmi_track_new ();
+	if (!gmip_find_track_metadata_pre (priv)) {
 	  g_free (priv->current_track);
-          return FALSE;
+	  return FALSE;
 	}
 	priv->state = GST_MEDIA_INFO_STATE_METADATA;
 	return TRUE;
@@ -407,24 +392,26 @@ gst_media_info_read_idler (GstMediaInfo *info, GstMediaInfoStream **streamp, GEr
     }
     case GST_MEDIA_INFO_STATE_DONE:
       return TRUE;
-      default:
+    default:
       g_warning ("don't know what to do\n");
       return FALSE;
- }
+  }
 }
 
 /* main function
  * read all possible info from the file pointed to by location
  * use flags to limit the type of information searched for */
 GstMediaInfoStream *
-gst_media_info_read (GstMediaInfo *info, const char *location, guint16 flags, GError **error)
+gst_media_info_read (GstMediaInfo * info, const char *location, guint16 flags,
+    GError ** error)
 {
   GstMediaInfoStream *stream = NULL;
 
   gst_media_info_read_with_idler (info, location, flags, error);
-  if (*error) return FALSE;
+  if (*error)
+    return FALSE;
   while (gst_media_info_read_idler (info, &stream, error) && stream == NULL)
-    /* keep looping */;
+    /* keep looping */ ;
   if (*error)
     return NULL;
 
diff --git a/gst-libs/gst/media-info/media-info.h b/gst-libs/gst/media-info/media-info.h
index c134999d..bbbcce2b 100644
--- a/gst-libs/gst/media-info/media-info.h
+++ b/gst-libs/gst/media-info/media-info.h
@@ -23,11 +23,9 @@
 
 #include <gst/gst.h>
 
-G_BEGIN_DECLS
-
-typedef struct GstMediaInfoPriv		GstMediaInfoPriv;
-typedef struct _GstMediaInfo            GstMediaInfo;
-typedef struct _GstMediaInfoClass       GstMediaInfoClass;
+G_BEGIN_DECLS typedef struct GstMediaInfoPriv GstMediaInfoPriv;
+typedef struct _GstMediaInfo GstMediaInfo;
+typedef struct _GstMediaInfoClass GstMediaInfoClass;
 
 struct _GstMediaInfo
 {
@@ -43,8 +41,9 @@ struct _GstMediaInfoClass
   GObjectClass parent_class;
 
   /* signals */
-  void (*media_info_signal)		(GstMediaInfo *gst_media_info);
-  void (*error_signal)			(GstMediaInfo *gst_media_info, GError *error, const gchar *debug);
+  void (*media_info_signal) (GstMediaInfo * gst_media_info);
+  void (*error_signal) (GstMediaInfo * gst_media_info, GError * error,
+      const gchar * debug);
 
   gpointer _gst_reserved[GST_PADDING];
 };
@@ -100,34 +99,25 @@ typedef struct
 #define GST_MEDIA_INFO_FORMAT		1 << 5
 #define GST_MEDIA_INFO_ALL		((1 << 6) - 1)
 
-GQuark		gst_media_info_error_quark	(void);
-
-void		gst_media_info_init		(void);
-GType           gst_media_info_get_type		(void);
-
-GstMediaInfo *	gst_media_info_new		(GError **error);
-
-gboolean	gst_media_info_set_source	(GstMediaInfo *info,
-						 const char *source,
-						 GError **error);
-void		gst_media_info_read_with_idler	(GstMediaInfo *media_info,
-						 const char *location,
-						 guint16 GST_MEDIA_INFO_FLAGS,
-						 GError **error);
-gboolean	gst_media_info_read_idler	(GstMediaInfo *media_info,
-						 GstMediaInfoStream **streamp,
-						 GError **error);
-GstMediaInfoStream *
-		gst_media_info_read		(GstMediaInfo *media_info,
-						 const char *location,
-						 guint16 GST_MEDIA_INFO_FLAGS,
-						 GError **error);
-gboolean	gst_media_info_read_many	(GstMediaInfo *media_info,
-						 GList *locations,
-						 guint16 GST_MEDIA_INFO_FLAGS,
-						 GError **error);
-GstCaps *	gst_media_info_get_next		(GstMediaInfo *media_info,
-						 GError **error);
+GQuark gst_media_info_error_quark (void);
+
+void gst_media_info_init (void);
+GType gst_media_info_get_type (void);
+
+GstMediaInfo *gst_media_info_new (GError ** error);
+
+gboolean gst_media_info_set_source (GstMediaInfo * info,
+    const char *source, GError ** error);
+void gst_media_info_read_with_idler (GstMediaInfo * media_info,
+    const char *location, guint16 GST_MEDIA_INFO_FLAGS, GError ** error);
+gboolean gst_media_info_read_idler (GstMediaInfo * media_info,
+    GstMediaInfoStream ** streamp, GError ** error);
+GstMediaInfoStream *gst_media_info_read (GstMediaInfo * media_info,
+    const char *location, guint16 GST_MEDIA_INFO_FLAGS, GError ** error);
+gboolean gst_media_info_read_many (GstMediaInfo * media_info,
+    GList * locations, guint16 GST_MEDIA_INFO_FLAGS, GError ** error);
+GstCaps *gst_media_info_get_next (GstMediaInfo * media_info, GError ** error);
+
 /*
  * FIXME: reset ?
 gboolean	gst_media_info_write	(GstMediaInfo *media_info,
@@ -136,5 +126,4 @@ gboolean	gst_media_info_write	(GstMediaInfo *media_info,
 					 */
 
 G_END_DECLS
-
 #endif /* __GST_MEDIA_INFO_H__ */