Fixing indentation

Original commit message from CVS:
Fixing indentation

3 files changed, 1963 insertions, 2032 deletions

diff --git a/gst-libs/gst/play/play.old.c b/gst-libs/gst/play/play.old.c
index c30efae9..69382c0c 100644
--- a/gst-libs/gst/play/play.old.c
+++ b/gst-libs/gst/play/play.old.c
@@ -24,60 +24,73 @@
 
 #include "play.h"
 
-enum {
-	STREAM_END,
-	INFORMATION,
-	STATE_CHANGE,
-	STREAM_LENGTH,
-	TIME_TICK,
-	HAVE_XID,
-	HAVE_VIS_XID,
-	HAVE_VIDEO_SIZE,
-	PIPELINE_ERROR,
-	/* put additional signals before this comment */
-	LAST_SIGNAL,
+enum
+{
+  STREAM_END,
+  INFORMATION,
+  STATE_CHANGE,
+  STREAM_LENGTH,
+  TIME_TICK,
+  HAVE_XID,
+  HAVE_VIS_XID,
+  HAVE_VIDEO_SIZE,
+  PIPELINE_ERROR,
+  /* put additional signals before this comment */
+  LAST_SIGNAL,
 };
 
 /* this struct is used to decouple signals coming out of threaded pipelines */
 
-typedef struct _GstPlaySignal    GstPlaySignal;
+typedef struct _GstPlaySignal GstPlaySignal;
 
 struct _GstPlaySignal
 {
-	gint signal_id;
-	union {
-		struct {
-			gint width;
-			gint height;
-		} video_size;
-		struct {
-			gint xid;
-		} video_xid;
-		struct {
-			GstElementState old_state;
-			GstElementState new_state;
-		} state;
-		struct {
-			GstObject* object;
-			GParamSpec* param;
-		} info;
-		struct {
-			GstElement* element;
-			char* error;
-		} error;
-	} signal_data;
+  gint signal_id;
+  union
+  {
+    struct
+    {
+      gint width;
+      gint height;
+    }
+    video_size;
+    struct
+    {
+      gint xid;
+    }
+    video_xid;
+    struct
+    {
+      GstElementState old_state;
+      GstElementState new_state;
+    }
+    state;
+    struct
+    {
+      GstObject *object;
+      GParamSpec *param;
+    }
+    info;
+    struct
+    {
+      GstElement *element;
+      char *error;
+    }
+    error;
+  }
+  signal_data;
 };
 
 enum
 {
-	ARG_0,
-	ARG_LOCATION,
-	ARG_VOLUME,
-	ARG_MUTE,
-	/* FILL ME */
+  ARG_0,
+  ARG_LOCATION,
+  ARG_VOLUME,
+  ARG_MUTE,
+  /* FILL ME */
 };
 
-static guint gst_play_signals [LAST_SIGNAL] = { 0 };
+static guint gst_play_signals[LAST_SIGNAL] = { 0 };
 
 static GstElementClass *parent_class = NULL;
 
@@ -96,12 +109,13 @@ static GstElementClass *parent_class = NULL;
 static GQuark
 gst_play_error_quark (void)
 {
-	static GQuark quark = 0;
-	if (quark == 0) {
-		quark = g_quark_from_static_string ("gst-play-error-quark");
-	}
+  static GQuark quark = 0;
+  if (quark == 0)
+    {
+      quark = g_quark_from_static_string ("gst-play-error-quark");
+    }
 
-	return quark;
+  return quark;
 }
 
 /* GError creation when plugin is missing
@@ -109,101 +123,99 @@ gst_play_error_quark (void)
  * generic and have more errors than only
  * plug-ins, move the message creation to the switch */
 static void
-gst_play_error_plugin (	GstPlayError type,
-						GError **error)
+gst_play_error_plugin (GstPlayError type, GError ** error)
 {
-        gchar *name;
-
-        if (error == NULL) return;
-
-        switch (type)
-        {
-                case GST_PLAY_ERROR_THREAD:
-                        name = g_strdup ("thread");
-                        break;
-                case GST_PLAY_ERROR_QUEUE:
-                        name = g_strdup ("queue");
-                        break;
-                case GST_PLAY_ERROR_FAKESINK:
-                        name = g_strdup ("fakesink");
-                        break;
-                case GST_PLAY_ERROR_VOLUME:
-                        name = g_strdup ("volume");
-                        break;
-                case GST_PLAY_ERROR_COLORSPACE:
-                        name = g_strdup ("colorspace");
-                        break;
-                case GST_PLAY_ERROR_GNOMEVFSSRC:
-                        name = g_strdup ("gnomevfssrc");
-                        break;
-                default:
-                        name = g_strdup ("unknown");
-                        break;
-        }
-		
-        *error = g_error_new (	GST_PLAY_ERROR,
-								type,
-								"The %s plug-in could not be found. "
-								"This plug-in is essential for libgstplay. "
-								"Please install it and verify that it works "
-								"by running 'gst-inspect %s'",
-								name, name);
-        g_free (name);
-        return;
+  gchar *name;
+
+  if (error == NULL)
+    return;
+
+  switch (type)
+    {
+    case GST_PLAY_ERROR_THREAD:
+      name = g_strdup ("thread");
+      break;
+    case GST_PLAY_ERROR_QUEUE:
+      name = g_strdup ("queue");
+      break;
+    case GST_PLAY_ERROR_FAKESINK:
+      name = g_strdup ("fakesink");
+      break;
+    case GST_PLAY_ERROR_VOLUME:
+      name = g_strdup ("volume");
+      break;
+    case GST_PLAY_ERROR_COLORSPACE:
+      name = g_strdup ("colorspace");
+      break;
+    case GST_PLAY_ERROR_GNOMEVFSSRC:
+      name = g_strdup ("gnomevfssrc");
+      break;
+    default:
+      name = g_strdup ("unknown");
+      break;
+    }
+
+  *error = g_error_new (GST_PLAY_ERROR,
+			type,
+			"The %s plug-in could not be found. "
+			"This plug-in is essential for libgstplay. "
+			"Please install it and verify that it works "
+			"by running 'gst-inspect %s'", name, name);
+  g_free (name);
+  return;
 }
 
 static void
-gst_play_set_property (	GObject *object,
-						guint prop_id,
-						const GValue *value,
-						GParamSpec *pspec)
+gst_play_set_property (GObject * object,
+		       guint prop_id,
+		       const GValue * value, GParamSpec * pspec)
 {
-	GstPlay *play;
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GST_IS_PLAY (object));
-	play = GST_PLAY (object);
-	
-	switch (prop_id) {
-	case ARG_LOCATION:
-		gst_play_set_location(play, g_value_get_string (value));
-		break;
-	case ARG_VOLUME:
-		gst_play_set_volume(play, g_value_get_float (value));
-		break;
-	case ARG_MUTE:
-		gst_play_set_mute(play, g_value_get_boolean (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+  GstPlay *play;
+  g_return_if_fail (object != NULL);
+  g_return_if_fail (GST_IS_PLAY (object));
+  play = GST_PLAY (object);
+
+  switch (prop_id)
+    {
+    case ARG_LOCATION:
+      gst_play_set_location (play, g_value_get_string (value));
+      break;
+    case ARG_VOLUME:
+      gst_play_set_volume (play, g_value_get_float (value));
+      break;
+    case ARG_MUTE:
+      gst_play_set_mute (play, g_value_get_boolean (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
 }
 
 static void
-gst_play_get_property (	GObject *object,
-						guint prop_id,
-						GValue *value,
-						GParamSpec *pspec)
+gst_play_get_property (GObject * object,
+		       guint prop_id, GValue * value, GParamSpec * pspec)
 {
-	GstPlay *play;
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GST_IS_PLAY (object));
-	play = GST_PLAY (object);
-
-	switch (prop_id) {
-	case ARG_LOCATION:
-		g_value_set_string (value, gst_play_get_location(play));
-		break;
-	case ARG_VOLUME:
-		g_value_set_float(value, gst_play_get_volume(play));
-		break;
-	case ARG_MUTE:
-		g_value_set_boolean (value, gst_play_get_mute(play));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+  GstPlay *play;
+  g_return_if_fail (object != NULL);
+  g_return_if_fail (GST_IS_PLAY (object));
+  play = GST_PLAY (object);
+
+  switch (prop_id)
+    {
+    case ARG_LOCATION:
+      g_value_set_string (value, gst_play_get_location (play));
+      break;
+    case ARG_VOLUME:
+      g_value_set_float (value, gst_play_get_volume (play));
+      break;
+    case ARG_MUTE:
+      g_value_set_boolean (value, gst_play_get_mute (play));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
 }
 
 /* =========================================== */
@@ -213,298 +225,308 @@ gst_play_get_property (	GObject *object,
 /* =========================================== */
 
 static gboolean
-gst_play_get_length_callback (GstPlay *play)
+gst_play_get_length_callback (GstPlay * play)
 {
-	gint64 value;
-	GstFormat format = GST_FORMAT_TIME;
-	gboolean query_worked = FALSE;
-
-	if (	(play->audio_sink_element != NULL) &&
-			(GST_IS_ELEMENT (play->audio_sink_element)) ) {
-		query_worked = gst_element_query (play->audio_sink_element, GST_QUERY_TOTAL, &format, &value);
-	}
-	else if (	(play->video_sink_element != NULL) &&
-				(GST_IS_ELEMENT (play->video_sink_element)) ) {
-		query_worked = gst_element_query (play->video_sink_element, GST_QUERY_TOTAL, &format, &value);
-	}
-	if (query_worked){
-		g_signal_emit (G_OBJECT (play), gst_play_signals [STREAM_LENGTH], 0, value);
-		play->length_nanos = value;
-		return FALSE;
-	}
-	else {
-		if (play->get_length_attempt-- < 1){
-			/* we've tried enough times, give up */
-			return FALSE;
-		}
+  gint64 value;
+  GstFormat format = GST_FORMAT_TIME;
+  gboolean query_worked = FALSE;
+
+  if ((play->audio_sink_element != NULL) &&
+      (GST_IS_ELEMENT (play->audio_sink_element)))
+    {
+      query_worked =
+	gst_element_query (play->audio_sink_element, GST_QUERY_TOTAL, &format,
+			   &value);
+    }
+  else if ((play->video_sink_element != NULL) &&
+	   (GST_IS_ELEMENT (play->video_sink_element)))
+    {
+      query_worked =
+	gst_element_query (play->video_sink_element, GST_QUERY_TOTAL, &format,
+			   &value);
+    }
+  if (query_worked)
+    {
+      g_signal_emit (G_OBJECT (play), gst_play_signals[STREAM_LENGTH], 0,
+		     value);
+      play->length_nanos = value;
+      return FALSE;
+    }
+  else
+    {
+      if (play->get_length_attempt-- < 1)
+	{
+	  /* we've tried enough times, give up */
+	  return FALSE;
 	}
-	return (gst_element_get_state(play->pipeline) == GST_STATE_PLAYING);
+    }
+  return (gst_element_get_state (play->pipeline) == GST_STATE_PLAYING);
 }
 
 static gboolean
-gst_play_tick_callback (GstPlay *play)
+gst_play_tick_callback (GstPlay * play)
 {
-	gint secs;
-	
-	g_return_val_if_fail (play != NULL, FALSE); 
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	
-	play->clock = gst_bin_get_clock (GST_BIN (play->pipeline));
-	play->time_nanos = gst_clock_get_time(play->clock);
-	secs = (gint) (play->time_nanos / GST_SECOND);
-	if (secs != play->time_seconds){
-		play->time_seconds = secs;
-		g_signal_emit (G_OBJECT (play), gst_play_signals [TIME_TICK], 0, play->time_nanos);
-	}
-
-	return (gst_element_get_state(play->pipeline) == GST_STATE_PLAYING);
+  gint secs;
+
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+
+  play->clock = gst_bin_get_clock (GST_BIN (play->pipeline));
+  play->time_nanos = gst_clock_get_time (play->clock);
+  secs = (gint) (play->time_nanos / GST_SECOND);
+  if (secs != play->time_seconds)
+    {
+      play->time_seconds = secs;
+      g_signal_emit (G_OBJECT (play), gst_play_signals[TIME_TICK], 0,
+		     play->time_nanos);
+    }
+
+  return (gst_element_get_state (play->pipeline) == GST_STATE_PLAYING);
 }
 
 static gboolean
-gst_play_default_idle (GstPlayIdleData *idle_data)
+gst_play_default_idle (GstPlayIdleData * idle_data)
 {
-	if(idle_data->func(idle_data->data)){
-		/* call this function again in the future */
-		return TRUE;
-	}
-	/* this function should no longer be called */
-	g_free(idle_data);
-	return FALSE;
+  if (idle_data->func (idle_data->data))
+    {
+      /* call this function again in the future */
+      return TRUE;
+    }
+  /* this function should no longer be called */
+  g_free (idle_data);
+  return FALSE;
 }
 
 static guint
-gst_play_default_timeout_add (	guint interval,
-								GSourceFunc function,
-								gpointer data)
+gst_play_default_timeout_add (guint interval,
+			      GSourceFunc function, gpointer data)
 {
-	GstPlayIdleData *idle_data = g_new0(GstPlayIdleData, 1);
-	idle_data->func = function;
-	idle_data->data = data;
+  GstPlayIdleData *idle_data = g_new0 (GstPlayIdleData, 1);
+  idle_data->func = function;
+  idle_data->data = data;
 
-	return g_timeout_add (interval, (GSourceFunc)gst_play_default_idle, idle_data);
+  return g_timeout_add (interval, (GSourceFunc) gst_play_default_idle,
+			idle_data);
 }
 
 static guint
-gst_play_default_idle_add (	GSourceFunc function,
-							gpointer data)
+gst_play_default_idle_add (GSourceFunc function, gpointer data)
 {
-	GstPlayIdleData *idle_data = g_new0(GstPlayIdleData, 1);
-	idle_data->func = function;
-	idle_data->data = data;
-	
-	return g_idle_add ((GSourceFunc)gst_play_default_idle, idle_data);
+  GstPlayIdleData *idle_data = g_new0 (GstPlayIdleData, 1);
+  idle_data->func = function;
+  idle_data->data = data;
+
+  return g_idle_add ((GSourceFunc) gst_play_default_idle, idle_data);
 }
 
 static gboolean
-gst_play_idle_callback (GstPlay *play)
+gst_play_idle_callback (GstPlay * play)
 {
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	
-	return gst_bin_iterate (GST_BIN (play->pipeline));
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+
+  return gst_bin_iterate (GST_BIN (play->pipeline));
 }
 
 static gboolean
-gst_play_idle_signal (GstPlay *play)
+gst_play_idle_signal (GstPlay * play)
 {
-	GstPlaySignal *signal;
-	gint queue_length;
-	
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	
-	signal = g_async_queue_try_pop(play->signal_queue);
-	if (signal == NULL){
-		return FALSE;
-	}
-
-	switch (signal->signal_id){
-	case HAVE_XID:
-		g_signal_emit (G_OBJECT (play), gst_play_signals[HAVE_XID], 0,
-		               signal->signal_data.video_xid.xid);
-		break;
-	case HAVE_VIS_XID:
-		g_signal_emit (G_OBJECT (play), gst_play_signals[HAVE_VIS_XID], 0,
-		               signal->signal_data.video_xid.xid);
-		break;
-	case HAVE_VIDEO_SIZE:
-		g_signal_emit (G_OBJECT (play), gst_play_signals[HAVE_VIDEO_SIZE], 0, 
-		               signal->signal_data.video_size.width, signal->signal_data.video_size.height);
-		break;
-	case STATE_CHANGE:
-		g_signal_emit (G_OBJECT (play), gst_play_signals[STATE_CHANGE], 0, 
-		               signal->signal_data.state.old_state, signal->signal_data.state.new_state);
-		break;
-	case INFORMATION:
-		g_signal_emit (G_OBJECT (play), gst_play_signals[INFORMATION], 0, 
-		               signal->signal_data.info.object, signal->signal_data.info.param);
-		gst_object_unref (signal->signal_data.info.object);
-		break;
-	case PIPELINE_ERROR:
-		g_signal_emit (G_OBJECT (play), gst_play_signals[PIPELINE_ERROR], 0, 
-		               signal->signal_data.error.element, signal->signal_data.error.error);
-		if (signal->signal_data.error.error)
-			g_free (signal->signal_data.error.error);
-		gst_object_unref (GST_OBJECT(signal->signal_data.error.element));
-		break;
-	default:
-		break;
-	}
-
-	g_free(signal);
-	queue_length = g_async_queue_length (play->signal_queue);
-		
-	return (queue_length > 0);
+  GstPlaySignal *signal;
+  gint queue_length;
+
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+
+  signal = g_async_queue_try_pop (play->signal_queue);
+  if (signal == NULL)
+    {
+      return FALSE;
+    }
+
+  switch (signal->signal_id)
+    {
+    case HAVE_XID:
+      g_signal_emit (G_OBJECT (play), gst_play_signals[HAVE_XID], 0,
+		     signal->signal_data.video_xid.xid);
+      break;
+    case HAVE_VIS_XID:
+      g_signal_emit (G_OBJECT (play), gst_play_signals[HAVE_VIS_XID], 0,
+		     signal->signal_data.video_xid.xid);
+      break;
+    case HAVE_VIDEO_SIZE:
+      g_signal_emit (G_OBJECT (play), gst_play_signals[HAVE_VIDEO_SIZE], 0,
+		     signal->signal_data.video_size.width,
+		     signal->signal_data.video_size.height);
+      break;
+    case STATE_CHANGE:
+      g_signal_emit (G_OBJECT (play), gst_play_signals[STATE_CHANGE], 0,
+		     signal->signal_data.state.old_state,
+		     signal->signal_data.state.new_state);
+      break;
+    case INFORMATION:
+      g_signal_emit (G_OBJECT (play), gst_play_signals[INFORMATION], 0,
+		     signal->signal_data.info.object,
+		     signal->signal_data.info.param);
+      gst_object_unref (signal->signal_data.info.object);
+      break;
+    case PIPELINE_ERROR:
+      g_signal_emit (G_OBJECT (play), gst_play_signals[PIPELINE_ERROR], 0,
+		     signal->signal_data.error.element,
+		     signal->signal_data.error.error);
+      if (signal->signal_data.error.error)
+	g_free (signal->signal_data.error.error);
+      gst_object_unref (GST_OBJECT (signal->signal_data.error.element));
+      break;
+    default:
+      break;
+    }
+
+  g_free (signal);
+  queue_length = g_async_queue_length (play->signal_queue);
+
+  return (queue_length > 0);
 }
 
 static gboolean
-gst_play_idle_eos (GstPlay* play)
+gst_play_idle_eos (GstPlay * play)
 {
-	g_signal_emit (G_OBJECT (play), gst_play_signals [STREAM_END], 0);
-	return FALSE;
+  g_signal_emit (G_OBJECT (play), gst_play_signals[STREAM_END], 0);
+  return FALSE;
 }
 
 static void
-callback_audio_sink_eos (	GstElement *element,
-							GstPlay *play)
+callback_audio_sink_eos (GstElement * element, GstPlay * play)
 {
-	play->idle_add_func ((GSourceFunc) gst_play_idle_eos, play);
+  play->idle_add_func ((GSourceFunc) gst_play_idle_eos, play);
 }
 
 static void
-callback_video_have_xid (	GstElement *element,
-							gint xid,
-							GstPlay *play)
+callback_video_have_xid (GstElement * element, gint xid, GstPlay * play)
 {
-	GstPlaySignal *signal;
-	
-	signal = g_new0(GstPlaySignal, 1);
-	signal->signal_id = HAVE_XID;
-	signal->signal_data.video_xid.xid = xid;
-	
-	g_async_queue_push(play->signal_queue, signal);
-	
-	play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play);
+  GstPlaySignal *signal;
+
+  signal = g_new0 (GstPlaySignal, 1);
+  signal->signal_id = HAVE_XID;
+  signal->signal_data.video_xid.xid = xid;
+
+  g_async_queue_push (play->signal_queue, signal);
+
+  play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play);
 }
 
 static void
-callback_video_have_vis_xid (	GstElement *element,
-								gint xid,
-								GstPlay *play)
+callback_video_have_vis_xid (GstElement * element, gint xid, GstPlay * play)
 {
-	GstPlaySignal *signal;
-	
-	signal = g_new0(GstPlaySignal, 1);
-	signal->signal_id = HAVE_VIS_XID;
-	signal->signal_data.video_xid.xid = xid;
-	
-	g_async_queue_push(play->signal_queue, signal);
-	
-	play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play);
+  GstPlaySignal *signal;
+
+  signal = g_new0 (GstPlaySignal, 1);
+  signal->signal_id = HAVE_VIS_XID;
+  signal->signal_data.video_xid.xid = xid;
+
+  g_async_queue_push (play->signal_queue, signal);
+
+  play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play);
 }
 
 static void
-callback_video_have_size (	GstElement *element,
-							gint width,
-							gint height,
-							GstPlay *play)
+callback_video_have_size (GstElement * element,
+			  gint width, gint height, GstPlay * play)
 {
-	GstPlaySignal *signal;
-	
-	signal = g_new0(GstPlaySignal, 1);
-	signal->signal_id = HAVE_VIDEO_SIZE;
-	signal->signal_data.video_size.width = width;
-	signal->signal_data.video_size.height = height;
-	
-	g_async_queue_push(play->signal_queue, signal);
-	
-	play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play);
+  GstPlaySignal *signal;
+
+  signal = g_new0 (GstPlaySignal, 1);
+  signal->signal_id = HAVE_VIDEO_SIZE;
+  signal->signal_data.video_size.width = width;
+  signal->signal_data.video_size.height = height;
+
+  g_async_queue_push (play->signal_queue, signal);
+
+  play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play);
 }
 
 static void
-callback_pipeline_error (	GstElement *object,
-							GstElement *orig,
-							char *error,
-							GstPlay* play)
-{ 
-	GstPlaySignal *signal;
-	
-	signal = g_new0(GstPlaySignal, 1);
-	signal->signal_id = PIPELINE_ERROR;
-	signal->signal_data.error.element = orig;
-	signal->signal_data.error.error = g_strdup(error);
-
-	gst_object_ref (GST_OBJECT(orig));
-	
-	g_async_queue_push(play->signal_queue, signal);
-	
-	if (GST_IS_ELEMENT(play->pipeline))
-		gst_element_set_state(play->pipeline, GST_STATE_READY);
-	
-	play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play);
-} 
+callback_pipeline_error (GstElement * object,
+			 GstElement * orig, char *error, GstPlay * play)
+{
+  GstPlaySignal *signal;
+
+  signal = g_new0 (GstPlaySignal, 1);
+  signal->signal_id = PIPELINE_ERROR;
+  signal->signal_data.error.element = orig;
+  signal->signal_data.error.error = g_strdup (error);
+
+  gst_object_ref (GST_OBJECT (orig));
+
+  g_async_queue_push (play->signal_queue, signal);
+
+  if (GST_IS_ELEMENT (play->pipeline))
+    gst_element_set_state (play->pipeline, GST_STATE_READY);
+
+  play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play);
+}
 
 static void
-callback_pipeline_deep_notify (	GstObject *element,
-								GstObject *orig,
-								GParamSpec *param,
-								GstPlay* play)
+callback_pipeline_deep_notify (GstObject * element,
+			       GstObject * orig,
+			       GParamSpec * param, GstPlay * play)
 {
-	GstPlaySignal *signal;
-	
-	signal = g_new0(GstPlaySignal, 1);
-	signal->signal_id = INFORMATION;
-	signal->signal_data.info.object = orig;
-	signal->signal_data.info.param = param;
-
-	gst_object_ref (orig);
-	
-	g_async_queue_push(play->signal_queue, signal);
-	
-	play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play);
+  GstPlaySignal *signal;
+
+  signal = g_new0 (GstPlaySignal, 1);
+  signal->signal_id = INFORMATION;
+  signal->signal_data.info.object = orig;
+  signal->signal_data.info.param = param;
+
+  gst_object_ref (orig);
+
+  g_async_queue_push (play->signal_queue, signal);
+
+  play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play);
 }
 
 static void
