From 0f3b63f056c4e452a37a1b13d8c3ec5a2f8c5969 Mon Sep 17 00:00:00 2001 From: barbieri Date: Sat, 28 Feb 2009 16:12:13 +0000 Subject: [PATCH] Emotion fix after eina list changes Fix emotion after eina list changes in commit r39195 Signed-off-by: Lars Munch git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/emotion@39284 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/gstreamer/emotion_gstreamer.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/src/modules/gstreamer/emotion_gstreamer.c b/src/modules/gstreamer/emotion_gstreamer.c index 888b202..1449819 100644 --- a/src/modules/gstreamer/emotion_gstreamer.c +++ b/src/modules/gstreamer/emotion_gstreamer.c @@ -240,8 +240,6 @@ em_init(Evas_Object *obj, Emotion_Module_Options *opt) { Emotion_Gstreamer_Video *ev; - Emotion_Audio_Sink *asink; - Emotion_Video_Sink *vsink; GError *error; int fds[2]; @@ -256,15 +254,7 @@ em_init(Evas_Object *obj, /* Initialization of gstreamer */ if (!gst_init_check(NULL, NULL, &error)) - goto failure_gstreamer; - - /* We allocate the sinks lists */ - if (!ev->video_sinks) - goto failure_video_sinks; - if (!ev->audio_sinks) - goto failure_audio_sinks; - - *emotion_video = ev; + goto failure; /* Default values */ ev->ratio = 1.0; @@ -276,18 +266,13 @@ em_init(Evas_Object *obj, /* Create the file descriptors */ ev->pipe = ecore_pipe_add (_em_buffer_read, ev); if (!ev->pipe) - goto failure_pipe; + goto failure; + + *emotion_video = ev; return 1; -failure_pipe: - EINA_LIST_FREE(ev->audio_sinks, asink) - free(asink); -failure_audio_sinks: - EINA_LIST_FREE(ev->video_sinks, vsink) - free(vsink); -failure_video_sinks: -failure_gstreamer: +failure: free(ev); return 0; @@ -627,8 +612,6 @@ em_len_get(void *video) return val / 1000000000.0; fallback: - fputs("Gstreamer reported no length, try existing sinks...\n", stderr); - EINA_LIST_FOREACH(ev->audio_sinks, l, asink) if (asink->length_time >= 0) return asink->length_time; -- 2.7.4