diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c
index 61b5530c97..2292707e50 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c
@@ -5,9 +5,9 @@
 #include "emotion_gstreamer_pipeline.h"
 
 
-static void dvd_pad_added_cb (GstElement *dvddemuxer,
-                              GObject    *new_pad,
-                              gpointer    user_data);
+static void dvd_pad_added_cb    (GstElement *dvddemuxer,
+                                 GObject    *new_pad,
+                                 gpointer    user_data);
 
 static void dvd_no_more_pads_cb (GstElement *dvddemuxer,
                                  gpointer    user_data);
@@ -16,7 +16,7 @@ static int no_more_pads = 0;
 
 
 int
-emotion_pipeline_dvd_build (void *video, const char *device)
+emotion_pipeline_dvd_build(void *video, const char *device)
 {
    GstElement              *dvdreadsrc;
    GstElement              *dvddemux;
@@ -25,205 +25,216 @@ emotion_pipeline_dvd_build (void *video, const char *device)
    ev = (Emotion_Gstreamer_Video *)video;
    if (!ev) return 0;
 
-   dvdreadsrc = gst_element_factory_make ("dvdreadsrc", "src");
+   dvdreadsrc = gst_element_factory_make("dvdreadsrc", "src");
    if (!dvdreadsrc)
      goto failure_dvdreadsrc;
    if (device)
-     g_object_set (G_OBJECT (dvdreadsrc), "device", device, NULL);
+     g_object_set(G_OBJECT(dvdreadsrc), "device", device, NULL);
 
-   dvddemux = gst_element_factory_make ("dvddemux", "dvddemux");
+   dvddemux = gst_element_factory_make("dvddemux", "dvddemux");
    if (!dvddemux)
      goto failure_dvddemux;
-   g_signal_connect (dvddemux, "pad-added",
-                     G_CALLBACK (dvd_pad_added_cb), ev);
-   g_signal_connect (dvddemux, "no-more-pads",
-                     G_CALLBACK (dvd_no_more_pads_cb), ev);
+   g_signal_connect(dvddemux, "pad-added",
+		    G_CALLBACK(dvd_pad_added_cb), ev);
+   g_signal_connect(dvddemux, "no-more-pads",
+		    G_CALLBACK(dvd_no_more_pads_cb), ev);
 
-   gst_bin_add_many (GST_BIN (ev->pipeline), dvdreadsrc, dvddemux, NULL);
-   if (!gst_element_link (dvdreadsrc, dvddemux))
+   gst_bin_add_many(GST_BIN(ev->pipeline), dvdreadsrc, dvddemux, NULL);
+   if (!gst_element_link(dvdreadsrc, dvddemux))
      goto failure_link;
 
-   if (!emotion_pipeline_pause (ev->pipeline))
+   if (!emotion_pipeline_pause(ev->pipeline))
      goto failure_gstreamer_pause;
 
-   while (no_more_pads == 0) {
-   g_print ("toto\n");}
+   while (no_more_pads == 0)
+     {
+	g_print("toto\n");
+     }
    no_more_pads = 0;
 
    /* We get the informations of streams */
-   ecore_list_first_goto (ev->video_sinks);
-   ecore_list_first_goto (ev->audio_sinks);
+   ecore_list_first_goto(ev->video_sinks);
+   ecore_list_first_goto(ev->audio_sinks);
 
-   {
-      GstIterator *it;
-      gpointer     data;
+     {
+	GstIterator *it;
+	gpointer     data;
 
-      it = gst_element_iterate_src_pads (dvddemux);
-      while (gst_iterator_next (it, &data) == GST_ITERATOR_OK) {
-         GstPad  *pad;
-         GstCaps *caps;
-         gchar   *str;
+	it = gst_element_iterate_src_pads(dvddemux);
+	while (gst_iterator_next(it, &data) == GST_ITERATOR_OK)
+	  {
+	     GstPad  *pad;
+	     GstCaps *caps;
+	     gchar   *str;
 
-         pad = GST_PAD (data);
+	     pad = GST_PAD(data);
 
-         caps = gst_pad_get_caps (pad);
-         str = gst_caps_to_string (caps);
-         g_print ("caps !! %s\n", str);
-         /* video stream */
-         if (g_str_has_prefix (str, "video/mpeg")) {
-            Emotion_Video_Sink *vsink;
-            GstPad             *sink_pad;
-            GstCaps            *sink_caps;
+	     caps = gst_pad_get_caps(pad);
+	     str = gst_caps_to_string(caps);
+	     g_print("caps !! %s\n", str);
+	     /* video stream */
+	     if (g_str_has_prefix(str, "video/mpeg"))
+	       {
+		  Emotion_Video_Sink *vsink;
+		  GstPad             *sink_pad;
+		  GstCaps            *sink_caps;
 
-            vsink = (Emotion_Video_Sink *)ecore_list_next (ev->video_sinks);
-            sink_pad = gst_element_get_pad (gst_bin_get_by_name (GST_BIN (ev->pipeline), "mpeg2dec"), "src");
-            sink_caps = gst_pad_get_caps (sink_pad);
-            str = gst_caps_to_string (sink_caps);
-            g_print (" ** caps v !! %s\n", str);
+		  vsink = (Emotion_Video_Sink *)ecore_list_next(ev->video_sinks);
+		  sink_pad = gst_element_get_pad(gst_bin_get_by_name(GST_BIN(ev->pipeline), "mpeg2dec"), "src");
+		  sink_caps = gst_pad_get_caps(sink_pad);
+		  str = gst_caps_to_string(sink_caps);
+		  g_print(" ** caps v !! %s\n", str);
 
-            emotion_video_sink_fill (vsink, sink_pad, sink_caps);
+		  emotion_video_sink_fill(vsink, sink_pad, sink_caps);
 
-            gst_caps_unref (sink_caps);
-            gst_object_unref (sink_pad);
-         }
-         /* audio stream */
-         else if (g_str_has_prefix (str, "audio/")) {
-            Emotion_Audio_Sink *asink;
-            GstPad             *sink_pad;
-            GstCaps            *sink_caps;
+		  gst_caps_unref(sink_caps);
+		  gst_object_unref(sink_pad);
+	       }
+	     /* audio stream */
+	     else if (g_str_has_prefix(str, "audio/"))
+	       {
+		  Emotion_Audio_Sink *asink;
+		  GstPad             *sink_pad;
+		  GstCaps            *sink_caps;
 
-            asink = (Emotion_Audio_Sink *)ecore_list_next (ev->audio_sinks);
-            sink_pad = gst_element_get_pad (gst_bin_get_by_name (GST_BIN (ev->pipeline), "a52dec"), "src");
-            sink_caps = gst_pad_get_caps (sink_pad);
+		  asink = (Emotion_Audio_Sink *)ecore_list_next(ev->audio_sinks);
+		  sink_pad = gst_element_get_pad(gst_bin_get_by_name(GST_BIN(ev->pipeline), "a52dec"), "src");
+		  sink_caps = gst_pad_get_caps(sink_pad);
 
-            emotion_audio_sink_fill (asink, sink_pad, sink_caps);
-         }
-         gst_caps_unref (caps);
-         g_free (str);
-         gst_object_unref (pad);
-      }
-      gst_iterator_free (it);
-   }
+		  emotion_audio_sink_fill(asink, sink_pad, sink_caps);
+	       }
+	     gst_caps_unref(caps);
+	     g_free(str);
+	     gst_object_unref(pad);
+	  }
+	gst_iterator_free(it);
+     }
 
    /* The first vsink is a valid Emotion_Video_Sink * */
    /* If no video stream is found, it's a visualisation sink */
-   {
-      Emotion_Video_Sink *vsink;
+     {
+	Emotion_Video_Sink *vsink;
 
-      vsink = (Emotion_Video_Sink *)ecore_list_first_goto (ev->video_sinks);
-      if (vsink && vsink->sink) {
-         g_object_set (G_OBJECT (vsink->sink), "sync", TRUE, NULL);
-         g_object_set (G_OBJECT (vsink->sink), "signal-handoffs", TRUE, NULL);
-         g_signal_connect (G_OBJECT (vsink->sink),
-                           "handoff",
-                           G_CALLBACK (cb_handoff), ev);
-      }
-   }
+	vsink = (Emotion_Video_Sink *)ecore_list_first_goto(ev->video_sinks);
+	if (vsink && vsink->sink)
+	  {
+	     g_object_set(G_OBJECT(vsink->sink), "sync", TRUE, NULL);
+	     g_object_set(G_OBJECT(vsink->sink), "signal-handoffs", TRUE, NULL);
+	     g_signal_connect(G_OBJECT(vsink->sink),
+			      "handoff",
+			      G_CALLBACK(cb_handoff), ev);
+	  }
+     }
 
    return 1;
 
- failure_gstreamer_pause:
- failure_link:
-   gst_element_set_state (ev->pipeline, GST_STATE_NULL);
-   gst_bin_remove (GST_BIN (ev->pipeline), dvddemux);
- failure_dvddemux:
-   gst_bin_remove (GST_BIN (ev->pipeline), dvdreadsrc);
- failure_dvdreadsrc:
+failure_gstreamer_pause:
+failure_link:
+   gst_element_set_state(ev->pipeline, GST_STATE_NULL);
+   gst_bin_remove(GST_BIN(ev->pipeline), dvddemux);
+failure_dvddemux:
+   gst_bin_remove(GST_BIN(ev->pipeline), dvdreadsrc);
+failure_dvdreadsrc:
 
    return 0;
 }
 
 static void