-callback_pipeline_state_change (	GstElement *element,
-									GstElementState old,
-									GstElementState state,
-									GstPlay* play)
+callback_pipeline_state_change (GstElement * element,
+				GstElementState old,
+				GstElementState state, GstPlay * play)
 {
-	GstPlaySignal *signal;
-
-	g_return_if_fail (play != NULL);
-	g_return_if_fail (element != NULL);
-	g_return_if_fail (GST_IS_ELEMENT (element));
-	g_return_if_fail (GST_IS_PLAY (play));
-	g_return_if_fail (element == play->pipeline);
-
-	/* do additional stuff depending on state */
-	if (GST_IS_PIPELINE (play->pipeline)){
-		switch (state) {
-		case GST_STATE_PLAYING:
-			play->idle_add_func (	(GSourceFunc) gst_play_idle_callback,
-									play);
-			play->timeout_add_func (	200,
-										(GSourceFunc) gst_play_tick_callback,
-										play);
-			if (play->length_nanos == 0LL){
-				/* try to get the length up to 16 times */
-				play->get_length_attempt = 16;
-				play->timeout_add_func (200, (GSourceFunc) gst_play_get_length_callback, play); 
-			}
-			break;
-		default:
-			break;
-		}
-	}	
-	signal = g_new0(GstPlaySignal, 1);
-	signal->signal_id = STATE_CHANGE;
-	signal->signal_data.state.old_state = old;
-	signal->signal_data.state.new_state = state;
+  GstPlaySignal *signal;
+
+  g_return_if_fail (play != NULL);
+  g_return_if_fail (element != NULL);
+  g_return_if_fail (GST_IS_ELEMENT (element));
+  g_return_if_fail (GST_IS_PLAY (play));
+  g_return_if_fail (element == play->pipeline);
+
+  /* do additional stuff depending on state */
+  if (GST_IS_PIPELINE (play->pipeline))
+    {
+      switch (state)
+	{
+	case GST_STATE_PLAYING:
+	  play->idle_add_func ((GSourceFunc) gst_play_idle_callback, play);
+	  play->timeout_add_func (200,
+				  (GSourceFunc) gst_play_tick_callback, play);
+	  if (play->length_nanos == 0LL)
+	    {
+	      /* try to get the length up to 16 times */
+	      play->get_length_attempt = 16;
+	      play->timeout_add_func (200,
+				      (GSourceFunc)
+				      gst_play_get_length_callback, play);
+	    }
+	  break;
+	default:
+	  break;
+	}
+    }
+  signal = g_new0 (GstPlaySignal, 1);
+  signal->signal_id = STATE_CHANGE;
+  signal->signal_data.state.old_state = old;
+  signal->signal_data.state.new_state = state;
 
-	g_async_queue_push(play->signal_queue, signal);
+  g_async_queue_push (play->signal_queue, signal);
 
-	play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play);
+  play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play);
 }
 
 /* split static pipeline functions to a seperate file */
