From 9628f881610275db0bd414af62ba9fbd283b2c4f Mon Sep 17 00:00:00 2001 From: raster Date: Fri, 30 Dec 2011 13:17:26 +0000 Subject: [PATCH] emotion_gst... compile again on linux.. and remove warnings (bugs waiting to possibly happen) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/emotion@66689 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/gstreamer/emotion_gstreamer.h | 4 ++++ src/modules/gstreamer/emotion_sink.c | 34 ++++++++++++++++++------------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/modules/gstreamer/emotion_gstreamer.h b/src/modules/gstreamer/emotion_gstreamer.h index 25a7180..39f320c 100644 --- a/src/modules/gstreamer/emotion_gstreamer.h +++ b/src/modules/gstreamer/emotion_gstreamer.h @@ -1,6 +1,10 @@ #ifndef __EMOTION_GSTREAMER_H__ #define __EMOTION_GSTREAMER_H__ +#ifdef HAVE_ECORE_X +#include +#endif + typedef void (*Evas_Video_Convert_Cb)(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, diff --git a/src/modules/gstreamer/emotion_sink.c b/src/modules/gstreamer/emotion_sink.c index 1e8b050..678396e 100644 --- a/src/modules/gstreamer/emotion_sink.c +++ b/src/modules/gstreamer/emotion_sink.c @@ -472,13 +472,13 @@ evas_video_sink_samsung_main_render(void *data) { Emotion_Gstreamer_Buffer *send; Emotion_Video_Stream *vstream; - EvasVideoSinkPrivate* priv; + EvasVideoSinkPrivate *priv = NULL; GstBuffer* buffer; unsigned char *evas_data; const guint8 *gst_data; GstFormat fmt = GST_FORMAT_TIME; gint64 pos; - Eina_Bool preroll; + Eina_Bool preroll = EINA_FALSE; int stride, elevation; Evas_Coord w, h; @@ -591,10 +591,13 @@ evas_video_sink_samsung_main_render(void *data) emotion_gstreamer_buffer_free(send); exit_stream: - if (preroll || !priv->o) return ; - - if (!priv->unlocked) - eina_condition_signal(&priv->c); + if (priv) + { + if (preroll || !priv->o) return; + + if (!priv->unlocked) + eina_condition_signal(&priv->c); + } } static void @@ -603,12 +606,12 @@ evas_video_sink_main_render(void *data) Emotion_Gstreamer_Buffer *send; Emotion_Gstreamer_Video *ev = NULL; Emotion_Video_Stream *vstream; - EvasVideoSinkPrivate* priv; - GstBuffer* buffer; + EvasVideoSinkPrivate *priv = NULL; + GstBuffer *buffer; unsigned char *evas_data; GstFormat fmt = GST_FORMAT_TIME; gint64 pos; - Eina_Bool preroll; + Eina_Bool preroll = EINA_FALSE; send = data; @@ -692,10 +695,13 @@ evas_video_sink_main_render(void *data) emotion_gstreamer_buffer_free(send); exit_stream: - if (preroll || !priv->o) return ; - - if (!priv->unlocked) - eina_condition_signal(&priv->c); + if (priv) + { + if (preroll || !priv->o) return; + + if (!priv->unlocked) + eina_condition_signal(&priv->c); + } } static void @@ -1076,7 +1082,7 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev, evas_render_method_list_free(engines); } #else -# warning "no ecore_x or xoverlay" +# warning "missing: ecore_x OR xoverlay" #endif esink = gst_element_factory_make("emotion-sink", "sink"); -- 2.7.4