-dvd_pad_added_cb (GstElement *dvddemuxer,
-                  GObject    *new_pad,
-                  gpointer    user_data)
+dvd_pad_added_cb(GstElement *dvddemuxer,
+                 GObject    *new_pad,
+                 gpointer    user_data)
 {
    Emotion_Gstreamer_Video *ev;
    GstCaps                 *caps;
    gchar                   *str;
 
    ev = (Emotion_Gstreamer_Video *)user_data;
-   caps = gst_pad_get_caps (GST_PAD (new_pad));
-   str = gst_caps_to_string (caps);
+   caps = gst_pad_get_caps(GST_PAD(new_pad));
+   str = gst_caps_to_string(caps);
    /* video stream */
-   if (g_str_has_prefix (str, "video/mpeg")) {
-      Emotion_Video_Sink *vsink;
-      GstElement         *queue;
-      GstElement         *decoder;
-      GstPad             *videopad;
+   if (g_str_has_prefix(str, "video/mpeg"))
+     {
+	Emotion_Video_Sink *vsink;
+	GstElement         *queue;
+	GstElement         *decoder;
+	GstPad             *videopad;
 
-      vsink = (Emotion_Video_Sink *)malloc (sizeof (Emotion_Video_Sink));
-      if (!vsink) return;
-      if (!ecore_list_append (ev->video_sinks, vsink)) {
-         free(vsink);
-         return;
-      }
+	vsink = (Emotion_Video_Sink *)malloc(sizeof(Emotion_Video_Sink));
+	if (!vsink) return;
+	if (!ecore_list_append(ev->video_sinks, vsink))
+	  {
+	     free(vsink);
+	     return;
+	  }
 
-      queue = gst_element_factory_make ("queue", NULL);
-      decoder = gst_element_factory_make ("mpeg2dec", "mpeg2dec");
-      vsink->sink = gst_element_factory_make ("fakesink", "videosink");
-      gst_bin_add_many (GST_BIN (ev->pipeline), queue, decoder, vsink->sink, NULL);
-      gst_element_link (queue, decoder);
-      gst_element_link (decoder, vsink->sink);
-      videopad = gst_element_get_pad (queue, "sink");
-      gst_pad_link (GST_PAD (new_pad), videopad);
-      gst_object_unref (videopad);
-      if (ecore_list_count(ev->video_sinks) == 1) {
-         ev->ratio = (double)vsink->width / (double)vsink->height;
-      }
-      gst_element_set_state (queue, GST_STATE_PAUSED);
-      gst_element_set_state (decoder, GST_STATE_PAUSED);
-      gst_element_set_state (vsink->sink, GST_STATE_PAUSED);
-   }
+	queue = gst_element_factory_make("queue", NULL);
+	decoder = gst_element_factory_make("mpeg2dec", "mpeg2dec");
+	vsink->sink = gst_element_factory_make("fakesink", "videosink");
+	gst_bin_add_many(GST_BIN(ev->pipeline), queue, decoder, vsink->sink, NULL);
+	gst_element_link(queue, decoder);
+	gst_element_link(decoder, vsink->sink);
+	videopad = gst_element_get_pad(queue, "sink");
+	gst_pad_link(GST_PAD(new_pad), videopad);
+	gst_object_unref(videopad);
+	if (ecore_list_count(ev->video_sinks) == 1)
+	  {
+	     ev->ratio = (double)vsink->width / (double)vsink->height;
+	  }
+	gst_element_set_state(queue, GST_STATE_PAUSED);
+	gst_element_set_state(decoder, GST_STATE_PAUSED);
+	gst_element_set_state(vsink->sink, GST_STATE_PAUSED);
+     }
    /* audio stream */
-   else if (g_str_has_prefix (str, "audio/")) {
-     Emotion_Audio_Sink *asink;
-     GstElement         *queue;
-     GstElement         *decoder;
-     GstElement         *conv;
-     GstElement         *resample;
-     GstElement         *volume;
-     GstPad             *audiopad;
-     double              vol;
+   else if (g_str_has_prefix(str, "audio/"))
+     {
+	Emotion_Audio_Sink *asink;
+	GstElement         *queue;
+	GstElement         *decoder;
+	GstElement         *conv;
+	GstElement         *resample;
+	GstElement         *volume;
+	GstPad             *audiopad;
+	double              vol;
 
-      asink = (Emotion_Audio_Sink *)malloc (sizeof (Emotion_Audio_Sink));
-      if (!asink) return;
-      if (!ecore_list_append (ev->audio_sinks, asink)) {
-         free(asink);
-         return;
-      }
+	asink = (Emotion_Audio_Sink *)malloc(sizeof(Emotion_Audio_Sink));
+	if (!asink) return;
+	if (!ecore_list_append(ev->audio_sinks, asink))
+	  {
+	     free(asink);
+	     return;
+	  }
 
-     queue = gst_element_factory_make ("queue", NULL);
-     decoder = gst_element_factory_make ("a52dec", "a52dec");
-     conv = gst_element_factory_make ("audioconvert", NULL);
-     resample = gst_element_factory_make ("audioresample", NULL);
-     volume = gst_element_factory_make ("volume", "volume");
-     g_object_get (G_OBJECT (volume), "volume", &vol, NULL);
-     ev->volume = vol / 10.0;
+	queue = gst_element_factory_make("queue", NULL);
+	decoder = gst_element_factory_make("a52dec", "a52dec");
+	conv = gst_element_factory_make("audioconvert", NULL);
+	resample = gst_element_factory_make("audioresample", NULL);
+	volume = gst_element_factory_make("volume", "volume");
+	g_object_get(G_OBJECT(volume), "volume", &vol, NULL);
+	ev->volume = vol / 10.0;
 
-     /* FIXME: must manage several audio streams */
-     asink->sink = gst_element_factory_make ("fakesink", NULL);
+	/* FIXME: must manage several audio streams */
+	asink->sink = gst_element_factory_make("fakesink", NULL);
 
-     gst_bin_add_many (GST_BIN (ev->pipeline),
-                       queue, decoder, conv, resample, volume, asink->sink, NULL);
-     gst_element_link_many (queue, decoder, conv, resample, volume, asink->sink, NULL);
+	gst_bin_add_many(GST_BIN(ev->pipeline),
+			 queue, decoder, conv, resample, volume, asink->sink, NULL);
+	gst_element_link_many(queue, decoder, conv, resample, volume, asink->sink, NULL);
 
-     audiopad = gst_element_get_pad (queue, "sink");
-     gst_pad_link (GST_PAD (new_pad), audiopad);
-     gst_object_unref (audiopad);
+	audiopad = gst_element_get_pad(queue, "sink");
+	gst_pad_link(GST_PAD(new_pad), audiopad);
+	gst_object_unref(audiopad);
 
-     gst_element_set_state (queue, GST_STATE_PAUSED);
-     gst_element_set_state (decoder, GST_STATE_PAUSED);
-     gst_element_set_state (conv, GST_STATE_PAUSED);
-     gst_element_set_state (resample, GST_STATE_PAUSED);
-     gst_element_set_state (volume, GST_STATE_PAUSED);
-     gst_element_set_state (asink->sink, GST_STATE_PAUSED);
-   }
+	gst_element_set_state(queue, GST_STATE_PAUSED);
+	gst_element_set_state(decoder, GST_STATE_PAUSED);
+	gst_element_set_state(conv, GST_STATE_PAUSED);
+	gst_element_set_state(resample, GST_STATE_PAUSED);
+	gst_element_set_state(volume, GST_STATE_PAUSED);
+	gst_element_set_state(asink->sink, GST_STATE_PAUSED);
+     }
 }
 
 static void