@@ -517,172 +539,155 @@ callback_pipeline_state_change (	GstElement *element,
 /* =========================================== */
 
 static void
-gst_play_dispose (GObject *object)
+gst_play_dispose (GObject * object)
 {
-	GstPlay *play;
+  GstPlay *play;
+
+  g_return_if_fail (object != NULL);
+  g_return_if_fail (GST_IS_PLAY (object));
+  play = GST_PLAY (object);
 
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GST_IS_PLAY(object));
-	play = GST_PLAY (object);
+  /* Removing all sources */
+  while (g_source_remove_by_user_data (play));
 
-	/* Removing all sources */
-	while (g_source_remove_by_user_data (play));
-	
-	G_OBJECT_CLASS (parent_class)->dispose (object);
+  G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
-gst_play_class_init (GstPlayClass *klass)
+gst_play_class_init (GstPlayClass * klass)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  
-	parent_class = g_type_class_ref(GST_TYPE_OBJECT);
-
-	klass->information = NULL;
-	klass->state_changed = NULL;
-	klass->stream_end = NULL;
-  
-	gobject_class->dispose = gst_play_dispose;
-	gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_play_set_property);
-	gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_play_get_property);
-
-	g_object_class_install_property (
-			gobject_class,
-			ARG_LOCATION,
-			g_param_spec_string (
-						"location",
-						"location of file", 
-						"location of the file to play",
-						NULL, G_PARAM_READWRITE));
-	
-	g_object_class_install_property (
-			gobject_class,
-			ARG_VOLUME,
-			g_param_spec_float (
-						"volume",
-						"Playing volume", 
-			            "Playing volume", 
-						0, 1.0, 0, G_PARAM_READWRITE));
-						
-	g_object_class_install_property (
-			gobject_class,
-			ARG_MUTE,
-			g_param_spec_boolean (
-						"mute",
-						"Volume muted",
-						"Playing volume muted",
-						FALSE, G_PARAM_READWRITE));
-  
-	gst_play_signals [INFORMATION] = 
-		g_signal_new ("information", 
-			      G_TYPE_FROM_CLASS (klass), 
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (GstPlayClass, information), 
-			      NULL, NULL,
-			      gst_marshal_VOID__OBJECT_PARAM, 
-			      G_TYPE_NONE, 2, 
-			      G_TYPE_OBJECT, G_TYPE_PARAM);
-	
-	gst_play_signals [PIPELINE_ERROR] = 
-		g_signal_new ("pipeline_error", 
-			      G_TYPE_FROM_CLASS (klass), 
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (GstPlayClass, pipeline_error), 
-			      NULL, NULL,
-			      gst_marshal_VOID__OBJECT_STRING, 
-			      G_TYPE_NONE, 2, 
-			      G_TYPE_OBJECT, G_TYPE_STRING);
-	
-	gst_play_signals [STATE_CHANGE] = 
-		g_signal_new ("state_change", 
-			      G_TYPE_FROM_CLASS (klass), 
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (GstPlayClass, state_changed), 
-			      NULL, NULL,
-			      gst_marshal_VOID__INT_INT,
-			      G_TYPE_NONE, 2, 
-			      G_TYPE_INT, G_TYPE_INT);
-	
-	gst_play_signals [STREAM_END] =
-		g_signal_new ("stream_end",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (GstPlayClass, stream_end),
-			      NULL, NULL,
-			      gst_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	gst_play_signals [TIME_TICK] = 
-		g_signal_new ("time_tick", 
-			      G_TYPE_FROM_CLASS (klass), 
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (GstPlayClass, time_tick), 
-			      NULL, NULL,
-			      gst_marshal_VOID__INT64,
-			      G_TYPE_NONE, 1, 
-			      G_TYPE_INT64);
-
-	gst_play_signals [STREAM_LENGTH] = 
-		g_signal_new ("stream_length", 
-			      G_TYPE_FROM_CLASS (klass), 
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (GstPlayClass, stream_length), 
-			      NULL, NULL,
-			      gst_marshal_VOID__INT64,
-			      G_TYPE_NONE, 1, 
-			      G_TYPE_INT64);
-
-	gst_play_signals [HAVE_XID] = 
-		g_signal_new ("have_xid", 
-			      G_TYPE_FROM_CLASS (klass), 
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (GstPlayClass, have_xid), 
-			      NULL, NULL,
-			      gst_marshal_VOID__INT,
-			      G_TYPE_NONE, 1, 
-			      G_TYPE_INT);
-				  
-	gst_play_signals [HAVE_VIS_XID] = 
-		g_signal_new ("have_vis_xid", 
-			      G_TYPE_FROM_CLASS (klass), 
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (GstPlayClass, have_vis_xid), 
-			      NULL, NULL,
-			      gst_marshal_VOID__INT,
-			      G_TYPE_NONE, 1, 
-			      G_TYPE_INT);
-
-	gst_play_signals [HAVE_VIDEO_SIZE] = 
-		g_signal_new ("have_video_size", 
-			      G_TYPE_FROM_CLASS (klass), 
-			      G_SIGNAL_RUN_FIRST,
-			      G_STRUCT_OFFSET (GstPlayClass, have_video_size), 
-			      NULL, NULL,
-			      gst_marshal_VOID__INT_INT,
-			      G_TYPE_NONE, 2, 
-			      G_TYPE_INT, G_TYPE_INT);
-
-	gst_control_init(NULL,NULL);
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  parent_class = g_type_class_ref (GST_TYPE_OBJECT);
+
+  klass->information = NULL;
+  klass->state_changed = NULL;
+  klass->stream_end = NULL;
+
+  gobject_class->dispose = gst_play_dispose;
+  gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_play_set_property);
+  gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_play_get_property);
+
+  g_object_class_install_property (gobject_class,
+				   ARG_LOCATION,
+				   g_param_spec_string ("location",
+							"location of file",
+							"location of the file to play",
+							NULL,
+							G_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+				   ARG_VOLUME,
+				   g_param_spec_float ("volume",
+						       "Playing volume",
+						       "Playing volume",
+						       0, 1.0, 0,
+						       G_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+				   ARG_MUTE,
+				   g_param_spec_boolean ("mute",
+							 "Volume muted",
+							 "Playing volume muted",
+							 FALSE,
+							 G_PARAM_READWRITE));
+
+  gst_play_signals[INFORMATION] =
+    g_signal_new ("information",
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_FIRST,
+		  G_STRUCT_OFFSET (GstPlayClass, information),
+		  NULL, NULL,
+		  gst_marshal_VOID__OBJECT_PARAM,
+		  G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_PARAM);
+
+  gst_play_signals[PIPELINE_ERROR] =
+    g_signal_new ("pipeline_error",
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_FIRST,
+		  G_STRUCT_OFFSET (GstPlayClass, pipeline_error),
+		  NULL, NULL,
+		  gst_marshal_VOID__OBJECT_STRING,
+		  G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_STRING);
+
+  gst_play_signals[STATE_CHANGE] =
+    g_signal_new ("state_change",
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_FIRST,
+		  G_STRUCT_OFFSET (GstPlayClass, state_changed),
+		  NULL, NULL,
+		  gst_marshal_VOID__INT_INT,
+		  G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
+
+  gst_play_signals[STREAM_END] =
+    g_signal_new ("stream_end",
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_FIRST,
+		  G_STRUCT_OFFSET (GstPlayClass, stream_end),
+		  NULL, NULL, gst_marshal_VOID__VOID, G_TYPE_NONE, 0);
+
+  gst_play_signals[TIME_TICK] =
+    g_signal_new ("time_tick",
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_FIRST,
+		  G_STRUCT_OFFSET (GstPlayClass, time_tick),
+		  NULL, NULL,
+		  gst_marshal_VOID__INT64, G_TYPE_NONE, 1, G_TYPE_INT64);
+
+  gst_play_signals[STREAM_LENGTH] =
+    g_signal_new ("stream_length",
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_FIRST,
+		  G_STRUCT_OFFSET (GstPlayClass, stream_length),
+		  NULL, NULL,
+		  gst_marshal_VOID__INT64, G_TYPE_NONE, 1, G_TYPE_INT64);
+
+  gst_play_signals[HAVE_XID] =
+    g_signal_new ("have_xid",
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_FIRST,
+		  G_STRUCT_OFFSET (GstPlayClass, have_xid),
+		  NULL, NULL,
+		  gst_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
+
+  gst_play_signals[HAVE_VIS_XID] =
+    g_signal_new ("have_vis_xid",
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_FIRST,
+		  G_STRUCT_OFFSET (GstPlayClass, have_vis_xid),
+		  NULL, NULL,
+		  gst_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
+
+  gst_play_signals[HAVE_VIDEO_SIZE] =
+    g_signal_new ("have_video_size",
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_FIRST,
+		  G_STRUCT_OFFSET (GstPlayClass, have_video_size),
+		  NULL, NULL,
+		  gst_marshal_VOID__INT_INT,
+		  G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
+
+  gst_control_init (NULL, NULL);
 }
 
 
 
-static void 
-gst_play_init (GstPlay *play) 
+static void
+gst_play_init (GstPlay * play)
 {
-	play->pipeline				= NULL;
-	play->source				= NULL;
-	play->autoplugger			= NULL;
-	play->audio_sink			= NULL;
-	play->audio_sink_element	= NULL;
-	play->video_sink			= NULL;
-	play->video_sink_element	= NULL;
-	play->volume				= NULL;
-	play->other_elements		= g_hash_table_new(g_str_hash, g_str_equal);
-	
-	gst_play_set_idle_timeout_funcs(	play,
-										gst_play_default_timeout_add,
-										gst_play_default_idle_add);
+  play->pipeline = NULL;
+  play->source = NULL;
+  play->autoplugger = NULL;
+  play->audio_sink = NULL;
+  play->audio_sink_element = NULL;
+  play->video_sink = NULL;
+  play->video_sink_element = NULL;
+  play->volume = NULL;
+  play->other_elements = g_hash_table_new (g_str_hash, g_str_equal);
+
+  gst_play_set_idle_timeout_funcs (play,
+				   gst_play_default_timeout_add,
+				   gst_play_default_idle_add);
 }
 
 /* ============================================================= */
@@ -705,58 +710,65 @@ gst_play_init (GstPlay *play)
  * Performs a seek on @play until @time_nanos.
  */
 void
-gst_play_seek_to_time (	GstPlay *play,
-						gint64 time_nanos)
+gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
 {
-	GstEvent *s_event;
-        guint8   prev_state;
-	gboolean audio_seek_worked = FALSE;
-	gboolean video_seek_worked = FALSE;
-	gboolean visualisation_seek_worked = FALSE;
-
-	g_return_if_fail (play != NULL);
-	g_return_if_fail (GST_IS_PLAY (play));
-	if (time_nanos < 0LL){
-		play->seek_time = 0LL;
-	}
-	else if (time_nanos < 0LL){
-		play->seek_time = play->length_nanos;
-	}
-	else {
-		play->seek_time = time_nanos;
-	}
-
-	/*g_print("doing seek to %lld\n", play->seek_time);*/
-        prev_state = GST_STATE(play->pipeline);
-	if (gst_play_set_state (play, GST_STATE_PAUSED) != GST_STATE_SUCCESS)
-        	g_warning ("gst_play_seek: setting to READY failed\n");
-
-	s_event = gst_event_new_seek (GST_FORMAT_TIME |
-	                              GST_SEEK_METHOD_SET |
-	                              GST_SEEK_FLAG_FLUSH, play->seek_time);
-	if (play->audio_sink_element != NULL){
-		gst_event_ref (s_event);
-		audio_seek_worked = gst_element_send_event (
-										play->audio_sink_element, s_event);
-	}
-	if (play->visualisation_sink_element != NULL){
-		gst_event_ref (s_event);
-		visualisation_seek_worked = gst_element_send_event (
-										play->visualisation_sink_element, s_event);
-	}
-	if (play->video_sink_element != NULL){
-		gst_event_ref (s_event);
-		video_seek_worked = gst_element_send_event (
-										play->video_sink_element, s_event);
-	}
-	gst_event_unref (s_event);
-
-	if (audio_seek_worked || video_seek_worked){
-		play->time_nanos = gst_clock_get_time(play->clock);
-		g_signal_emit (G_OBJECT (play), gst_play_signals [TIME_TICK], 0, play->time_nanos);
-	}
-	if (gst_element_set_state (play->pipeline, prev_state) != GST_STATE_SUCCESS)
-        	g_warning ("gst_play_seek_to_time: setting to READY failed\n");
+  GstEvent *s_event;
+  guint8 prev_state;
+  gboolean audio_seek_worked = FALSE;
+  gboolean video_seek_worked = FALSE;
+  gboolean visualisation_seek_worked = FALSE;
+
+  g_return_if_fail (play != NULL);
+  g_return_if_fail (GST_IS_PLAY (play));
+  if (time_nanos < 0LL)
+    {
+      play->seek_time = 0LL;
+    }
+  else if (time_nanos < 0LL)
+    {
+      play->seek_time = play->length_nanos;
+    }
+  else
+    {
+      play->seek_time = time_nanos;
+    }
+
+  /*g_print("doing seek to %lld\n", play->seek_time); */
+  prev_state = GST_STATE (play->pipeline);
+  if (gst_play_set_state (play, GST_STATE_PAUSED) != GST_STATE_SUCCESS)
+    g_warning ("gst_play_seek: setting to READY failed\n");
+
+  s_event = gst_event_new_seek (GST_FORMAT_TIME |
+				GST_SEEK_METHOD_SET |
+				GST_SEEK_FLAG_FLUSH, play->seek_time);
+  if (play->audio_sink_element != NULL)
+    {
+      gst_event_ref (s_event);
+      audio_seek_worked =
+	gst_element_send_event (play->audio_sink_element, s_event);
+    }
+  if (play->visualisation_sink_element != NULL)
+    {
+      gst_event_ref (s_event);
+      visualisation_seek_worked =
+	gst_element_send_event (play->visualisation_sink_element, s_event);
+    }
+  if (play->video_sink_element != NULL)
+    {
+      gst_event_ref (s_event);
+      video_seek_worked =
+	gst_element_send_event (play->video_sink_element, s_event);
+    }
+  gst_event_unref (s_event);
+
+  if (audio_seek_worked || video_seek_worked)
+    {
+      play->time_nanos = gst_clock_get_time (play->clock);
+      g_signal_emit (G_OBJECT (play), gst_play_signals[TIME_TICK], 0,
+		     play->time_nanos);
+    }
+  if (gst_element_set_state (play->pipeline, prev_state) != GST_STATE_SUCCESS)
+    g_warning ("gst_play_seek_to_time: setting to READY failed\n");
 }
 
 /**
@@ -766,29 +778,31 @@ gst_play_seek_to_time (	GstPlay *play,
  * Request a new video window for @play.
  */
 void
-gst_play_need_new_video_window (GstPlay *play)
+gst_play_need_new_video_window (GstPlay * play)
 {
-	g_return_if_fail (play != NULL);
-	g_return_if_fail (GST_IS_PLAY (play));
-	if (GST_IS_ELEMENT(play->video_sink_element)){
-		g_object_set(	G_OBJECT(play->video_sink_element),
-						"need_new_window", TRUE, NULL);
-	}
-	if (GST_IS_ELEMENT(play->visualisation_sink_element)){
-		g_object_set(	G_OBJECT(play->visualisation_sink_element),
-						"need_new_window", TRUE, NULL);
-	}
+  g_return_if_fail (play != NULL);
+  g_return_if_fail (GST_IS_PLAY (play));
+  if (GST_IS_ELEMENT (play->video_sink_element))
+    {
+      g_object_set (G_OBJECT (play->video_sink_element),
+		    "need_new_window", TRUE, NULL);
+    }
+  if (GST_IS_ELEMENT (play->visualisation_sink_element))
+    {
+      g_object_set (G_OBJECT (play->visualisation_sink_element),
+		    "need_new_window", TRUE, NULL);
+    }
 }
 
 void
-gst_play_set_idle_timeout_funcs (	GstPlay *play,
-									GstPlayTimeoutAdd timeout_add_func,
-									GstPlayIdleAdd idle_add_func)
+gst_play_set_idle_timeout_funcs (GstPlay * play,
+				 GstPlayTimeoutAdd timeout_add_func,
+				 GstPlayIdleAdd idle_add_func)
 {
-	g_return_if_fail (play != NULL);
-	g_return_if_fail (GST_IS_PLAY (play));
-	play->timeout_add_func = timeout_add_func;
-	play->idle_add_func = idle_add_func;
+  g_return_if_fail (play != NULL);
+  g_return_if_fail (GST_IS_PLAY (play));
+  play->timeout_add_func = timeout_add_func;
+  play->idle_add_func = idle_add_func;
 }
 
 /**
@@ -802,99 +816,109 @@ gst_play_set_idle_timeout_funcs (	GstPlay *play,
  *
  * Returns: the sink #GstElement of @element.
  */
-GstElement*
-gst_play_get_sink_element (	GstPlay *play,
-							GstElement *element,
-							GstPlaySinkType sink_type)
+GstElement *
+gst_play_get_sink_element (GstPlay * play,
+			   GstElement * element, GstPlaySinkType sink_type)
 {
-	GList *elements = NULL;
-	const GList *pads = NULL;
-	gboolean has_src, has_correct_type;
-
-	g_return_val_if_fail (play != NULL, NULL);
-	g_return_val_if_fail (element != NULL, NULL);
-	g_return_val_if_fail (GST_IS_PLAY (play), NULL);
-	g_return_val_if_fail (GST_IS_ELEMENT (element), NULL);
-
-	if (!GST_IS_BIN(element)){
-		/* since its not a bin, we'll presume this 
-		 * element is a sink element */		
-		return element;
+  GList *elements = NULL;
+  const GList *pads = NULL;
+  gboolean has_src, has_correct_type;
+
+  g_return_val_if_fail (play != NULL, NULL);
+  g_return_val_if_fail (element != NULL, NULL);
+  g_return_val_if_fail (GST_IS_PLAY (play), NULL);
+  g_return_val_if_fail (GST_IS_ELEMENT (element), NULL);
+
+  if (!GST_IS_BIN (element))
+    {
+      /* since its not a bin, we'll presume this 
+       * element is a sink element */
+      return element;
+    }
+
+  elements = (GList *) gst_bin_get_list (GST_BIN (element));
+
+  /* traverse all elements looking for a src pad */
+
+  while (elements)
+    {
+
+      element = GST_ELEMENT (elements->data);
+
+      /* Recursivity :) */
+
+      if (GST_IS_BIN (element))
+	{
+	  element = gst_play_get_sink_element (play, element, sink_type);
+	  if (GST_IS_ELEMENT (element))
+	    {
+	      return element;
+	    }
 	}
-	
-	elements = (GList *) gst_bin_get_list (GST_BIN(element));
-	
-	/* traverse all elements looking for a src pad */
-	
-	while (elements) {
-		
-		element = GST_ELEMENT (elements->data);
-		
-		/* Recursivity :) */
-		
-		if (GST_IS_BIN(element)) {
-			element = gst_play_get_sink_element(play,element,sink_type);
-			if (GST_IS_ELEMENT (element)) {
-				return element;
-			}
+      else
+	{
+
+	  pads = gst_element_get_pad_list (element);
+	  has_src = FALSE;
+	  has_correct_type = FALSE;
+	  while (pads)
+	    {
+	      /* check for src pad */
+	      if (GST_PAD_DIRECTION (GST_PAD (pads->data)) == GST_PAD_SRC)
+		{
+		  has_src = TRUE;
+		  break;
 		}
-		else {
-		
-			pads = gst_element_get_pad_list (element);
-			has_src = FALSE;
-			has_correct_type = FALSE;
-			while (pads) {
-				/* check for src pad */
-				if (GST_PAD_DIRECTION (GST_PAD (pads->data)) == GST_PAD_SRC) {
-					has_src = TRUE;
-					break;
-				}
-				else {
-					/* If not a src pad checking caps */
-					GstCaps *caps;
-					caps = gst_pad_get_caps (GST_PAD (pads->data));
-					while (caps) {
-						gboolean has_video_cap = FALSE, has_audio_cap = FALSE;
-						if (g_ascii_strcasecmp(	gst_caps_get_mime (caps),
-														"audio/raw") == 0)
-						{
-							has_audio_cap = TRUE;
-						}
-						if (g_ascii_strcasecmp(	gst_caps_get_mime (caps),
-														"video/raw") == 0)
-						{
-							has_video_cap = TRUE;
-						}
-					
-						switch (sink_type) {
-							case GST_PLAY_SINK_TYPE_AUDIO:
-								if (has_audio_cap)
-									has_correct_type = TRUE;
-								break;;
-							case GST_PLAY_SINK_TYPE_VIDEO:
-								if (has_video_cap)
-									has_correct_type = TRUE;
-								break;;
-							case GST_PLAY_SINK_TYPE_ANY:
-								if ( (has_video_cap) || (has_audio_cap) )
-									has_correct_type = TRUE;
-								break;;
-							default:
-								has_correct_type = FALSE;
-						}
-						caps = caps->next;
-					}
-				}
-				pads = g_list_next (pads);
+	      else
+		{
+		  /* If not a src pad checking caps */
+		  GstCaps *caps;
+		  caps = gst_pad_get_caps (GST_PAD (pads->data));
+		  while (caps)
+		    {
+		      gboolean has_video_cap = FALSE, has_audio_cap = FALSE;
+		      if (g_ascii_strcasecmp (gst_caps_get_mime (caps),
+					      "audio/raw") == 0)
+			{
+			  has_audio_cap = TRUE;
+			}
+		      if (g_ascii_strcasecmp (gst_caps_get_mime (caps),
+					      "video/raw") == 0)
+			{
+			  has_video_cap = TRUE;
 			}
-			if ( (!has_src) && (has_correct_type) ){
-				return element;
+
+		      switch (sink_type)
+			{
+			case GST_PLAY_SINK_TYPE_AUDIO:
+			  if (has_audio_cap)
+			    has_correct_type = TRUE;
+			  break;;
+			case GST_PLAY_SINK_TYPE_VIDEO:
+			  if (has_video_cap)
+			    has_correct_type = TRUE;
+			  break;;
+			case GST_PLAY_SINK_TYPE_ANY:
+			  if ((has_video_cap) || (has_audio_cap))
+			    has_correct_type = TRUE;
+			  break;;
+			default:
+			  has_correct_type = FALSE;
 			}
+		      caps = caps->next;
+		    }
 		}
-		elements = g_list_next (elements);
+	      pads = g_list_next (pads);
+	    }
+	  if ((!has_src) && (has_correct_type))
+	    {
+	      return element;
+	    }
 	}
-	/* we didn't find a sink element */
-	return NULL;
+      elements = g_list_next (elements);
+    }
+  /* we didn't find a sink element */
+  return NULL;
 }
 
 /* =========================================== */
@@ -913,14 +937,13 @@ gst_play_get_sink_element (	GstPlay *play,
  * Returns: a #GstElementStateReturn indicating if the operation succeeded.
  */
 GstElementStateReturn
-gst_play_set_state (	GstPlay *play,
-						GstElementState state)
+gst_play_set_state (GstPlay * play, GstElementState state)
 {
-	g_return_val_if_fail (play != NULL, GST_STATE_FAILURE);
-	g_return_val_if_fail (GST_IS_PLAY (play), GST_STATE_FAILURE);
-	g_return_val_if_fail (GST_IS_ELEMENT(play->pipeline), GST_STATE_FAILURE);
+  g_return_val_if_fail (play != NULL, GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_PLAY (play), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_ELEMENT (play->pipeline), GST_STATE_FAILURE);
 
-	return gst_element_set_state(play->pipeline, state);
+  return gst_element_set_state (play->pipeline, state);
 }
 
 /**
@@ -932,13 +955,13 @@ gst_play_set_state (	GstPlay *play,
  * Returns: a #GstElementState indicating @play 's pipeline current state.
  */
 GstElementState
-gst_play_get_state (GstPlay *play)
+gst_play_get_state (GstPlay * play)
 {
-	g_return_val_if_fail (play != NULL, GST_STATE_FAILURE);
-	g_return_val_if_fail (GST_IS_PLAY (play), GST_STATE_FAILURE);
-	g_return_val_if_fail (play->pipeline, GST_STATE_FAILURE);
+  g_return_val_if_fail (play != NULL, GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_PLAY (play), GST_STATE_FAILURE);
+  g_return_val_if_fail (play->pipeline, GST_STATE_FAILURE);
 
-	return gst_element_get_state(play->pipeline);
+  return gst_element_get_state (play->pipeline);
 }
 
 /**
@@ -951,39 +974,44 @@ gst_play_get_state (GstPlay *play)
  * Returns: TRUE if location was set successfully.
  */
 gboolean
-gst_play_set_location (	GstPlay *play,
-						const gchar *location)
+gst_play_set_location (GstPlay * play, const gchar * location)
 {
-	GstElementState current_state;
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
-	g_return_val_if_fail (location != NULL, FALSE);
-
-	current_state = gst_play_get_state (play);
-	if (current_state != GST_STATE_READY){
-		if (gst_play_set_state (play, GST_STATE_READY) != GST_STATE_SUCCESS)
-                        g_warning ("gst_play_set_location: setting to READY failed\n");
-	}
-
-	if (play->set_autoplugger){
-		if (! play->set_autoplugger(play, gst_element_factory_make ("spider", "autoplugger"))){
-			g_warning ("couldn't replace autoplugger\n");
-			return FALSE;
-		}
+  GstElementState current_state;
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (location != NULL, FALSE);
+
+  current_state = gst_play_get_state (play);
+  if (current_state != GST_STATE_READY)
+    {
+      if (gst_play_set_state (play, GST_STATE_READY) != GST_STATE_SUCCESS)
+	g_warning ("gst_play_set_location: setting to READY failed\n");
+    }
+
+  if (play->set_autoplugger)
+    {
+      if (!play->
+	  set_autoplugger (play,
+			   gst_element_factory_make ("spider",
+						     "autoplugger")))
+	{
+	  g_warning ("couldn't replace autoplugger\n");
+	  return FALSE;
 	}
+    }
 
-	/* FIXME check for valid location (somehow) */
-	g_object_set (G_OBJECT (play->source), "location", location, NULL);
+  /* FIXME check for valid location (somehow) */
+  g_object_set (G_OBJECT (play->source), "location", location, NULL);
 
-	/* reset time/length values */
-	play->time_seconds = 0;
-	play->length_nanos = 0LL;
-	play->time_nanos = 0LL;
-	g_signal_emit (G_OBJECT (play), gst_play_signals [STREAM_LENGTH], 0, 0LL);
-	g_signal_emit (G_OBJECT (play), gst_play_signals [TIME_TICK], 0, 0LL);
-	play->need_stream_length = TRUE;
+  /* reset time/length values */
+  play->time_seconds = 0;
+  play->length_nanos = 0LL;
+  play->time_nanos = 0LL;
+  g_signal_emit (G_OBJECT (play), gst_play_signals[STREAM_LENGTH], 0, 0LL);
+  g_signal_emit (G_OBJECT (play), gst_play_signals[TIME_TICK], 0, 0LL);
+  play->need_stream_length = TRUE;
 
-	return TRUE;
+  return TRUE;
 }
 
 /**
@@ -994,15 +1022,15 @@ gst_play_set_location (	GstPlay *play,
  *
  * Returns: a #gchar pointer to current location.
  */
-gchar*
-gst_play_get_location (GstPlay *play)
+gchar *
+gst_play_get_location (GstPlay * play)
 {
-	gchar* location;
-	g_return_val_if_fail (play != NULL, NULL);
-	g_return_val_if_fail (GST_IS_PLAY (play), NULL);
-	g_return_val_if_fail (GST_IS_ELEMENT(play->source), NULL);
-	g_object_get (G_OBJECT (play->source), "location", &location, NULL);
-	return location;
+  gchar *location;
+  g_return_val_if_fail (play != NULL, NULL);
+  g_return_val_if_fail (GST_IS_PLAY (play), NULL);
+  g_return_val_if_fail (GST_IS_ELEMENT (play->source), NULL);
+  g_object_get (G_OBJECT (play->source), "location", &location, NULL);
+  return location;
 }
 
 /**
@@ -1013,13 +1041,12 @@ gst_play_get_location (GstPlay *play)
  * Set current volume of @play.
  */
 void
-gst_play_set_volume (	GstPlay *play,
-						gfloat volume)
+gst_play_set_volume (GstPlay * play, gfloat volume)
 {
-	g_return_if_fail (play != NULL);
-	g_return_if_fail (GST_IS_PLAY (play));
+  g_return_if_fail (play != NULL);
+  g_return_if_fail (GST_IS_PLAY (play));
 
-	g_object_set(G_OBJECT(play->vol_dparam), "value_float", volume, NULL);
+  g_object_set (G_OBJECT (play->vol_dparam), "value_float", volume, NULL);
 }
 
 /**
@@ -1031,16 +1058,16 @@ gst_play_set_volume (	GstPlay *play,
  * Returns: a #gfloat indicating current volume level.
  */
 gfloat
-gst_play_get_volume (GstPlay *play)
+gst_play_get_volume (GstPlay * play)
 {
-	gfloat volume;
+  gfloat volume;
 
-	g_return_val_if_fail (play != NULL, 0);
-	g_return_val_if_fail (GST_IS_PLAY (play), 0);
+  g_return_val_if_fail (play != NULL, 0);
+  g_return_val_if_fail (GST_IS_PLAY (play), 0);
 
-	g_object_get(G_OBJECT(play->vol_dparam), "value_float", &volume, NULL);
+  g_object_get (G_OBJECT (play->vol_dparam), "value_float", &volume, NULL);
 
-	return volume;
+  return volume;
 }
 
 /**
@@ -1051,13 +1078,12 @@ gst_play_get_volume (GstPlay *play)
  * Mutes/Unmutes audio playback of @play.
  */
 void
-gst_play_set_mute (	GstPlay *play,
-					gboolean mute)
+gst_play_set_mute (GstPlay * play, gboolean mute)
 {
-	g_return_if_fail (play != NULL);
-	g_return_if_fail (GST_IS_PLAY (play));
+  g_return_if_fail (play != NULL);
+  g_return_if_fail (GST_IS_PLAY (play));
 
-	g_object_set (G_OBJECT (play->volume), "mute", mute, NULL);
+  g_object_set (G_OBJECT (play->volume), "mute", mute, NULL);
 }
 
 /**
@@ -1069,16 +1095,16 @@ gst_play_set_mute (	GstPlay *play,
  * Returns: a #gboolean indicating if audio is muted or not.
  */
 gboolean
-gst_play_get_mute (GstPlay *play)
+gst_play_get_mute (GstPlay * play)
 {
-	gboolean mute;
+  gboolean mute;
 
-	g_return_val_if_fail (play != NULL, 0);
-	g_return_val_if_fail (GST_IS_PLAY (play), 0);
+  g_return_val_if_fail (play != NULL, 0);
+  g_return_val_if_fail (GST_IS_PLAY (play), 0);
 
-	g_object_get (G_OBJECT (play->volume), "mute", &mute, NULL);
+  g_object_get (G_OBJECT (play->volume), "mute", &mute, NULL);
 
-	return mute;
+  return mute;
 }
 
 /* =========================================== */
@@ -1097,25 +1123,26 @@ gst_play_get_mute (GstPlay *play)
  * Returns: TRUE if call succeeded.
  */
 gboolean
-gst_play_set_data_src (	GstPlay *play,
-						GstElement *data_src)
+gst_play_set_data_src (GstPlay * play, GstElement * data_src)
 {
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (data_src != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (data_src), FALSE);
-
-	if (gst_play_get_state (play) != GST_STATE_READY){
-		if (gst_play_set_state (play, GST_STATE_READY) != GST_STATE_SUCCESS)
-                        g_warning ("gst_play_set_data_src: setting to READY failed\n");
-	}
-
-	if (play->set_data_src){
-		return play->set_data_src(play, data_src);
-	}
-
-	/* if there is no set_data_src func, fail quietly */
-	return FALSE;
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (data_src != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (data_src), FALSE);
+
+  if (gst_play_get_state (play) != GST_STATE_READY)
+    {
+      if (gst_play_set_state (play, GST_STATE_READY) != GST_STATE_SUCCESS)
+	g_warning ("gst_play_set_data_src: setting to READY failed\n");
+    }
+
+  if (play->set_data_src)
+    {
+      return play->set_data_src (play, data_src);
+    }
+
+  /* if there is no set_data_src func, fail quietly */
+  return FALSE;
 }
 
 /**
@@ -1128,25 +1155,26 @@ gst_play_set_data_src (	GstPlay *play,
  * Returns: TRUE if call succeeded.
  */
 gboolean
-gst_play_set_video_sink (	GstPlay *play,
-							GstElement *video_sink)
+gst_play_set_video_sink (GstPlay * play, GstElement * video_sink)
 {
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (video_sink != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (video_sink), FALSE);
-
-	if (gst_play_get_state (play) != GST_STATE_READY){
-		if (gst_play_set_state (play, GST_STATE_READY) != GST_STATE_SUCCESS)
-                        g_warning ("gst_play_set_video_sink: setting to READY failed\n");
-	}
-
-	if (play->set_video_sink){
-		return play->set_video_sink(play, video_sink);
-	}
-
-	/* if there is no set_video_sink func, fail quietly */
-	return FALSE;
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (video_sink != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (video_sink), FALSE);
+
+  if (gst_play_get_state (play) != GST_STATE_READY)
+    {
+      if (gst_play_set_state (play, GST_STATE_READY) != GST_STATE_SUCCESS)
+	g_warning ("gst_play_set_video_sink: setting to READY failed\n");
+    }
+
+  if (play->set_video_sink)
+    {
+      return play->set_video_sink (play, video_sink);
+    }
+
+  /* if there is no set_video_sink func, fail quietly */
+  return FALSE;
 }
 
 /**
@@ -1159,25 +1187,26 @@ gst_play_set_video_sink (	GstPlay *play,
  * Returns: TRUE if call succeeded.
  */
 gboolean
-gst_play_set_audio_sink (	GstPlay *play,
-							GstElement *audio_sink)
+gst_play_set_audio_sink (GstPlay * play, GstElement * audio_sink)
 {
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (audio_sink != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (audio_sink), FALSE);
-
-	if (gst_play_get_state (play) != GST_STATE_READY){
-		if (gst_play_set_state (play, GST_STATE_READY) != GST_STATE_SUCCESS)
-                        g_warning ("gst_play_set_audio_sink: setting to READY failed\n");
-	}
-
-	if (play->set_audio_sink){
-		return play->set_audio_sink(play, audio_sink);
-	}
-
-	/* if there is no set_audio_sink func, fail quietly */
-	return FALSE;
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (audio_sink != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (audio_sink), FALSE);
+
+  if (gst_play_get_state (play) != GST_STATE_READY)
+    {
+      if (gst_play_set_state (play, GST_STATE_READY) != GST_STATE_SUCCESS)
+	g_warning ("gst_play_set_audio_sink: setting to READY failed\n");
+    }
+
+  if (play->set_audio_sink)
+    {
+      return play->set_audio_sink (play, audio_sink);
+    }
+
+  /* if there is no set_audio_sink func, fail quietly */
+  return FALSE;
 }
 
 /* =========================================== */
@@ -1189,129 +1218,126 @@ gst_play_set_audio_sink (	GstPlay *play,
 GType
 gst_play_get_type (void)
 {
-	static GType play_type = 0;
-	
-	if (!play_type)
-	{
-		static const GTypeInfo play_info = {
-			sizeof (GstPlayClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gst_play_class_init,
-			NULL, NULL, sizeof (GstPlay),
-			0, (GInstanceInitFunc) gst_play_init,
-			NULL
-		};
-      
-		play_type = g_type_register_static (G_TYPE_OBJECT, "GstPlay", &play_info, 0);
-	}
-
-	return play_type;
+  static GType play_type = 0;
+
+  if (!play_type)
+    {
+      static const GTypeInfo play_info = {
+	sizeof (GstPlayClass),
+	(GBaseInitFunc) NULL,
+	(GBaseFinalizeFunc) NULL,
+	(GClassInitFunc) gst_play_class_init,
+	NULL, NULL, sizeof (GstPlay),
+	0, (GInstanceInitFunc) gst_play_init,
+	NULL
+      };
+
+      play_type =
+	g_type_register_static (G_TYPE_OBJECT, "GstPlay", &play_info, 0);
+    }
+
+  return play_type;
 }
 
 
 GstPlay *
-gst_play_new (	GstPlayPipeType pipe_type,
-				GError **error)
+gst_play_new (GstPlayPipeType pipe_type, GError ** error)
 {
-	GstPlay *play;
-
-	play = g_object_new (GST_TYPE_PLAY, NULL);
-
-	/* FIXME: looks like only VIDEO ever gets used ! */
-	switch (pipe_type){
-		case GST_PLAY_PIPE_VIDEO:
-			play->setup_pipeline = gst_play_video_setup;
-			play->teardown_pipeline = NULL;
-			play->set_data_src = gst_play_video_set_data_src;
-			play->set_autoplugger = gst_play_video_set_auto;
-			play->set_video_sink = gst_play_video_set_video;
-			play->set_audio_sink = gst_play_video_set_audio;
-			break;
-		case GST_PLAY_PIPE_VIDEO_VISUALISATION:
-			play->setup_pipeline = gst_play_video_vis_setup;
-			play->teardown_pipeline = NULL;
-			play->set_data_src = gst_play_video_set_data_src;
-			play->set_autoplugger = gst_play_video_set_auto;
-			play->set_video_sink = gst_play_video_vis_set_video;
-			play->set_audio_sink = gst_play_video_vis_set_audio;
-			break;
-		case GST_PLAY_PIPE_AUDIO:
-			/* we can reuse the threaded set functions */
-			play->setup_pipeline = gst_play_audio_setup;
-			play->teardown_pipeline = NULL;
-			play->set_data_src = gst_play_simple_set_data_src;
-			play->set_autoplugger = gst_play_audiot_set_auto;
-			play->set_video_sink = NULL;
-			play->set_audio_sink = gst_play_audiot_set_audio;
-			break;
-		case GST_PLAY_PIPE_AUDIO_THREADED:
-			play->setup_pipeline = gst_play_audiot_setup;
-			play->teardown_pipeline = NULL;
-			play->set_data_src = gst_play_simple_set_data_src;
-			play->set_autoplugger = gst_play_audiot_set_auto;
-			play->set_video_sink = NULL;
-			play->set_audio_sink = gst_play_audiot_set_audio;
-			break;
-		case GST_PLAY_PIPE_AUDIO_HYPER_THREADED:
-			play->setup_pipeline = gst_play_audioht_setup;
-			play->teardown_pipeline = NULL;
-			play->set_data_src = gst_play_simple_set_data_src;
-			play->set_autoplugger = gst_play_audioht_set_auto;
-			play->set_video_sink = NULL;
-			play->set_audio_sink = gst_play_audioht_set_audio;
-			break;
-		default:
-			g_warning("unknown pipeline type: %d\n", pipe_type);
-	}
-
-	/* init pipeline */
-	if ((play->setup_pipeline) &&
-	    (! play->setup_pipeline (play, error)))
-	{
-		g_object_unref (play);
-		return NULL;
-	}
-
-
-	if (play->pipeline) {
-		/* connect to pipeline events */
-		g_signal_connect (	G_OBJECT (play->pipeline),
-							"deep_notify",
-							G_CALLBACK (callback_pipeline_deep_notify),
-							play);
-		g_signal_connect (	G_OBJECT (play->pipeline),
-							"state_change",
-							G_CALLBACK (callback_pipeline_state_change),
-							play);
-		g_signal_connect (	G_OBJECT (play->pipeline),
-							"error",
-							G_CALLBACK (callback_pipeline_error),
-							play);
-	}
-
-	if (play->volume) {
-		play->vol_dpman =  gst_dpman_get_manager(play->volume);
-		play->vol_dparam = gst_dpsmooth_new(G_TYPE_FLOAT);
-  
-		g_object_set(	G_OBJECT(play->vol_dparam),
-						"update_period", 2000000LL, NULL);
-  
-		g_object_set(	G_OBJECT(play->vol_dparam),
-						"slope_delta_float", 0.1F, NULL);
-		g_object_set(	G_OBJECT(play->vol_dparam),
-						"slope_time", 10000000LL, NULL); 
- 
-		if (!gst_dpman_attach_dparam (	play->vol_dpman,
-										"volume",
-										play->vol_dparam))
-			g_warning("could not attach dparam to volume element\n");
-		
-		gst_dpman_set_mode(play->vol_dpman, "asynchronous");
-		gst_play_set_volume(play, 0.9);
-	}
-	
-	play->signal_queue = g_async_queue_new();
-
-	return play;
+  GstPlay *play;
+
+  play = g_object_new (GST_TYPE_PLAY, NULL);
+
+  /* FIXME: looks like only VIDEO ever gets used ! */
+  switch (pipe_type)
+    {
+    case GST_PLAY_PIPE_VIDEO:
+      play->setup_pipeline = gst_play_video_setup;
+      play->teardown_pipeline = NULL;
+      play->set_data_src = gst_play_video_set_data_src;
+      play->set_autoplugger = gst_play_video_set_auto;
+      play->set_video_sink = gst_play_video_set_video;
+      play->set_audio_sink = gst_play_video_set_audio;
+      break;
+    case GST_PLAY_PIPE_VIDEO_VISUALISATION:
+      play->setup_pipeline = gst_play_video_vis_setup;
+      play->teardown_pipeline = NULL;
+      play->set_data_src = gst_play_video_set_data_src;
+      play->set_autoplugger = gst_play_video_set_auto;
+      play->set_video_sink = gst_play_video_vis_set_video;
+      play->set_audio_sink = gst_play_video_vis_set_audio;
+      break;
+    case GST_PLAY_PIPE_AUDIO:
+      /* we can reuse the threaded set functions */
+      play->setup_pipeline = gst_play_audio_setup;
+      play->teardown_pipeline = NULL;
+      play->set_data_src = gst_play_simple_set_data_src;
+      play->set_autoplugger = gst_play_audiot_set_auto;
+      play->set_video_sink = NULL;
+      play->set_audio_sink = gst_play_audiot_set_audio;
+      break;
+    case GST_PLAY_PIPE_AUDIO_THREADED:
+      play->setup_pipeline = gst_play_audiot_setup;
+      play->teardown_pipeline = NULL;
+      play->set_data_src = gst_play_simple_set_data_src;
+      play->set_autoplugger = gst_play_audiot_set_auto;
+      play->set_video_sink = NULL;
+      play->set_audio_sink = gst_play_audiot_set_audio;
+      break;
+    case GST_PLAY_PIPE_AUDIO_HYPER_THREADED:
+      play->setup_pipeline = gst_play_audioht_setup;
+      play->teardown_pipeline = NULL;
+      play->set_data_src = gst_play_simple_set_data_src;
+      play->set_autoplugger = gst_play_audioht_set_auto;
+      play->set_video_sink = NULL;
+      play->set_audio_sink = gst_play_audioht_set_audio;
+      break;
+    default:
+      g_warning ("unknown pipeline type: %d\n", pipe_type);
+    }
+
+  /* init pipeline */
+  if ((play->setup_pipeline) && (!play->setup_pipeline (play, error)))
+    {
+      g_object_unref (play);
+      return NULL;
+    }
+
+
+  if (play->pipeline)
+    {
+      /* connect to pipeline events */
+      g_signal_connect (G_OBJECT (play->pipeline),
+			"deep_notify",
+			G_CALLBACK (callback_pipeline_deep_notify), play);
+      g_signal_connect (G_OBJECT (play->pipeline),
+			"state_change",
+			G_CALLBACK (callback_pipeline_state_change), play);
+      g_signal_connect (G_OBJECT (play->pipeline),
+			"error", G_CALLBACK (callback_pipeline_error), play);
+    }
+
+  if (play->volume)
+    {
+      play->vol_dpman = gst_dpman_get_manager (play->volume);
+      play->vol_dparam = gst_dpsmooth_new (G_TYPE_FLOAT);
+
+      g_object_set (G_OBJECT (play->vol_dparam),
+		    "update_period", 2000000LL, NULL);
+
+      g_object_set (G_OBJECT (play->vol_dparam),
+		    "slope_delta_float", 0.1F, NULL);
+      g_object_set (G_OBJECT (play->vol_dparam),
+		    "slope_time", 10000000LL, NULL);
+
+      if (!gst_dpman_attach_dparam (play->vol_dpman,
+				    "volume", play->vol_dparam))
+	g_warning ("could not attach dparam to volume element\n");
+
+      gst_dpman_set_mode (play->vol_dpman, "asynchronous");
+      gst_play_set_volume (play, 0.9);
+    }
+
+  play->signal_queue = g_async_queue_new ();
+
+  return play;
 }
diff --git a/gst-libs/gst/play/play.old.h b/gst-libs/gst/play/play.old.h
index 36057505..1c4f594e 100644
--- a/gst-libs/gst/play/play.old.h
+++ b/gst-libs/gst/play/play.old.h
@@ -40,36 +40,44 @@
  * playing state.
  */
 
-typedef enum {
-	GST_PLAY_OK,
-	GST_PLAY_UNKNOWN_MEDIA,
-	GST_PLAY_CANNOT_PLAY,
-	GST_PLAY_ERROR,
-} GstPlayReturn;
-
-typedef enum {
-	GST_PLAY_PIPE_AUDIO,
-	GST_PLAY_PIPE_AUDIO_THREADED,
-	GST_PLAY_PIPE_AUDIO_HYPER_THREADED,
-	GST_PLAY_PIPE_VIDEO,
-	GST_PLAY_PIPE_VIDEO_VISUALISATION,
-} GstPlayPipeType;
-
-typedef enum {
-	GST_PLAY_ERROR_FAKESINK,
-	GST_PLAY_ERROR_THREAD,
-	GST_PLAY_ERROR_QUEUE,
-	GST_PLAY_ERROR_GNOMEVFSSRC,
-	GST_PLAY_ERROR_VOLUME,
-	GST_PLAY_ERROR_COLORSPACE,
-	GST_PLAY_ERROR_LAST,
-} GstPlayError;
-
-typedef enum {
-	GST_PLAY_SINK_TYPE_AUDIO,
-	GST_PLAY_SINK_TYPE_VIDEO,
-	GST_PLAY_SINK_TYPE_ANY,
-} GstPlaySinkType;
+typedef enum
+{
+  GST_PLAY_OK,
+  GST_PLAY_UNKNOWN_MEDIA,
+  GST_PLAY_CANNOT_PLAY,
+  GST_PLAY_ERROR,
+}
+GstPlayReturn;
+
+typedef enum
+{
+  GST_PLAY_PIPE_AUDIO,
+  GST_PLAY_PIPE_AUDIO_THREADED,
+  GST_PLAY_PIPE_AUDIO_HYPER_THREADED,
+  GST_PLAY_PIPE_VIDEO,
+  GST_PLAY_PIPE_VIDEO_VISUALISATION,
+}
+GstPlayPipeType;
+
+typedef enum
+{
+  GST_PLAY_ERROR_FAKESINK,
+  GST_PLAY_ERROR_THREAD,
+  GST_PLAY_ERROR_QUEUE,
+  GST_PLAY_ERROR_GNOMEVFSSRC,
+  GST_PLAY_ERROR_VOLUME,
+  GST_PLAY_ERROR_COLORSPACE,
+  GST_PLAY_ERROR_LAST,
+}
+GstPlayError;
+
+typedef enum
+{
+  GST_PLAY_SINK_TYPE_AUDIO,
+  GST_PLAY_SINK_TYPE_VIDEO,
+  GST_PLAY_SINK_TYPE_ANY,
+}
+GstPlaySinkType;
 
 #define GST_PLAY_ERROR 		gst_play_error_quark ()
 
@@ -80,168 +88,131 @@ typedef enum {
 #define GST_IS_PLAY_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLAY))
 #define GST_PLAY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PLAY, GstPlayClass))
 
-typedef struct _GstPlay          GstPlay;
-typedef struct _GstPlayClass     GstPlayClass;
-typedef struct _GstPlayIdleData  GstPlayIdleData;
+typedef struct _GstPlay GstPlay;
+typedef struct _GstPlayClass GstPlayClass;
+typedef struct _GstPlayIdleData GstPlayIdleData;
 
-typedef guint (*GstPlayTimeoutAdd) (	guint interval,
-										GSourceFunc function,
-										gpointer data);
-typedef guint (*GstPlayIdleAdd)    (GSourceFunc function, gpointer data);
+typedef guint (*GstPlayTimeoutAdd) (guint interval,
+				    GSourceFunc function, gpointer data);
+typedef guint (*GstPlayIdleAdd) (GSourceFunc function, gpointer data);
 
 struct _GstPlay
 {
-	GObject parent;
-	
-	gboolean (*setup_pipeline)     (GstPlay *play, GError **error);
-	void (*teardown_pipeline)      (GstPlay *play);
-	gboolean (*set_data_src)       (GstPlay *play, GstElement *datasrc);
-	gboolean (*set_autoplugger)    (GstPlay *play, GstElement *autoplugger);
-	gboolean (*set_video_sink)     (GstPlay *play, GstElement *videosink);
-	gboolean (*set_audio_sink)     (GstPlay *play, GstElement *audiosink);
-	
-	/* core elements */
-	GstElement *pipeline;
-	GstElement *volume;
-	GstElement *source;
-	GstElement *autoplugger;
-	GstElement *video_sink;
-	GstElement *video_sink_element;
-	GstElement *audio_sink;
-	GstElement *audio_sink_element;
-	GstElement *visualisation_sink_element;
-
-	GstDParamManager *vol_dpman;
-	GstDParam *vol_dparam;
-	GHashTable *other_elements;
-
-	GstClock *clock;
-
-	gboolean need_stream_length;
-	gboolean need_seek;
- 	gint time_seconds;
-	gint get_length_attempt;
-	gint64 seek_time;
- 	gint64 time_nanos;
- 	gint64 length_nanos;
-	
-	GAsyncQueue *signal_queue;
-
-	GstPlayTimeoutAdd timeout_add_func;
-	GstPlayIdleAdd    idle_add_func;
+  GObject parent;
+
+    gboolean (*setup_pipeline) (GstPlay * play, GError ** error);
+  void (*teardown_pipeline) (GstPlay * play);
+    gboolean (*set_data_src) (GstPlay * play, GstElement * datasrc);
+    gboolean (*set_autoplugger) (GstPlay * play, GstElement * autoplugger);
+    gboolean (*set_video_sink) (GstPlay * play, GstElement * videosink);
+    gboolean (*set_audio_sink) (GstPlay * play, GstElement * audiosink);
+
+  /* core elements */
+  GstElement *pipeline;
+  GstElement *volume;
+  GstElement *source;
+  GstElement *autoplugger;
+  GstElement *video_sink;
+  GstElement *video_sink_element;
+  GstElement *audio_sink;
+  GstElement *audio_sink_element;
+  GstElement *visualisation_sink_element;
+
+  GstDParamManager *vol_dpman;
+  GstDParam *vol_dparam;
+  GHashTable *other_elements;
+
+  GstClock *clock;
+
+  gboolean need_stream_length;
+  gboolean need_seek;
+  gint time_seconds;
+  gint get_length_attempt;
+  gint64 seek_time;
+  gint64 time_nanos;
+  gint64 length_nanos;
+
+  GAsyncQueue *signal_queue;
+
+  GstPlayTimeoutAdd timeout_add_func;
+  GstPlayIdleAdd idle_add_func;
 };
 
 struct _GstPlayClass
 {
-	GObjectClass parent_class;
-	
-	/* signals */
-	void (*information)		(GstPlay* play,
-								GstObject* element,
-								GParamSpec *param);
-	void (*pipeline_error)	(GstPlay* play,
-								GstElement* element,
-								char *error);
-	void (*state_changed)	(GstPlay* play,
-								GstElementState old_state,
-								GstElementState new_state);
-	void (*stream_end)		(GstPlay* play);
-	void (*time_tick)		(GstPlay* play,
-								gint64 time_nanos);
-	void (*stream_length)	(GstPlay* play,
-								gint64 length_nanos);
-	void (*have_xid)	  	(GstPlay* play,
-								gint xid);
-	void (*have_vis_xid)	 (GstPlay* play,
-								gint xid);
-	void (*have_video_size)	(GstPlay* play,
-								gint width,
-								gint height);
+  GObjectClass parent_class;
+
+  /* signals */
+  void (*information) (GstPlay * play,
+		       GstObject * element, GParamSpec * param);
+  void (*pipeline_error) (GstPlay * play, GstElement * element, char *error);
+  void (*state_changed) (GstPlay * play,
+			 GstElementState old_state,
+			 GstElementState new_state);
+  void (*stream_end) (GstPlay * play);
+  void (*time_tick) (GstPlay * play, gint64 time_nanos);
+  void (*stream_length) (GstPlay * play, gint64 length_nanos);
+  void (*have_xid) (GstPlay * play, gint xid);
+  void (*have_vis_xid) (GstPlay * play, gint xid);
+  void (*have_video_size) (GstPlay * play, gint width, gint height);
 };
 
 struct _GstPlayIdleData
 {
-	GSourceFunc func;
-	gpointer data;
+  GSourceFunc func;
+  gpointer data;
 };
 
 
-void
-gst_play_seek_to_time (	GstPlay *play,
-						gint64 time_nanos);
+void gst_play_seek_to_time (GstPlay * play, gint64 time_nanos);
 
-void
-gst_play_need_new_video_window (GstPlay *play);
+void gst_play_need_new_video_window (GstPlay * play);
 
 void
-gst_play_set_idle_timeout_funcs (	GstPlay *play,
-									GstPlayTimeoutAdd timeout_add_func,
-									GstPlayIdleAdd idle_add_func);
-GstElement*
-gst_play_get_sink_element (	GstPlay *play,
-							GstElement *element,
-							GstPlaySinkType sink_type);
+gst_play_set_idle_timeout_funcs (GstPlay * play,
+				 GstPlayTimeoutAdd timeout_add_func,
+				 GstPlayIdleAdd idle_add_func);
+GstElement *gst_play_get_sink_element (GstPlay * play,
+				       GstElement * element,
+				       GstPlaySinkType sink_type);
 
 /* Set/Get state */
 
 GstElementStateReturn
-gst_play_set_state (	GstPlay *play,
-						GstElementState state);
-GstElementState
-gst_play_get_state (GstPlay *play);
+gst_play_set_state (GstPlay * play, GstElementState state);
+GstElementState gst_play_get_state (GstPlay * play);
 
 /* Set/Get location */
 
-gboolean
-gst_play_set_location (	GstPlay *play,
-						const gchar *location);
-gchar*
-gst_play_get_location (GstPlay *play);
+gboolean gst_play_set_location (GstPlay * play, const gchar * location);
+gchar *gst_play_get_location (GstPlay * play);
 
 /* Set/Get volume */
 
-void
-gst_play_set_volume (	GstPlay *play,
-						gfloat volume);
-gfloat
-gst_play_get_volume (GstPlay *play);
+void gst_play_set_volume (GstPlay * play, gfloat volume);
+gfloat gst_play_get_volume (GstPlay * play);
 
 /* Set/Get mute */
 
-void
-gst_play_set_mute (	GstPlay *play,
-					gboolean mute);
-gboolean
-gst_play_get_mute (GstPlay *play);
+void gst_play_set_mute (GstPlay * play, gboolean mute);
+gboolean gst_play_get_mute (GstPlay * play);
 
 /* Set sinks and data src */
 
+gboolean gst_play_set_data_src (GstPlay * play, GstElement * data_src);
+gboolean gst_play_set_video_sink (GstPlay * play, GstElement * video_sink);
 gboolean
-gst_play_set_data_src (	GstPlay *play,
-						GstElement *data_src);
-gboolean
-gst_play_set_video_sink (	GstPlay *play,
-							GstElement *video_sink);
-gboolean
-gst_play_set_visualisation_video_sink (	GstPlay *play,
-										GstElement *video_sink);
-gboolean
-gst_play_set_audio_sink (	GstPlay *play,
-							GstElement *audio_sink);
+gst_play_set_visualisation_video_sink (GstPlay * play,
+				       GstElement * video_sink);
+gboolean gst_play_set_audio_sink (GstPlay * play, GstElement * audio_sink);
 
 gboolean
-gst_play_set_visualisation_element (	GstPlay *play,
-										GstElement *element);
-										
-gboolean
-gst_play_connect_visualisation (	GstPlay *play,
-									gboolean connect);
-									
-GType
-gst_play_get_type (void);
-
-GstPlay *
-gst_play_new (	GstPlayPipeType pipe_type,
-				GError **error);
+gst_play_set_visualisation_element (GstPlay * play, GstElement * element);
+
+gboolean gst_play_connect_visualisation (GstPlay * play, gboolean connect);
+
+GType gst_play_get_type (void);
+
+GstPlay *gst_play_new (GstPlayPipeType pipe_type, GError ** error);
 
 #endif /* __GSTPLAY_H__ */
diff --git a/gst-libs/gst/play/playpipelines.c b/gst-libs/gst/play/playpipelines.c
index d5baa166..43b71c04 100644
--- a/gst-libs/gst/play/playpipelines.c
+++ b/gst-libs/gst/play/playpipelines.c
@@ -23,32 +23,34 @@
  */
 
 static gboolean
-gst_play_default_set_data_src (	GstPlay *play,
-								GstElement *datasrc,
-								GstElement* parent)
+gst_play_default_set_data_src (GstPlay * play,
+			       GstElement * datasrc, GstElement * parent)
 {
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (datasrc != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (datasrc), FALSE);
-	
-	if (GST_IS_ELEMENT(play->source)) {
-		/* we need to remove the existing data
-			source before creating a new one */
-		if (GST_IS_ELEMENT(play->autoplugger)){
-			gst_element_unlink (play->autoplugger, play->source);
-		}
-		gst_bin_remove (GST_BIN(parent), play->source);
-	}
-	
-	play->source = datasrc;
-	g_return_val_if_fail (play->source != NULL, FALSE);
-
-	gst_bin_add (GST_BIN (parent), play->source);
-	if (GST_IS_ELEMENT(play->autoplugger)){
-		gst_element_link (play->autoplugger, play->source);
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (datasrc != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (datasrc), FALSE);
+
+  if (GST_IS_ELEMENT (play->source))
+    {
+      /* we need to remove the existing data
+         source before creating a new one */
+      if (GST_IS_ELEMENT (play->autoplugger))
+	{
+	  gst_element_unlink (play->autoplugger, play->source);
 	}
-	return TRUE;
+      gst_bin_remove (GST_BIN (parent), play->source);
+    }
+
+  play->source = datasrc;
+  g_return_val_if_fail (play->source != NULL, FALSE);
+
+  gst_bin_add (GST_BIN (parent), play->source);
+  if (GST_IS_ELEMENT (play->autoplugger))
+    {
+      gst_element_link (play->autoplugger, play->source);
+    }
+  return TRUE;
 }
 
 /*  
@@ -56,173 +58,166 @@ gst_play_default_set_data_src (	GstPlay *play,
  *  gnomevfssrc ! spider ! volume ! osssink
  */
 
-static gboolean 
-gst_play_audio_setup (	GstPlay *play,
-						GError **error)
+static gboolean
+gst_play_audio_setup (GstPlay * play, GError ** error)
 {
-	
-	/* creating gst_bin */
-	play->pipeline = gst_pipeline_new ("main_pipeline");
-	g_return_val_if_fail (GST_IS_PIPELINE (play->pipeline), FALSE);
-
-	/* create source element */
-	play->source = gst_element_factory_make ("gnomevfssrc", "source");
-	if (!play->source)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_GNOMEVFSSRC, error);
-		return FALSE;
-	}
-	
-	/* Adding element to bin */
-	gst_bin_add (GST_BIN (play->pipeline), play->source);
-	
-	/* create audio elements */
-	play->volume = gst_element_factory_make ("volume", "volume");
-	if (!play->volume)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_VOLUME, error);
-		return FALSE;
-	}
 
-	/* creating fake audio_sink */
-	play->audio_sink = gst_element_factory_make ("fakesink", "fake_audio");
-	if (play->audio_sink == NULL)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
-		return FALSE;
-	}
-	
-	gst_bin_add_many (
-			GST_BIN (play->pipeline), play->volume,
-			play->audio_sink, NULL);
-	
-	gst_element_link (play->volume, play->audio_sink);
-
-	return TRUE;
+  /* creating gst_bin */
+  play->pipeline = gst_pipeline_new ("main_pipeline");
+  g_return_val_if_fail (GST_IS_PIPELINE (play->pipeline), FALSE);
+
+  /* create source element */
+  play->source = gst_element_factory_make ("gnomevfssrc", "source");
+  if (!play->source)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_GNOMEVFSSRC, error);
+      return FALSE;
+    }
+
+  /* Adding element to bin */
+  gst_bin_add (GST_BIN (play->pipeline), play->source);
+
+  /* create audio elements */
+  play->volume = gst_element_factory_make ("volume", "volume");
+  if (!play->volume)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_VOLUME, error);
+      return FALSE;
+    }
+
+  /* creating fake audio_sink */
+  play->audio_sink = gst_element_factory_make ("fakesink", "fake_audio");
+  if (play->audio_sink == NULL)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
+      return FALSE;
+    }
+
+  gst_bin_add_many (GST_BIN (play->pipeline), play->volume,
+		    play->audio_sink, NULL);
+
+  gst_element_link (play->volume, play->audio_sink);
+
+  return TRUE;
 }
 
 static gboolean
-gst_play_simple_set_data_src (	GstPlay *play,
-								GstElement *datasrc)
+gst_play_simple_set_data_src (GstPlay * play, GstElement * datasrc)
 {
-	return gst_play_default_set_data_src(play, datasrc, play->pipeline);
+  return gst_play_default_set_data_src (play, datasrc, play->pipeline);
 }
 
 /*
  *  GST_PLAY_PIPE_AUDIO_THREADED
  *  { gnomevfssrc ! spider ! volume ! osssink }
  */
- 
-static gboolean 
-gst_play_audiot_setup (	GstPlay *play,
-						GError **error)
-{
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	
-	/* creating gst_thread */
-	play->pipeline = gst_thread_new ("main_pipeline");
-	g_return_val_if_fail (GST_IS_THREAD (play->pipeline), FALSE);
 
-	/* create source element */
-	play->source = gst_element_factory_make ("gnomevfssrc", "source");
-	if (!play->source)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_GNOMEVFSSRC, error);
-		return FALSE;
-	}
-	
-	/* Adding element to bin */
-	gst_bin_add (GST_BIN (play->pipeline), play->source);
-	
-	/* create audio elements */
-	play->volume = gst_element_factory_make ("volume", "volume");
-	if (!play->volume)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_VOLUME, error);
-		return FALSE;
-	}
-
-	/* creating fake audiosink */
-	play->audio_sink = gst_element_factory_make ("fakesink", "fake_audio");
-	if (play->audio_sink == NULL)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
-		return FALSE;
-	}
-	
-	gst_bin_add_many (
-			GST_BIN (play->pipeline), play->volume,
-			play->audio_sink, NULL);
-	
-	gst_element_link (play->volume, play->audio_sink);
-	
-	return TRUE;
+static gboolean
+gst_play_audiot_setup (GstPlay * play, GError ** error)
+{
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+
+  /* creating gst_thread */
+  play->pipeline = gst_thread_new ("main_pipeline");
+  g_return_val_if_fail (GST_IS_THREAD (play->pipeline), FALSE);
+
+  /* create source element */
+  play->source = gst_element_factory_make ("gnomevfssrc", "source");
+  if (!play->source)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_GNOMEVFSSRC, error);
+      return FALSE;
+    }
+
+  /* Adding element to bin */
+  gst_bin_add (GST_BIN (play->pipeline), play->source);
+
+  /* create audio elements */
+  play->volume = gst_element_factory_make ("volume", "volume");
+  if (!play->volume)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_VOLUME, error);
+      return FALSE;
+    }
+
+  /* creating fake audiosink */
+  play->audio_sink = gst_element_factory_make ("fakesink", "fake_audio");
+  if (play->audio_sink == NULL)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
+      return FALSE;
+    }
+
+  gst_bin_add_many (GST_BIN (play->pipeline), play->volume,
+		    play->audio_sink, NULL);
+
+  gst_element_link (play->volume, play->audio_sink);
+
+  return TRUE;
 }
 
 
 static gboolean
