Hi
Three patches attached. The most important one is
0003-Emotion-fix-after-eina-list-changes.patch that fixes emotion
gstreamer breakage that was introduced in r39195.
The two other patches is just very minor stuff that I had in my local
git.
Please apply
Regards
Lars Munch
From ba797a60f47232f3a9a463d80ad18212d47e073a Mon Sep 17 00:00:00 2001
From: Lars Munch l...@segv.dk
Date: Fri, 27 Feb 2009 22:24:15 +0100
Subject: [PATCH 3/3] Emotion fix after eina list changes
Fix emotion after eina list changes in commit r39195
Signed-off-by: Lars Munch l...@segv.dk
---
src/modules/gstreamer/emotion_gstreamer.c | 27 +--
1 files 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 / 10.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;
--
1.6.1.3
From d99263eb77159fbdfd5574f783a4c50b284da540 Mon Sep 17 00:00:00 2001
From: Lars Munch l...@segv.dk
Date: Mon, 23 Feb 2009 14:56:50 +0100
Subject: [PATCH 1/3] emotion vlc disable fix
When vlc was disable HAVE_VLC was undefined
Signed-off-by: Lars Munch l...@segv.dk
---
configure.ac |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index a424c8f..8ba3355 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,7 @@ CPPFLAGS=$save_CPPFLAGS
AC_ARG_ENABLE(vlc,
AC_HELP_STRING([--disable-vlc],[disable vlc support @:@default=auto@:@]),
[enable_vlc=$enableval],[enable_vlc=auto])
+HAVE_VLC=no
if test $enable_vlc != no ; then
PKG_CHECK_MODULES(VLC, [libvlc = 0.9], [HAVE_VLC=yes], [HAVE_VLC=no])
fi
--
1.6.1.3
From e540bcf32213dcb6be19652eae8ad85ba1aeacba Mon Sep 17 00:00:00 2001
From: Lars Munch l...@segv.dk
Date: Thu, 26 Feb 2009 13:05:16 +0100
Subject: [PATCH 2/3] White space fixes
Signed-off-by: Lars Munch l...@segv.dk
---
src/lib/Emotion.h |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/Emotion.h b/src/lib/Emotion.h
index 04bd444..1a2ec9e 100644
--- a/src/lib/Emotion.h
+++ b/src/lib/Emotion.h
@@ -109,7 +109,7 @@ typedef enum _Emotion_Vis Emotion_Vis;
#ifdef __cplusplus
extern C {
#endif
-
+
/* api calls available */
EAPI Evas_Object *emotion_object_add (Evas *evas);
EAPI void emotion_object_module_option_set (Evas_Object *obj, const char *opt, const char *val);
@@ -172,5 +172,5 @@ EAPI Evas_Boolemotion_object_vis_supported (Evas_Object *obj, Emotio
#ifdef __cplusplus
}
#endif
-
+
#endif
--
1.6.1.3
--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
