summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/modules/gstreamer
diff options
context:
space:
mode:
authorLars Munch <lars@segv.dk>2009-02-28 16:12:13 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2009-02-28 16:12:13 +0000
commit0ae6187deebc0c47c69df2c4cf905a6e8fdf812d (patch)
tree0044b3fa3130528ff492d354112cd39ffbede0ca /legacy/emotion/src/modules/gstreamer
parentb7969a286102b95d9ea82639a11a3d9a0d4c35c2 (diff)
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
Diffstat (limited to 'legacy/emotion/src/modules/gstreamer')
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c27
1 files changed, 5 insertions, 22 deletions
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index 888b202c92..1449819889 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
@@ -240,8 +240,6 @@ em_init(Evas_Object *obj,
240 Emotion_Module_Options *opt) 240 Emotion_Module_Options *opt)
241{ 241{
242 Emotion_Gstreamer_Video *ev; 242 Emotion_Gstreamer_Video *ev;
243 Emotion_Audio_Sink *asink;
244 Emotion_Video_Sink *vsink;
245 GError *error; 243 GError *error;
246 int fds[2]; 244 int fds[2];
247 245
@@ -256,15 +254,7 @@ em_init(Evas_Object *obj,
256 254
257 /* Initialization of gstreamer */ 255 /* Initialization of gstreamer */
258 if (!gst_init_check(NULL, NULL, &error)) 256 if (!gst_init_check(NULL, NULL, &error))
259 goto failure_gstreamer; 257 goto failure;
260
261 /* We allocate the sinks lists */
262 if (!ev->video_sinks)
263 goto failure_video_sinks;
264 if (!ev->audio_sinks)
265 goto failure_audio_sinks;
266
267 *emotion_video = ev;
268 258
269 /* Default values */ 259 /* Default values */
270 ev->ratio = 1.0; 260 ev->ratio = 1.0;
@@ -276,18 +266,13 @@ em_init(Evas_Object *obj,
276 /* Create the file descriptors */ 266 /* Create the file descriptors */
277 ev->pipe = ecore_pipe_add (_em_buffer_read, ev); 267 ev->pipe = ecore_pipe_add (_em_buffer_read, ev);
278 if (!ev->pipe) 268 if (!ev->pipe)
279 goto failure_pipe; 269 goto failure;
270
271 *emotion_video = ev;
280 272
281 return 1; 273 return 1;
282 274
283failure_pipe: 275failure:
284 EINA_LIST_FREE(ev->audio_sinks, asink)
285 free(asink);
286failure_audio_sinks:
287 EINA_LIST_FREE(ev->video_sinks, vsink)
288 free(vsink);
289failure_video_sinks:
290failure_gstreamer:
291 free(ev); 276 free(ev);
292 277
293 return 0; 278 return 0;
@@ -627,8 +612,6 @@ em_len_get(void *video)
627 return val / 1000000000.0; 612 return val / 1000000000.0;
628 613
629 fallback: 614 fallback:
630 fputs("Gstreamer reported no length, try existing sinks...\n", stderr);
631
632 EINA_LIST_FOREACH(ev->audio_sinks, l, asink) 615 EINA_LIST_FOREACH(ev->audio_sinks, l, asink)
633 if (asink->length_time >= 0) 616 if (asink->length_time >= 0)
634 return asink->length_time; 617 return asink->length_time;