-gst_play_audiot_set_audio (	GstPlay *play,
-							GstElement *audio_sink)
+gst_play_audiot_set_audio (GstPlay * play, GstElement * audio_sink)
 {
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (audio_sink != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (audio_sink), FALSE);
-	
-	if (play->audio_sink)
-	{
-		gst_element_unlink (play->volume, play->audio_sink);
-		gst_bin_remove (GST_BIN (play->pipeline), play->audio_sink);
-	}
-
-	play->audio_sink = audio_sink;
-	gst_bin_add (GST_BIN (play->pipeline), play->audio_sink);
-	gst_element_link (play->volume, play->audio_sink);
-
-	play->audio_sink_element = gst_play_get_sink_element (
-										play,
-										audio_sink,
-										GST_PLAY_SINK_TYPE_AUDIO);
-	
-	play->visualisation_sink_element = gst_play_get_sink_element (
-										play,
-										audio_sink,
-										GST_PLAY_SINK_TYPE_VIDEO);
-	
-	if (play->audio_sink_element != NULL) {
-		g_signal_connect (G_OBJECT (play->audio_sink_element), "eos",
-				  G_CALLBACK (callback_audio_sink_eos), play);
-	}
-	
-	return TRUE;
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (audio_sink != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (audio_sink), FALSE);
+
+  if (play->audio_sink)
+    {
+      gst_element_unlink (play->volume, play->audio_sink);
+      gst_bin_remove (GST_BIN (play->pipeline), play->audio_sink);
+    }
+
+  play->audio_sink = audio_sink;
+  gst_bin_add (GST_BIN (play->pipeline), play->audio_sink);
+  gst_element_link (play->volume, play->audio_sink);
+
+  play->audio_sink_element = gst_play_get_sink_element (play,
+							audio_sink,
+							GST_PLAY_SINK_TYPE_AUDIO);
+
+  play->visualisation_sink_element = gst_play_get_sink_element (play,
+								audio_sink,
+								GST_PLAY_SINK_TYPE_VIDEO);
+
+  if (play->audio_sink_element != NULL)
+    {
+      g_signal_connect (G_OBJECT (play->audio_sink_element), "eos",
+			G_CALLBACK (callback_audio_sink_eos), play);
+    }
+
+  return TRUE;
 }
 
 
 static gboolean
