kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Emotion fix after eina list changes 

Fix emotion after eina list changes in commit r39195

Signed-off-by: Lars Munch <lars@segv.dk>



SVN revision: 39284
This commit is contained in:
Lars Munch 2009-02-28 16:12:13 +00:00 committed by Gustavo Sverzut Barbieri
parent b7969a2861
commit 0ae6187dee
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
View File

@ -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;