From 74e897b4799c83c3dbe57153a87f9bec9106b1c2 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
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)

SVN revision: 66689
---
 .../src/modules/gstreamer/emotion_gstreamer.h |  4 +++
 .../src/modules/gstreamer/emotion_sink.c      | 34 +++++++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h
index 25a718076c..39f320cbbd 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h
@@ -1,6 +1,10 @@
 #ifndef __EMOTION_GSTREAMER_H__
 #define __EMOTION_GSTREAMER_H__
 
+#ifdef HAVE_ECORE_X
+#include <Ecore_X.h>
+#endif
+
 typedef void (*Evas_Video_Convert_Cb)(unsigned char *evas_data,
                                       const unsigned char *gst_data,
                                       unsigned int w,
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_sink.c b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
index 1e8b05098b..678396eb32 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_sink.c
+++ b/legacy/emotion/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");