-gst_play_audiot_set_auto (	GstPlay *play,
-							GstElement *autoplugger)
+gst_play_audiot_set_auto (GstPlay * play, GstElement * autoplugger)
 {
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (autoplugger != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (autoplugger), FALSE);
-	
-	if (play->autoplugger) {
-		/* we need to remove the existing autoplugger
-			before creating a new one */
-		gst_element_unlink (play->autoplugger, play->volume);
-		gst_element_unlink (play->autoplugger, play->source);
-		gst_bin_remove (GST_BIN (play->pipeline), play->autoplugger);
-	}
-	
-	play->autoplugger = autoplugger;
-	g_return_val_if_fail (play->autoplugger != NULL, FALSE);
-
-	gst_bin_add (GST_BIN (play->pipeline), play->autoplugger);
-	gst_element_link (play->source, play->autoplugger);
-	gst_element_link (play->autoplugger, play->volume);
-	return TRUE;
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (autoplugger != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (autoplugger), FALSE);
+
+  if (play->autoplugger)
+    {
+      /* we need to remove the existing autoplugger
+         before creating a new one */
+      gst_element_unlink (play->autoplugger, play->volume);
+      gst_element_unlink (play->autoplugger, play->source);
+      gst_bin_remove (GST_BIN (play->pipeline), play->autoplugger);
+    }
+
+  play->autoplugger = autoplugger;
+  g_return_val_if_fail (play->autoplugger != NULL, FALSE);
+
+  gst_bin_add (GST_BIN (play->pipeline), play->autoplugger);
+  gst_element_link (play->source, play->autoplugger);
+  gst_element_link (play->autoplugger, play->volume);
+  return TRUE;
 }
 
 /*
@@ -230,153 +225,149 @@ gst_play_audiot_set_auto (	GstPlay *play,
  *  { gnomevfssrc ! spider ! { queue ! volume ! osssink } }
  */
 