-dvd_no_more_pads_cb (GstElement *dvddemuxer,
-                     gpointer    user_data)
+dvd_no_more_pads_cb(GstElement *dvddemuxer,
+                    gpointer    user_data)
 {
   no_more_pads = 1;
 }
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_file.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_file.c
index 0ec76774be..393855d823 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_file.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_file.c
@@ -5,7 +5,7 @@
 #include "emotion_gstreamer_pipeline.h"
 
 int
-emotion_pipeline_file_build (void *video, const char *file)
+emotion_pipeline_file_build(void *video, const char *file)
 {
    GstElement              *filesrc;
    GstElement              *decodebin;
@@ -14,50 +14,51 @@ emotion_pipeline_file_build (void *video, const char *file)
    ev = (Emotion_Gstreamer_Video *)video;
    if (!ev) return 0;
 
-   filesrc = gst_element_factory_make ("filesrc", "src");
+   filesrc = gst_element_factory_make("filesrc", "src");
    if (!filesrc)
      goto failure_filesrc;
-   g_object_set (G_OBJECT (filesrc), "location", file, NULL);
+   g_object_set(G_OBJECT(filesrc), "location", file, NULL);
 
-   decodebin = gst_element_factory_make ("decodebin", "decodebin");
+   decodebin = gst_element_factory_make("decodebin", "decodebin");
    if (!decodebin)
      goto failure_decodebin;
-   g_signal_connect (decodebin, "new-decoded-pad",
-                     G_CALLBACK (file_new_decoded_pad_cb), ev);
+   g_signal_connect(decodebin, "new-decoded-pad",
+		    G_CALLBACK(file_new_decoded_pad_cb), ev);
 
-   gst_bin_add_many (GST_BIN (ev->pipeline), filesrc, decodebin, NULL);
-   if (!gst_element_link (filesrc, decodebin))
+   gst_bin_add_many(GST_BIN(ev->pipeline), filesrc, decodebin, NULL);
+   if (!gst_element_link(filesrc, decodebin))
      goto failure_link;
 
-   if (!emotion_pipeline_pause (ev->pipeline))
+   if (!emotion_pipeline_pause(ev->pipeline))
      goto failure_gstreamer_pause;
 
-   emotion_streams_sinks_get (ev, decodebin);
+   emotion_streams_sinks_get(ev, decodebin);
 
    /* The first vsink is a valid Emotion_Video_Sink * */
    /* If no video stream is found, it's a visualisation sink */
-   {
-      Emotion_Video_Sink *vsink;
+     {
+	Emotion_Video_Sink *vsink;
 
-      vsink = (Emotion_Video_Sink *)ecore_list_first_goto (ev->video_sinks);
-      if (vsink && vsink->sink) {
-         g_object_set (G_OBJECT (vsink->sink), "sync", TRUE, NULL);
-         g_object_set (G_OBJECT (vsink->sink), "signal-handoffs", TRUE, NULL);
-         g_signal_connect (G_OBJECT (vsink->sink),
-                           "handoff",
-                           G_CALLBACK (cb_handoff), ev);
-      }
-   }
+	vsink = (Emotion_Video_Sink *)ecore_list_first_goto(ev->video_sinks);
+	if (vsink && vsink->sink)
+	  {
+	     g_object_set(G_OBJECT(vsink->sink), "sync", TRUE, NULL);
+	     g_object_set(G_OBJECT(vsink->sink), "signal-handoffs", TRUE, NULL);
+	     g_signal_connect(G_OBJECT(vsink->sink),
+			      "handoff",
+			      G_CALLBACK(cb_handoff), ev);
+	  }
+     }
 
    return 1;
 
- failure_gstreamer_pause:
- failure_link:
-   gst_element_set_state (ev->pipeline, GST_STATE_NULL);
-   gst_bin_remove (GST_BIN (ev->pipeline), decodebin);
- failure_decodebin:
-   gst_bin_remove (GST_BIN (ev->pipeline), filesrc);
- failure_filesrc:
+failure_gstreamer_pause:
+failure_link:
+   gst_element_set_state(ev->pipeline, GST_STATE_NULL);
+   gst_bin_remove(GST_BIN(ev->pipeline), decodebin);
+failure_decodebin:
+   gst_bin_remove(GST_BIN(ev->pipeline), filesrc);
+failure_filesrc:
 
    return 0;
 }
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_uri.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_uri.c
index d83590f9f3..d6a1c00609 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_uri.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_uri.c
@@ -5,7 +5,7 @@
 #include "emotion_gstreamer_pipeline.h"
 
 int