-static gboolean 
-gst_play_audioht_setup (	GstPlay *play,
-							GError **error)
+static gboolean
+gst_play_audioht_setup (GstPlay * play, GError ** error)
 {
-	GstElement *audio_thread, *audio_queue;
+  GstElement *audio_thread, *audio_queue;
+
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
 
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	
 /*
 	play->pipeline = gst_thread_new ("main_pipeline");
 	g_return_val_if_fail (GST_IS_THREAD (play->pipeline), FALSE);
 */
 
-	/* creating pipeline */
-	play->pipeline = gst_pipeline_new ("main_pipeline");
-	g_return_val_if_fail (GST_IS_PIPELINE (play->pipeline), FALSE);
-
-	/* create source element */
-	play->source = gst_element_factory_make ("gnomevfssrc", "source");
-	if (!play->source)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_GNOMEVFSSRC, error);
-		return FALSE;
-	}
-	
-	/* Adding element to bin */
-	gst_bin_add (GST_BIN (play->pipeline), play->source);
-
-	/* create audio thread */
-	audio_thread = gst_thread_new ("audio_thread");
-	g_return_val_if_fail (GST_IS_THREAD (audio_thread), FALSE);
-	
-	g_hash_table_insert(play->other_elements, "audio_thread", audio_thread);
-	
-	/* create audio queue */
-	audio_queue = gst_element_factory_make ("queue", "audio_queue");
-	if (!audio_queue)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_QUEUE, error);
-		return FALSE;
-	}
-	
-	g_hash_table_insert(play->other_elements, "audio_queue", audio_queue);
-	
-	/* create source element */
-	play->volume = gst_element_factory_make ("volume", "volume");
-	if (!play->volume)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_VOLUME, error);
-		return FALSE;
-	}
-
-	/* create audiosink. */
-	play->audio_sink = gst_element_factory_make ("fakesink", "play_audio");
-	if (play->audio_sink == NULL)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
-		return FALSE;
-	}
-	
-	gst_bin_add_many (
-				GST_BIN (audio_thread), audio_queue, play->volume,
-				play->audio_sink, NULL);
-	
-	gst_element_link_many (audio_queue, play->volume, play->audio_sink);
-	
-	gst_element_add_ghost_pad (
-				audio_thread, gst_element_get_pad (audio_queue, "sink"),
-			   "sink");
-
-	gst_bin_add (GST_BIN (play->pipeline), audio_thread);
-
-	return TRUE;
+  /* creating pipeline */
+  play->pipeline = gst_pipeline_new ("main_pipeline");
+  g_return_val_if_fail (GST_IS_PIPELINE (play->pipeline), FALSE);
+
+  /* create source element */
+  play->source = gst_element_factory_make ("gnomevfssrc", "source");
+  if (!play->source)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_GNOMEVFSSRC, error);
+      return FALSE;
+    }
+
+  /* Adding element to bin */
+  gst_bin_add (GST_BIN (play->pipeline), play->source);
+
+  /* create audio thread */
+  audio_thread = gst_thread_new ("audio_thread");
+  g_return_val_if_fail (GST_IS_THREAD (audio_thread), FALSE);
+
+  g_hash_table_insert (play->other_elements, "audio_thread", audio_thread);
+
+  /* create audio queue */
+  audio_queue = gst_element_factory_make ("queue", "audio_queue");
+  if (!audio_queue)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_QUEUE, error);
+      return FALSE;
+    }
+
+  g_hash_table_insert (play->other_elements, "audio_queue", audio_queue);
+
+  /* create source element */
+  play->volume = gst_element_factory_make ("volume", "volume");
+  if (!play->volume)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_VOLUME, error);
+      return FALSE;
+    }
+
+  /* create audiosink. */
+  play->audio_sink = gst_element_factory_make ("fakesink", "play_audio");
+  if (play->audio_sink == NULL)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
+      return FALSE;
+    }
+
+  gst_bin_add_many (GST_BIN (audio_thread), audio_queue, play->volume,
+		    play->audio_sink, NULL);
+
+  gst_element_link_many (audio_queue, play->volume, play->audio_sink);
+
+  gst_element_add_ghost_pad (audio_thread,
+			     gst_element_get_pad (audio_queue, "sink"),
+			     "sink");
+
+  gst_bin_add (GST_BIN (play->pipeline), audio_thread);
+
+  return TRUE;
 }
 
 
 static gboolean
-gst_play_audioht_set_audio (	GstPlay *play,
-								GstElement *audio_sink)
+gst_play_audioht_set_audio (GstPlay * play, GstElement * audio_sink)
 {
-	GstElement *audio_thread;
-	
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (audio_sink != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (audio_sink), FALSE);
+  GstElement *audio_thread;
 
-	audio_thread = g_hash_table_lookup(play->other_elements, "audio_thread");
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (audio_sink != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (audio_sink), FALSE);
 
-	if (play->audio_sink)
-	{
-		gst_element_unlink (play->volume, play->audio_sink);
-		gst_bin_remove (GST_BIN (audio_thread), play->audio_sink);
-	}
+  audio_thread = g_hash_table_lookup (play->other_elements, "audio_thread");
 
-	play->audio_sink = audio_sink;
-	gst_bin_add (GST_BIN (audio_thread), play->audio_sink);
-	gst_element_link (play->volume, play->audio_sink);
-
-	play->audio_sink_element = gst_play_get_sink_element (
-												play,
-												audio_sink,
-												GST_PLAY_SINK_TYPE_AUDIO);
-	
-	play->visualisation_sink_element = gst_play_get_sink_element (
-												play,
-												audio_sink,
-												GST_PLAY_SINK_TYPE_VIDEO);
-	
-	if (play->audio_sink_element != NULL) {
-		g_signal_connect (G_OBJECT (play->audio_sink_element), "eos",
-				  G_CALLBACK (callback_audio_sink_eos), play);
-	}
-	
-	return TRUE;
+  if (play->audio_sink)
+    {
+      gst_element_unlink (play->volume, play->audio_sink);
+      gst_bin_remove (GST_BIN (audio_thread), play->audio_sink);
+    }
+
+  play->audio_sink = audio_sink;
+  gst_bin_add (GST_BIN (audio_thread), play->audio_sink);
+  gst_element_link (play->volume, play->audio_sink);
+
+  play->audio_sink_element = gst_play_get_sink_element (play,
+							audio_sink,
+							GST_PLAY_SINK_TYPE_AUDIO);
+
+  play->visualisation_sink_element = gst_play_get_sink_element (play,
+								audio_sink,
+								GST_PLAY_SINK_TYPE_VIDEO);
+
+  if (play->audio_sink_element != NULL)
+    {
+      g_signal_connect (G_OBJECT (play->audio_sink_element), "eos",
+			G_CALLBACK (callback_audio_sink_eos), play);
+    }
+
+  return TRUE;
 }
 
 
 static gboolean
-gst_play_audioht_set_auto (	GstPlay *play,
-							GstElement *autoplugger)
+gst_play_audioht_set_auto (GstPlay * play, GstElement * autoplugger)
 {
-	GstElement *audio_thread;
-	
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (autoplugger != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (autoplugger), FALSE);
-
-	audio_thread = g_hash_table_lookup(play->other_elements, "audio_thread");
-
-	if (play->autoplugger) {
-		/* we need to remove the existing autoplugger
-			before creating a new one */
-		gst_element_unlink (play->autoplugger, audio_thread);
-		gst_element_unlink (play->autoplugger, play->source);
-		gst_bin_remove (GST_BIN (play->pipeline), play->autoplugger);
-	}
-	
-	play->autoplugger = autoplugger;
-	g_return_val_if_fail (play->autoplugger != NULL, FALSE);
-
-	gst_bin_add (GST_BIN (play->pipeline), play->autoplugger);
-	gst_element_link (play->source, play->autoplugger);
-	gst_element_link (play->autoplugger, audio_thread);
-	return TRUE;
+  GstElement *audio_thread;
+
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (autoplugger != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (autoplugger), FALSE);
+
+  audio_thread = g_hash_table_lookup (play->other_elements, "audio_thread");
+
+  if (play->autoplugger)
+    {
+      /* we need to remove the existing autoplugger
+         before creating a new one */
+      gst_element_unlink (play->autoplugger, audio_thread);
+      gst_element_unlink (play->autoplugger, play->source);
+      gst_bin_remove (GST_BIN (play->pipeline), play->autoplugger);
+    }
+
+  play->autoplugger = autoplugger;
+  g_return_val_if_fail (play->autoplugger != NULL, FALSE);
+
+  gst_bin_add (GST_BIN (play->pipeline), play->autoplugger);
+  gst_element_link (play->source, play->autoplugger);
+  gst_element_link (play->autoplugger, audio_thread);
+  return TRUE;
 }
 
 /*
@@ -385,272 +376,259 @@ gst_play_audioht_set_auto (	GstPlay *play,
  * spider0.src2 ! { queue ! colorspace ! (videosink) } }
  */
 
-static gboolean 
-gst_play_video_setup (	GstPlay *play,
-						GError **error)
+static gboolean
+gst_play_video_setup (GstPlay * play, GError ** error)
 {
-	GstElement *audio_bin, *audio_queue;
-	GstElement *video_queue, *video_bin;
-	GstElement *work_thread, *colorspace;
-
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	
-	/* creating pipeline */	
-	play->pipeline = gst_pipeline_new ("main_pipeline");
-	g_return_val_if_fail (GST_IS_PIPELINE (play->pipeline), FALSE);
-
-	/* creating work thread */
-	work_thread = gst_thread_new ("work_thread");
-	g_return_val_if_fail (GST_IS_THREAD (work_thread), FALSE);
-	g_hash_table_insert(play->other_elements, "work_thread", work_thread);
-	
-	gst_bin_add (GST_BIN (play->pipeline), work_thread);
-
-	/* create source element */
-	play->source = gst_element_factory_make ("gnomevfssrc", "source");
-	if (!play->source)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_GNOMEVFSSRC, error);
-		return FALSE;
-	}	
-	gst_bin_add (GST_BIN (work_thread), play->source);
-	
-	/* creating volume element */
-	play->volume = gst_element_factory_make ("volume", "volume");
-	if (!play->volume)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_VOLUME, error);
-		return FALSE;
-	}
-
-	/* creating audio_sink element */
-	play->audio_sink = gst_element_factory_make ("fakesink", "fake_audio");
-	if (!play->audio_sink)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
-		return FALSE;
-	}
-	play->audio_sink_element = NULL;
-
-	/* creating audio_queue element */
-	audio_queue = gst_element_factory_make ("queue", "audio_queue");
-	if (!audio_queue)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_QUEUE, error);
-		return FALSE;
-	}	
-	g_hash_table_insert (play->other_elements, "audio_queue", audio_queue);
-	
-	/* creating audio thread */	
-	audio_bin = gst_thread_new ("audio_bin");
-	if (!audio_bin)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_THREAD, error);
-		return FALSE;
-	}
-	g_hash_table_insert (play->other_elements, "audio_bin", audio_bin);
-
-	/* adding all that stuff to bin */
-	gst_bin_add_many (
-		GST_BIN (audio_bin), audio_queue, play->volume, 
-		play->audio_sink, NULL);
-	gst_element_link_many (audio_queue, play->volume,
-		play->audio_sink, NULL);
-	
-	gst_element_add_ghost_pad (
-		audio_bin, 
-		gst_element_get_pad (audio_queue, "sink"),
-		"sink");
-
-	gst_bin_add (GST_BIN (work_thread), audio_bin);
-
-	/* create video elements */
-	play->video_sink = gst_element_factory_make ("fakesink", "fake_show");
-	if (!play->video_sink)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
-		return FALSE;
-	}
-	play->video_sink_element = NULL;
-
-	video_queue = gst_element_factory_make ("queue", "video_queue");
-	if (!video_queue)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_QUEUE, error);
-		return FALSE;
-	}
-	g_hash_table_insert (play->other_elements, "video_queue", video_queue);
-
-	colorspace = gst_element_factory_make ("colorspace", "colorspace");
-	if (!colorspace)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_COLORSPACE, error);
-		return FALSE;
-	}
-	g_hash_table_insert (play->other_elements, "colorspace", colorspace);
-
-	video_bin = gst_thread_new ("video_bin");
-	if (!video_bin)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_THREAD, error);
-		return FALSE;
-	}
-	g_hash_table_insert (play->other_elements, "video_bin", video_bin);
-
-	/* adding all that stuff to bin */
-	gst_bin_add_many (GST_BIN (video_bin), video_queue, colorspace, 
-			play->video_sink, NULL);
-	
-	gst_element_link_many (video_queue, colorspace,
-			play->video_sink, NULL);
-	
-	gst_element_add_ghost_pad (
-			video_bin, gst_element_get_pad (video_queue, "sink"),
-			"sink");
-			
-	gst_bin_add (GST_BIN (work_thread), video_bin);
-
-	return TRUE;
+  GstElement *audio_bin, *audio_queue;
+  GstElement *video_queue, *video_bin;
+  GstElement *work_thread, *colorspace;
+
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+
+  /* creating pipeline */
+  play->pipeline = gst_pipeline_new ("main_pipeline");
+  g_return_val_if_fail (GST_IS_PIPELINE (play->pipeline), FALSE);
+
+  /* creating work thread */
+  work_thread = gst_thread_new ("work_thread");
+  g_return_val_if_fail (GST_IS_THREAD (work_thread), FALSE);
+  g_hash_table_insert (play->other_elements, "work_thread", work_thread);
+
+  gst_bin_add (GST_BIN (play->pipeline), work_thread);
+
+  /* create source element */
+  play->source = gst_element_factory_make ("gnomevfssrc", "source");
+  if (!play->source)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_GNOMEVFSSRC, error);
+      return FALSE;
+    }
+  gst_bin_add (GST_BIN (work_thread), play->source);
+
+  /* creating volume element */
+  play->volume = gst_element_factory_make ("volume", "volume");
+  if (!play->volume)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_VOLUME, error);
+      return FALSE;
+    }
+
+  /* creating audio_sink element */
+  play->audio_sink = gst_element_factory_make ("fakesink", "fake_audio");
+  if (!play->audio_sink)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
+      return FALSE;
+    }
+  play->audio_sink_element = NULL;
+
+  /* creating audio_queue element */
+  audio_queue = gst_element_factory_make ("queue", "audio_queue");
+  if (!audio_queue)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_QUEUE, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements, "audio_queue", audio_queue);
+
+  /* creating audio thread */
+  audio_bin = gst_thread_new ("audio_bin");
+  if (!audio_bin)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_THREAD, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements, "audio_bin", audio_bin);
+
+  /* adding all that stuff to bin */
+  gst_bin_add_many (GST_BIN (audio_bin), audio_queue, play->volume,
+		    play->audio_sink, NULL);
+  gst_element_link_many (audio_queue, play->volume, play->audio_sink, NULL);
+
+  gst_element_add_ghost_pad (audio_bin,
+			     gst_element_get_pad (audio_queue, "sink"),
+			     "sink");
+
+  gst_bin_add (GST_BIN (work_thread), audio_bin);
+
+  /* create video elements */
+  play->video_sink = gst_element_factory_make ("fakesink", "fake_show");
+  if (!play->video_sink)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
+      return FALSE;
+    }
+  play->video_sink_element = NULL;
+
+  video_queue = gst_element_factory_make ("queue", "video_queue");
+  if (!video_queue)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_QUEUE, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements, "video_queue", video_queue);
+
+  colorspace = gst_element_factory_make ("colorspace", "colorspace");
+  if (!colorspace)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_COLORSPACE, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements, "colorspace", colorspace);
+
+  video_bin = gst_thread_new ("video_bin");
+  if (!video_bin)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_THREAD, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements, "video_bin", video_bin);
+
+  /* adding all that stuff to bin */
+  gst_bin_add_many (GST_BIN (video_bin), video_queue, colorspace,
+		    play->video_sink, NULL);
+
+  gst_element_link_many (video_queue, colorspace, play->video_sink, NULL);
+
+  gst_element_add_ghost_pad (video_bin,
+			     gst_element_get_pad (video_queue, "sink"),
+			     "sink");
+
+  gst_bin_add (GST_BIN (work_thread), video_bin);
+
+  return TRUE;
 }
 
 static gboolean
-gst_play_video_set_data_src (	GstPlay *play,
-								GstElement *datasrc)
+gst_play_video_set_data_src (GstPlay * play, GstElement * datasrc)
 {
-	GstElement *work_thread;
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (datasrc != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT(datasrc), FALSE);
-
-	work_thread = g_hash_table_lookup(play->other_elements, "work_thread");
-	return gst_play_default_set_data_src(play, datasrc, work_thread);
+  GstElement *work_thread;
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (datasrc != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (datasrc), FALSE);
+
+  work_thread = g_hash_table_lookup (play->other_elements, "work_thread");
+  return gst_play_default_set_data_src (play, datasrc, work_thread);
 }
 
 static gboolean
-gst_play_video_set_auto (	GstPlay *play,
-							GstElement *autoplugger)
+gst_play_video_set_auto (GstPlay * play, GstElement * autoplugger)
 {
 
-	GstElement *audio_bin, *video_bin, *work_thread;
+  GstElement *audio_bin, *video_bin, *work_thread;
 
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (autoplugger != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (autoplugger), FALSE);
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (autoplugger != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (autoplugger), FALSE);
 
-	audio_bin = g_hash_table_lookup(play->other_elements, "audio_bin");
-	video_bin = g_hash_table_lookup(play->other_elements, "video_bin");
-	work_thread = g_hash_table_lookup(play->other_elements, "work_thread");
+  audio_bin = g_hash_table_lookup (play->other_elements, "audio_bin");
+  video_bin = g_hash_table_lookup (play->other_elements, "video_bin");
+  work_thread = g_hash_table_lookup (play->other_elements, "work_thread");
 
-	if (play->autoplugger) {
-		/* we need to remove the existing autoplugger
-			before creating a new one */
-		gst_element_unlink (play->autoplugger, audio_bin);
-		gst_element_unlink (play->autoplugger, play->source);
-		gst_element_unlink (play->autoplugger, video_bin);
+  if (play->autoplugger)
+    {
+      /* we need to remove the existing autoplugger
+         before creating a new one */
+      gst_element_unlink (play->autoplugger, audio_bin);
+      gst_element_unlink (play->autoplugger, play->source);
+      gst_element_unlink (play->autoplugger, video_bin);
 
-		gst_bin_remove (GST_BIN (work_thread), play->autoplugger);
-	}
-	
-	play->autoplugger = autoplugger;
-	g_return_val_if_fail (play->autoplugger != NULL, FALSE);
+      gst_bin_remove (GST_BIN (work_thread), play->autoplugger);
+    }
 
-	gst_bin_add (GST_BIN (work_thread), play->autoplugger);
-	gst_element_link (play->source, play->autoplugger);
-	gst_element_link (play->autoplugger, audio_bin);
-	gst_element_link (play->autoplugger, video_bin);
+  play->autoplugger = autoplugger;
+  g_return_val_if_fail (play->autoplugger != NULL, FALSE);
 
-	return TRUE;
+  gst_bin_add (GST_BIN (work_thread), play->autoplugger);
+  gst_element_link (play->source, play->autoplugger);
+  gst_element_link (play->autoplugger, audio_bin);
+  gst_element_link (play->autoplugger, video_bin);
+
+  return TRUE;
 }
 
 
 static gboolean
-gst_play_video_set_video (	GstPlay *play,
-							GstElement *video_sink)
+gst_play_video_set_video (GstPlay * play, GstElement * video_sink)
 {
-	GstElement *video_mate, *video_bin;
-	
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (video_sink != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (video_sink), FALSE);
-
-	video_bin = g_hash_table_lookup(play->other_elements, "video_bin");
-	video_mate = g_hash_table_lookup(play->other_elements, "colorspace");
-
-	if (play->video_sink) {
-		gst_element_unlink (video_mate, play->video_sink);
-		gst_bin_remove (GST_BIN (video_bin), play->video_sink);
-	}
-	play->video_sink = video_sink;
-	gst_bin_add (GST_BIN (video_bin), play->video_sink);
-	gst_element_link (video_mate, play->video_sink);
-
-	play->video_sink_element = gst_play_get_sink_element (
-											play,
-											video_sink,
-											GST_PLAY_SINK_TYPE_VIDEO);
-
-	if (play->video_sink_element != NULL) {
-		g_signal_connect (	G_OBJECT (play->video_sink_element),
-							"have_xid",
-				  			G_CALLBACK (callback_video_have_xid),
-							play);
-		g_signal_connect (	G_OBJECT (play->video_sink_element),
-							"have_size",
-				  			G_CALLBACK (callback_video_have_size),
-							play);
-		g_object_set(	G_OBJECT(play->video_sink_element),
-						"need_new_window",
-						TRUE,
-						"toplevel",
-						FALSE, NULL);
-	}
-	return TRUE;
+  GstElement *video_mate, *video_bin;
+
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (video_sink != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (video_sink), FALSE);
+
+  video_bin = g_hash_table_lookup (play->other_elements, "video_bin");
+  video_mate = g_hash_table_lookup (play->other_elements, "colorspace");
+
+  if (play->video_sink)
+    {
+      gst_element_unlink (video_mate, play->video_sink);
+      gst_bin_remove (GST_BIN (video_bin), play->video_sink);
+    }
+  play->video_sink = video_sink;
+  gst_bin_add (GST_BIN (video_bin), play->video_sink);
+  gst_element_link (video_mate, play->video_sink);
+
+  play->video_sink_element = gst_play_get_sink_element (play,
+							video_sink,
+							GST_PLAY_SINK_TYPE_VIDEO);
+
+  if (play->video_sink_element != NULL)
+    {
+      g_signal_connect (G_OBJECT (play->video_sink_element),
+			"have_xid",
+			G_CALLBACK (callback_video_have_xid), play);
+      g_signal_connect (G_OBJECT (play->video_sink_element),
+			"have_size",
+			G_CALLBACK (callback_video_have_size), play);
+      g_object_set (G_OBJECT (play->video_sink_element),
+		    "need_new_window", TRUE, "toplevel", FALSE, NULL);
+    }
+  return TRUE;
 }
 
 
 static gboolean
-gst_play_video_set_audio (	GstPlay *play,
-							GstElement *audio_sink)
+gst_play_video_set_audio (GstPlay * play, GstElement * audio_sink)
 {
-	GstElement *audio_bin;
-	
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (audio_sink != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (audio_sink), FALSE);
-	
-	audio_bin = g_hash_table_lookup(play->other_elements, "audio_bin");
-	
-	if (play->audio_sink)
-	{
-		gst_element_unlink (play->volume, play->audio_sink);
-		gst_bin_remove (GST_BIN (audio_bin), play->audio_sink);
-	}
+  GstElement *audio_bin;
 
-	play->audio_sink = audio_sink;
-	gst_bin_add (GST_BIN (audio_bin), play->audio_sink);
-	gst_element_link (play->volume, play->audio_sink);
-
-	play->audio_sink_element = gst_play_get_sink_element (
-										play,
-										audio_sink,
-										GST_PLAY_SINK_TYPE_AUDIO);
-
-	play->visualisation_sink_element = gst_play_get_sink_element (
-										play,
-										audio_sink,
-										GST_PLAY_SINK_TYPE_VIDEO);
-	
-	if (play->audio_sink_element != NULL) {
-		g_signal_connect (G_OBJECT (play->audio_sink_element), "eos",
-				  G_CALLBACK (callback_audio_sink_eos), play);
-	}
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (audio_sink != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (audio_sink), FALSE);
+
+  audio_bin = g_hash_table_lookup (play->other_elements, "audio_bin");
+
+  if (play->audio_sink)
+    {
+      gst_element_unlink (play->volume, play->audio_sink);
+      gst_bin_remove (GST_BIN (audio_bin), play->audio_sink);
+    }
+
+  play->audio_sink = audio_sink;
+  gst_bin_add (GST_BIN (audio_bin), play->audio_sink);
+  gst_element_link (play->volume, play->audio_sink);
+
+  play->audio_sink_element = gst_play_get_sink_element (play,
+							audio_sink,
+							GST_PLAY_SINK_TYPE_AUDIO);
 
-	return TRUE;
+  play->visualisation_sink_element = gst_play_get_sink_element (play,
+								audio_sink,
+								GST_PLAY_SINK_TYPE_VIDEO);
+
+  if (play->audio_sink_element != NULL)
+    {
+      g_signal_connect (G_OBJECT (play->audio_sink_element), "eos",
+			G_CALLBACK (callback_audio_sink_eos), play);
+    }
+
+  return TRUE;
 }
 
 /*
@@ -659,331 +637,295 @@ gst_play_video_set_audio (	GstPlay *play,
  * spider0.src2 ! { queue ! colorspace ! (videosink) } }
  */
 
-static gboolean 
-gst_play_video_vis_setup (	GstPlay *play,
-							GError **error)
+static gboolean
+gst_play_video_vis_setup (GstPlay * play, GError ** error)
 {
-	
-	GstElement *work_thread, *tee_element;
-	GstPad *tee_vis_pad, *tee_audio_pad;
-	GstPad *audio_sink_pad, *vis_video_thread_pad;
-	GstElement *vis_video_thread;
-	GstElement *audio_queue, *audio_sink;
-	GstElement *vis_colorspace, *vis_video_queue, *vis_video_sink;
-	GstElement *video_queue, *video_bin, *colorspace;
-	
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	
-	/* creating pipeline */	
-	play->pipeline = gst_pipeline_new ("main_pipeline");
-	g_return_val_if_fail (GST_IS_PIPELINE (play->pipeline), FALSE);
-
-	/* creating work thread */
-	work_thread = gst_thread_new ("work_thread");
-	g_return_val_if_fail (GST_IS_THREAD (work_thread), FALSE);
-	g_hash_table_insert(play->other_elements, "work_thread", work_thread);
-	
-	gst_bin_add (GST_BIN (play->pipeline), work_thread);
-
-	/* create source element */
-	play->source = gst_element_factory_make ("gnomevfssrc", "source");
-	if (!play->source)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_GNOMEVFSSRC, error);
-		return FALSE;
-	}	
-	gst_bin_add (GST_BIN (work_thread), play->source);
-	
-	/* BEGIN VIS STUFF */
-
-	/* Creating here the audio vis bin */
-	
-	play->audio_sink = gst_thread_new ("audio_thread");
-	if (!play->audio_sink)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_THREAD, error);
-		return FALSE;
-	}
-	g_hash_table_insert(	play->other_elements,
-							"audio_bin",
-							play->audio_sink);
-	
-	audio_queue = gst_element_factory_make ("queue", "audio_queue");
-	if (!audio_queue)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_QUEUE, error);
-		return FALSE;
-	}	
-	g_hash_table_insert (	play->other_elements,
-							"audio_queue",
-							audio_queue);
-	
-	play->volume = gst_element_factory_make ("volume", "audio_volume");
-	if (!play->volume)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_VOLUME, error);
-		return FALSE;
-	}
-	g_hash_table_insert (	play->other_elements,
-							"audio_volume",
-							play->volume);
-		
-	tee_element = gst_element_factory_make ("tee", "audio_tee");
-	g_return_val_if_fail(GST_IS_ELEMENT(tee_element), FALSE);
-	g_hash_table_insert(	play->other_elements,
-							"vis_tee",
-							play->audio_sink);
-								
-	tee_vis_pad = gst_element_get_request_pad (tee_element, "src%d");
-	tee_audio_pad = gst_element_get_request_pad (tee_element, "src%d");
-	g_hash_table_insert(	play->other_elements,
-							"tee_vis_pad",
-							tee_vis_pad);
-	g_hash_table_insert(	play->other_elements,
-							"tee_audio_pad",
-							tee_audio_pad);
-
-	audio_sink = gst_element_factory_make ("fakesink", "audio_sink");
-	if (!audio_sink)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
-		return FALSE;
-	}
-	g_hash_table_insert (	play->other_elements,
-							"audio_sink",
-							audio_sink);
-	
-	audio_sink_pad = gst_element_get_pad (audio_sink, "sink");
-	g_hash_table_insert (	play->other_elements,
-							"audio_sink_pad",
-							audio_sink_pad);
-	
-	play->audio_sink_element = NULL;
-
-	
-	gst_bin_add_many (	GST_BIN (play->audio_sink),
-						audio_queue, play->volume,
-						tee_element, audio_sink, NULL);
-	gst_element_link_many (	audio_queue, play->volume,
-							tee_element, NULL);
-	
-	gst_pad_link ( tee_audio_pad, audio_sink_pad);
-	
-	gst_element_add_ghost_pad (	play->audio_sink,
-								gst_element_get_pad (audio_queue, "sink"),
-								"sink");
-		
-	/* Creating video part of the visualisation bin
-		{ queue ! (visualisation) ! colorspace ! (videosink) }
-	*/
-	
-	vis_video_thread = gst_thread_new ("vis_video_thread");
-	if (!vis_video_thread)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_THREAD, error);
-		return FALSE;
-	}
-	g_hash_table_insert (	play->other_elements,
-							"vis_video_thread",
-							vis_video_thread);
-	
-	vis_video_queue = gst_element_factory_make ("queue", "vis_video_queue");
-	if (!vis_video_queue)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_QUEUE, error);
-		return FALSE;
-	}	
-	g_hash_table_insert (	play->other_elements,
-							"vis_video_queue",
-							vis_video_queue);
-	
-	vis_colorspace = gst_element_factory_make ("colorspace", "vis_colorspace");
-	if (!vis_colorspace)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_COLORSPACE, error);
-		return FALSE;
-	}
-	g_hash_table_insert (	play->other_elements,
-							"vis_colorspace",
-							vis_colorspace);
-	
-	vis_video_sink = gst_element_factory_make ("fakesink", "vis_video_sink");
-	if (!vis_video_sink)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
-		return FALSE;
-	}
-	g_hash_table_insert (	play->other_elements,
-							"vis_video_sink",
-							vis_video_sink);
-	play->video_sink_element = NULL;
-	
-	gst_bin_add_many (	GST_BIN (vis_video_thread), vis_video_queue,
-						vis_colorspace, vis_video_sink, NULL);
-	
-	
-	vis_video_thread_pad = gst_element_add_ghost_pad (
-								vis_video_thread, 
-								gst_element_get_pad (vis_video_queue, "sink"),
-								"sink");
-
-	g_hash_table_insert(	play->other_elements,
-							"vis_video_thread_pad",
-							vis_video_thread_pad);
-	
-	gst_bin_add (GST_BIN(play->audio_sink), vis_video_thread);
-
-	/* END VIS STUFF */
-
-	gst_bin_add (GST_BIN (work_thread), play->audio_sink);
-
-	/* create video elements */
-	play->video_sink = gst_element_factory_make ("fakesink", "fake_show");
-	if (!play->video_sink)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
-		return FALSE;
-	}
-	play->video_sink_element = NULL;
-
-	video_queue = gst_element_factory_make ("queue", "video_queue");
-	if (!video_queue)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_QUEUE, error);
-		return FALSE;
-	}
-	g_hash_table_insert (play->other_elements, "video_queue", video_queue);
-
-	colorspace = gst_element_factory_make ("colorspace", "colorspace");
-	if (!colorspace)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_COLORSPACE, error);
-		return FALSE;
-	}
-	g_hash_table_insert (play->other_elements, "colorspace", colorspace);
 
-	video_bin = gst_thread_new ("video_thread");
-	if (!video_bin)
-	{
-		gst_play_error_plugin (GST_PLAY_ERROR_THREAD, error);
-		return FALSE;
-	}
-	g_hash_table_insert (play->other_elements, "video_bin", video_bin);
-
-	/* adding all that stuff to bin */
-	gst_bin_add_many (GST_BIN (video_bin), video_queue, colorspace, 
-			play->video_sink, NULL);
-	
-	gst_element_link_many (video_queue, colorspace,
-			play->video_sink, NULL);
-		
-	gst_element_add_ghost_pad (
-			video_bin, gst_element_get_pad (video_queue, "sink"),
-			"sink");
-			
-	gst_bin_add (GST_BIN (work_thread), video_bin);
-
-	return TRUE;
+  GstElement *work_thread, *tee_element;
+  GstPad *tee_vis_pad, *tee_audio_pad;
+  GstPad *audio_sink_pad, *vis_video_thread_pad;
+  GstElement *vis_video_thread;
+  GstElement *audio_queue, *audio_sink;
+  GstElement *vis_colorspace, *vis_video_queue, *vis_video_sink;
+  GstElement *video_queue, *video_bin, *colorspace;
+
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+
+  /* creating pipeline */
+  play->pipeline = gst_pipeline_new ("main_pipeline");
+  g_return_val_if_fail (GST_IS_PIPELINE (play->pipeline), FALSE);
+
+  /* creating work thread */
+  work_thread = gst_thread_new ("work_thread");
+  g_return_val_if_fail (GST_IS_THREAD (work_thread), FALSE);
+  g_hash_table_insert (play->other_elements, "work_thread", work_thread);
+
+  gst_bin_add (GST_BIN (play->pipeline), work_thread);
+
+  /* create source element */
+  play->source = gst_element_factory_make ("gnomevfssrc", "source");
+  if (!play->source)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_GNOMEVFSSRC, error);
+      return FALSE;
+    }
+  gst_bin_add (GST_BIN (work_thread), play->source);
+
+  /* BEGIN VIS STUFF */
+
+  /* Creating here the audio vis bin */
+
+  play->audio_sink = gst_thread_new ("audio_thread");
+  if (!play->audio_sink)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_THREAD, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements, "audio_bin", play->audio_sink);
+
+  audio_queue = gst_element_factory_make ("queue", "audio_queue");
+  if (!audio_queue)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_QUEUE, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements, "audio_queue", audio_queue);
+
+  play->volume = gst_element_factory_make ("volume", "audio_volume");
+  if (!play->volume)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_VOLUME, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements, "audio_volume", play->volume);
+
+  tee_element = gst_element_factory_make ("tee", "audio_tee");
+  g_return_val_if_fail (GST_IS_ELEMENT (tee_element), FALSE);
+  g_hash_table_insert (play->other_elements, "vis_tee", play->audio_sink);
+
+  tee_vis_pad = gst_element_get_request_pad (tee_element, "src%d");
+  tee_audio_pad = gst_element_get_request_pad (tee_element, "src%d");
+  g_hash_table_insert (play->other_elements, "tee_vis_pad", tee_vis_pad);
+  g_hash_table_insert (play->other_elements, "tee_audio_pad", tee_audio_pad);
+
+  audio_sink = gst_element_factory_make ("fakesink", "audio_sink");
+  if (!audio_sink)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements, "audio_sink", audio_sink);
+
+  audio_sink_pad = gst_element_get_pad (audio_sink, "sink");
+  g_hash_table_insert (play->other_elements,
+		       "audio_sink_pad", audio_sink_pad);
+
+  play->audio_sink_element = NULL;
+
+
+  gst_bin_add_many (GST_BIN (play->audio_sink),
+		    audio_queue, play->volume, tee_element, audio_sink, NULL);
+  gst_element_link_many (audio_queue, play->volume, tee_element, NULL);
+
+  gst_pad_link (tee_audio_pad, audio_sink_pad);
+
+  gst_element_add_ghost_pad (play->audio_sink,
+			     gst_element_get_pad (audio_queue, "sink"),
+			     "sink");
+
+  /* Creating video part of the visualisation bin
+     { queue ! (visualisation) ! colorspace ! (videosink) }
+   */
+
+  vis_video_thread = gst_thread_new ("vis_video_thread");
+  if (!vis_video_thread)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_THREAD, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements,
+		       "vis_video_thread", vis_video_thread);
+
+  vis_video_queue = gst_element_factory_make ("queue", "vis_video_queue");
+  if (!vis_video_queue)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_QUEUE, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements,
+		       "vis_video_queue", vis_video_queue);
+
+  vis_colorspace = gst_element_factory_make ("colorspace", "vis_colorspace");
+  if (!vis_colorspace)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_COLORSPACE, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements,
+		       "vis_colorspace", vis_colorspace);
+
+  vis_video_sink = gst_element_factory_make ("fakesink", "vis_video_sink");
+  if (!vis_video_sink)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements,
+		       "vis_video_sink", vis_video_sink);
+  play->video_sink_element = NULL;
+
+  gst_bin_add_many (GST_BIN (vis_video_thread), vis_video_queue,
+		    vis_colorspace, vis_video_sink, NULL);
+
+
+  vis_video_thread_pad = gst_element_add_ghost_pad (vis_video_thread,
+						    gst_element_get_pad
+						    (vis_video_queue, "sink"),
+						    "sink");
+
+  g_hash_table_insert (play->other_elements,
+		       "vis_video_thread_pad", vis_video_thread_pad);
+
+  gst_bin_add (GST_BIN (play->audio_sink), vis_video_thread);
+
+  /* END VIS STUFF */
+
+  gst_bin_add (GST_BIN (work_thread), play->audio_sink);
+
+  /* create video elements */
+  play->video_sink = gst_element_factory_make ("fakesink", "fake_show");
+  if (!play->video_sink)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
+      return FALSE;
+    }
+  play->video_sink_element = NULL;
+
+  video_queue = gst_element_factory_make ("queue", "video_queue");
+  if (!video_queue)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_QUEUE, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements, "video_queue", video_queue);
+
+  colorspace = gst_element_factory_make ("colorspace", "colorspace");
+  if (!colorspace)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_COLORSPACE, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements, "colorspace", colorspace);
+
+  video_bin = gst_thread_new ("video_thread");
+  if (!video_bin)
+    {
+      gst_play_error_plugin (GST_PLAY_ERROR_THREAD, error);
+      return FALSE;
+    }
+  g_hash_table_insert (play->other_elements, "video_bin", video_bin);
+
+  /* adding all that stuff to bin */
+  gst_bin_add_many (GST_BIN (video_bin), video_queue, colorspace,
+		    play->video_sink, NULL);
+
+  gst_element_link_many (video_queue, colorspace, play->video_sink, NULL);
+
+  gst_element_add_ghost_pad (video_bin,
+			     gst_element_get_pad (video_queue, "sink"),
+			     "sink");
+
+  gst_bin_add (GST_BIN (work_thread), video_bin);
+
+  return TRUE;
 }
 
 static gboolean