-emotion_pipeline_uri_build (void *video, const char *uri)
+emotion_pipeline_uri_build(void *video, const char *uri)
 {
    GstElement              *src;
    GstElement              *decodebin;
@@ -16,50 +16,51 @@ emotion_pipeline_uri_build (void *video, const char *uri)
 
    if (gst_uri_protocol_is_supported(GST_URI_SRC, uri))
      goto failure_src;
-   src = gst_element_make_from_uri (GST_URI_SRC, uri, "src");
+   src = gst_element_make_from_uri(GST_URI_SRC, uri, "src");
    if (!src)
      goto failure_src;
-   g_object_set (G_OBJECT (src), "location", uri, NULL);
+   g_object_set(G_OBJECT(src), "location", uri, NULL);
 
-   decodebin = gst_element_factory_make ("decodebin", "decodebin");
+   decodebin = gst_element_factory_make("decodebin", "decodebin");
    if (!decodebin)
      goto failure_decodebin;
-   g_signal_connect (decodebin, "new-decoded-pad",
-                     G_CALLBACK (file_new_decoded_pad_cb), ev);
+   g_signal_connect(decodebin, "new-decoded-pad",
+		    G_CALLBACK(file_new_decoded_pad_cb), ev);
 
-   gst_bin_add_many (GST_BIN (ev->pipeline), src, decodebin, NULL);
-   if (!gst_element_link (src, decodebin))
+   gst_bin_add_many(GST_BIN(ev->pipeline), src, decodebin, NULL);
+   if (!gst_element_link(src, decodebin))
      goto failure_link;
 
-   if (!emotion_pipeline_pause (ev->pipeline))
+   if (!emotion_pipeline_pause(ev->pipeline))
      goto failure_gstreamer_pause;
 
-   emotion_streams_sinks_get (ev, decodebin);
+   emotion_streams_sinks_get(ev, decodebin);
 
    /* The first vsink is a valid Emotion_Video_Sink * */
    /* If no video stream is found, it's a visualisation sink */
-   {
-      Emotion_Video_Sink *vsink;
+     {
+	Emotion_Video_Sink *vsink;
 
-      vsink = (Emotion_Video_Sink *)ecore_list_first_goto (ev->video_sinks);
-      if (vsink && vsink->sink) {
-         g_object_set (G_OBJECT (vsink->sink), "sync", TRUE, NULL);
-         g_object_set (G_OBJECT (vsink->sink), "signal-handoffs", TRUE, NULL);
-         g_signal_connect (G_OBJECT (vsink->sink),
-                           "handoff",
-                           G_CALLBACK (cb_handoff), ev);
-      }
-   }
+	vsink = (Emotion_Video_Sink *)ecore_list_first_goto(ev->video_sinks);
+	if (vsink && vsink->sink)
+	  {
+	     g_object_set(G_OBJECT(vsink->sink), "sync", TRUE, NULL);
+	     g_object_set(G_OBJECT(vsink->sink), "signal-handoffs", TRUE, NULL);
+	     g_signal_connect(G_OBJECT(vsink->sink),
+			      "handoff",
+			      G_CALLBACK(cb_handoff), ev);
+	  }
+     }
 
    return 1;
 
- failure_gstreamer_pause:
- failure_link:
-   gst_element_set_state (ev->pipeline, GST_STATE_NULL);
-   gst_bin_remove (GST_BIN (ev->pipeline), decodebin);
- failure_decodebin:
-   gst_bin_remove (GST_BIN (ev->pipeline), src);
- failure_src:
+failure_gstreamer_pause:
+failure_link:
+   gst_element_set_state(ev->pipeline, GST_STATE_NULL);
+   gst_bin_remove(GST_BIN(ev->pipeline), decodebin);
+failure_decodebin:
+   gst_bin_remove(GST_BIN(ev->pipeline), src);
+failure_src:
 
    return 0;
 }