-gst_play_video_vis_set_audio (	GstPlay *play,
-							GstElement *audio_sink)
+gst_play_video_vis_set_audio (GstPlay * play, GstElement * audio_sink)
 {
-	GstElement *audio_bin, *vis_audio_sink;
-	GstPad *audio_sink_pad, *tee_audio_pad;
-	
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (audio_sink != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (audio_sink), FALSE);
-	
-	audio_bin = g_hash_table_lookup (	play->other_elements,
-										"audio_bin");
-	vis_audio_sink = g_hash_table_lookup (	play->other_elements,
-											"audio_sink");
-	audio_sink_pad = g_hash_table_lookup (	play->other_elements,
-											"audio_sink_pad");
-	tee_audio_pad = g_hash_table_lookup (	play->other_elements,
-											"tee_audio_pad");
-	
-	if ( (vis_audio_sink) && GST_IS_ELEMENT(vis_audio_sink) )
-	{
-		gst_pad_unlink (tee_audio_pad, audio_sink_pad);
-		gst_bin_remove (GST_BIN (audio_bin), vis_audio_sink);
-	}
+  GstElement *audio_bin, *vis_audio_sink;
+  GstPad *audio_sink_pad, *tee_audio_pad;
 
-	gst_bin_add (GST_BIN (audio_bin), audio_sink);
-	
-	audio_sink_pad = gst_element_get_pad (audio_sink,"sink");
-	
-	gst_pad_link (tee_audio_pad, audio_sink_pad);
-	
-	g_hash_table_replace(	play->other_elements,
-							"audio_sink",
-							audio_sink);
-	
-	g_hash_table_replace(	play->other_elements,
-							"audio_sink_pad",
-							audio_sink_pad);
-	
-	play->audio_sink_element = gst_play_get_sink_element (
-										play,
-										audio_sink,
-										GST_PLAY_SINK_TYPE_AUDIO);
-
-	if (play->audio_sink_element != NULL) {
-		g_signal_connect (G_OBJECT (play->audio_sink_element), "eos",
-				  G_CALLBACK (callback_audio_sink_eos), play);
-	}
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (audio_sink != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (audio_sink), FALSE);
+
+  audio_bin = g_hash_table_lookup (play->other_elements, "audio_bin");
+  vis_audio_sink = g_hash_table_lookup (play->other_elements, "audio_sink");
+  audio_sink_pad = g_hash_table_lookup (play->other_elements,
+					"audio_sink_pad");
+  tee_audio_pad = g_hash_table_lookup (play->other_elements, "tee_audio_pad");
 
-	return TRUE;
+  if ((vis_audio_sink) && GST_IS_ELEMENT (vis_audio_sink))
+    {
+      gst_pad_unlink (tee_audio_pad, audio_sink_pad);
+      gst_bin_remove (GST_BIN (audio_bin), vis_audio_sink);
+    }
+
+  gst_bin_add (GST_BIN (audio_bin), audio_sink);
+
+  audio_sink_pad = gst_element_get_pad (audio_sink, "sink");
+
+  gst_pad_link (tee_audio_pad, audio_sink_pad);
+
+  g_hash_table_replace (play->other_elements, "audio_sink", audio_sink);
+
+  g_hash_table_replace (play->other_elements,
+			"audio_sink_pad", audio_sink_pad);
+
+  play->audio_sink_element = gst_play_get_sink_element (play,
+							audio_sink,
+							GST_PLAY_SINK_TYPE_AUDIO);
+
+  if (play->audio_sink_element != NULL)
+    {
+      g_signal_connect (G_OBJECT (play->audio_sink_element), "eos",
+			G_CALLBACK (callback_audio_sink_eos), play);
+    }
+
+  return TRUE;
 }
 
 static gboolean
-gst_play_video_vis_set_video (	GstPlay *play,
-								GstElement *video_sink)
+gst_play_video_vis_set_video (GstPlay * play, GstElement * video_sink)
 {
-	GstElement *video_mate, *video_bin;
-	
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (video_sink != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (video_sink), FALSE);
-
-	video_bin = g_hash_table_lookup(play->other_elements, "video_bin");
-	video_mate = g_hash_table_lookup(play->other_elements, "colorspace");
-
-	if (play->video_sink) {
-		gst_element_unlink (video_mate, play->video_sink);
-		gst_bin_remove (GST_BIN (video_bin), play->video_sink);
-	}
-	play->video_sink = video_sink;
-	gst_bin_add (GST_BIN (video_bin), play->video_sink);
-	gst_element_link (video_mate, play->video_sink);
-
-	play->video_sink_element = gst_play_get_sink_element (
-											play,
-											video_sink,
-											GST_PLAY_SINK_TYPE_VIDEO);
-
-	if (play->video_sink_element != NULL) {
-		g_signal_connect (	G_OBJECT (play->video_sink_element),
-							"have_xid",
-				  			G_CALLBACK (callback_video_have_xid),
-							play);
-		g_signal_connect (	G_OBJECT (play->video_sink_element),
-							"have_size",
-				  			G_CALLBACK (callback_video_have_size),
-							play);
-		g_object_set(	G_OBJECT(play->video_sink_element),
-						"need_new_window",
-						TRUE,
-						"toplevel",
-						FALSE, NULL);
-	}
-	return TRUE;
+  GstElement *video_mate, *video_bin;
+
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (video_sink != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (video_sink), FALSE);
+
+  video_bin = g_hash_table_lookup (play->other_elements, "video_bin");
+  video_mate = g_hash_table_lookup (play->other_elements, "colorspace");
+
+  if (play->video_sink)
+    {
+      gst_element_unlink (video_mate, play->video_sink);
+      gst_bin_remove (GST_BIN (video_bin), play->video_sink);
+    }
+  play->video_sink = video_sink;
+  gst_bin_add (GST_BIN (video_bin), play->video_sink);
+  gst_element_link (video_mate, play->video_sink);
+
+  play->video_sink_element = gst_play_get_sink_element (play,
+							video_sink,
+							GST_PLAY_SINK_TYPE_VIDEO);
+
+  if (play->video_sink_element != NULL)
+    {
+      g_signal_connect (G_OBJECT (play->video_sink_element),
+			"have_xid",
+			G_CALLBACK (callback_video_have_xid), play);
+      g_signal_connect (G_OBJECT (play->video_sink_element),
+			"have_size",
+			G_CALLBACK (callback_video_have_size), play);
+      g_object_set (G_OBJECT (play->video_sink_element),
+		    "need_new_window", TRUE, "toplevel", FALSE, NULL);
+    }
+  return TRUE;
 }
 
 /**
@@ -996,54 +938,49 @@ gst_play_video_vis_set_video (	GstPlay *play,
  * Returns: TRUE if call succeeded.
  */
 gboolean
-gst_play_set_visualisation_video_sink (	GstPlay *play,
-										GstElement *video_sink)
+gst_play_set_visualisation_video_sink (GstPlay * play,
+				       GstElement * video_sink)
 {
-	GstElement *video_mate, *video_bin, *vis_video_sink;
-	
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (video_sink != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (video_sink), FALSE);
-
-	video_bin = g_hash_table_lookup(play->other_elements, "vis_video_thread");
-	video_mate = g_hash_table_lookup(play->other_elements, "vis_colorspace");
-	vis_video_sink = g_hash_table_lookup(	play->other_elements,
-											"vis_video_sink");
-	
-	if (vis_video_sink) {
-		gst_element_unlink (video_mate, vis_video_sink);
-		gst_bin_remove (GST_BIN (video_bin), vis_video_sink);
-	}
-	
-	gst_bin_add (GST_BIN (video_bin), video_sink);
-	gst_element_link (video_mate, video_sink);
-	
-	g_hash_table_replace(	play->other_elements,
-							"vis_video_sink",
-							video_sink);
-	
-	play->visualisation_sink_element = gst_play_get_sink_element (
-											play,
-											video_sink,
-											GST_PLAY_SINK_TYPE_VIDEO);
-
-	if (play->visualisation_sink_element != NULL) {
-		g_signal_connect (	G_OBJECT (play->visualisation_sink_element),
-							"have_xid",
-				  			G_CALLBACK (callback_video_have_vis_xid),
-							play);
-		/*g_signal_connect (	G_OBJECT (play->visualisation_sink_element),
-							"have_size",
-				  			G_CALLBACK (callback_video_have_vis_size),
-							play);*/
-		g_object_set(	G_OBJECT(play->visualisation_sink_element),
-						"need_new_window",
-						TRUE,
-						"toplevel",
-						FALSE, NULL);
-	}
-	return TRUE;
+  GstElement *video_mate, *video_bin, *vis_video_sink;
+
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (video_sink != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (video_sink), FALSE);
+
+  video_bin = g_hash_table_lookup (play->other_elements, "vis_video_thread");
+  video_mate = g_hash_table_lookup (play->other_elements, "vis_colorspace");
+  vis_video_sink = g_hash_table_lookup (play->other_elements,
+					"vis_video_sink");
+
+  if (vis_video_sink)
+    {
+      gst_element_unlink (video_mate, vis_video_sink);
+      gst_bin_remove (GST_BIN (video_bin), vis_video_sink);
+    }
+
+  gst_bin_add (GST_BIN (video_bin), video_sink);
+  gst_element_link (video_mate, video_sink);
+
+  g_hash_table_replace (play->other_elements, "vis_video_sink", video_sink);
+
+  play->visualisation_sink_element = gst_play_get_sink_element (play,
+								video_sink,
+								GST_PLAY_SINK_TYPE_VIDEO);
+
+  if (play->visualisation_sink_element != NULL)
+    {
+      g_signal_connect (G_OBJECT (play->visualisation_sink_element),
+			"have_xid",
+			G_CALLBACK (callback_video_have_vis_xid), play);
+      /*g_signal_connect (    G_OBJECT (play->visualisation_sink_element),
+         "have_size",
+         G_CALLBACK (callback_video_have_vis_size),
+         play); */
+      g_object_set (G_OBJECT (play->visualisation_sink_element),
+		    "need_new_window", TRUE, "toplevel", FALSE, NULL);
+    }
+  return TRUE;
 }
 
 /**
@@ -1056,39 +993,35 @@ gst_play_set_visualisation_video_sink (	GstPlay *play,
  * Returns: TRUE if call succeeded.
  */
 gboolean
-gst_play_set_visualisation_element (	GstPlay *play,
-										GstElement *element)
+gst_play_set_visualisation_element (GstPlay * play, GstElement * element)
 {
-	GstElement *video_queue, *video_colorspace;
-	GstElement *vis_element, *vis_video_bin;
-	
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (element != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
-
-	vis_video_bin = g_hash_table_lookup (	play->other_elements,
-											"vis_video_thread");
-	video_queue = g_hash_table_lookup (	play->other_elements,
-										"vis_video_queue");
-	video_colorspace = g_hash_table_lookup (	play->other_elements,
-											"vis_colorspace");
-	vis_element = g_hash_table_lookup (	play->other_elements,
-											"vis_element");
-	if (vis_element) {
-		gst_element_unlink (video_queue, vis_element);
-		gst_element_unlink (vis_element, video_colorspace);
-		gst_bin_remove (GST_BIN (vis_video_bin), vis_element);
-	}
-	
-	gst_bin_add (GST_BIN (vis_video_bin), element);
-	gst_element_link_many (video_queue, element, video_colorspace, NULL);
-	
-	g_hash_table_replace(	play->other_elements,
-							"vis_element",
-							element);
-	
-	return TRUE;
+  GstElement *video_queue, *video_colorspace;
+  GstElement *vis_element, *vis_video_bin;
+
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (element != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
+
+  vis_video_bin = g_hash_table_lookup (play->other_elements,
+				       "vis_video_thread");
+  video_queue = g_hash_table_lookup (play->other_elements, "vis_video_queue");
+  video_colorspace = g_hash_table_lookup (play->other_elements,
+					  "vis_colorspace");
+  vis_element = g_hash_table_lookup (play->other_elements, "vis_element");
+  if (vis_element)
+    {
+      gst_element_unlink (video_queue, vis_element);
+      gst_element_unlink (vis_element, video_colorspace);
+      gst_bin_remove (GST_BIN (vis_video_bin), vis_element);
+    }
+
+  gst_bin_add (GST_BIN (vis_video_bin), element);
+  gst_element_link_many (video_queue, element, video_colorspace, NULL);
+
+  g_hash_table_replace (play->other_elements, "vis_element", element);
+
+  return TRUE;
 }
 
 /**
@@ -1102,41 +1035,42 @@ gst_play_set_visualisation_element (	GstPlay *play,
  * Returns: TRUE if call succeeded.
  */
 gboolean
-gst_play_connect_visualisation (	GstPlay *play,
-									gboolean connect)
+gst_play_connect_visualisation (GstPlay * play, gboolean connect)
 {
-	GstPad *tee_vis_pad, *vis_video_thread_pad;
-	GstElement *vis_video_thread;
-	gboolean connected = FALSE;
-	
-	g_return_val_if_fail (play != NULL, FALSE);
-	g_return_val_if_fail (GST_IS_PLAY(play), FALSE);
-	
-	tee_vis_pad = g_hash_table_lookup(	play->other_elements,
-											"tee_vis_pad");
-	vis_video_thread_pad = g_hash_table_lookup(	play->other_elements,
-												"vis_video_thread_pad");
-	vis_video_thread = g_hash_table_lookup(	play->other_elements,
-												"vis_video_thread");
-	
-	if (gst_pad_get_peer (vis_video_thread_pad) != NULL)
-		connected = TRUE;
-	else
-		connected = FALSE;
-	
-	if ( (connect) && (!connected) ) {
-		gst_pad_link (tee_vis_pad, vis_video_thread_pad);
-	}
-	else if ( (!connect) && (connected) ){
-		gst_pad_unlink (tee_vis_pad, vis_video_thread_pad);
-	}
-	
-	if ( GST_IS_ELEMENT(vis_video_thread) && GST_IS_ELEMENT(play->pipeline) ) {
-		gst_element_set_state (	vis_video_thread,
-								gst_element_get_state (play->pipeline));
-	}
-	
-	return TRUE;
+  GstPad *tee_vis_pad, *vis_video_thread_pad;
+  GstElement *vis_video_thread;
+  gboolean connected = FALSE;
+
+  g_return_val_if_fail (play != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
+
+  tee_vis_pad = g_hash_table_lookup (play->other_elements, "tee_vis_pad");
+  vis_video_thread_pad = g_hash_table_lookup (play->other_elements,
+					      "vis_video_thread_pad");
+  vis_video_thread = g_hash_table_lookup (play->other_elements,
+					  "vis_video_thread");
+
+  if (gst_pad_get_peer (vis_video_thread_pad) != NULL)
+    connected = TRUE;
+  else
+    connected = FALSE;
+
+  if ((connect) && (!connected))
+    {
+      gst_pad_link (tee_vis_pad, vis_video_thread_pad);
+    }
+  else if ((!connect) && (connected))
+    {
+      gst_pad_unlink (tee_vis_pad, vis_video_thread_pad);
+    }
+
+  if (GST_IS_ELEMENT (vis_video_thread) && GST_IS_ELEMENT (play->pipeline))
+    {
+      gst_element_set_state (vis_video_thread,
+			     gst_element_get_state (play->pipeline));
+    }
+
+  return TRUE;
 }
 
 /* modelines */