Re: [E-devel] E SVN: raster trunk/emotion/src/modules/gstreamer

[Vincent T. <vin...@gm...>]

On Fri, Dec 30, 2011 at 2:17 PM, Enlightenment SVN
<no-...@en...> wrote:
> Log:
> emotion_gst... compile again on linux.. and remove warnings (bugs
>  waiting to possibly happen)

and you break compilation on linux if X is installed on Windows...

revert that, i've fixed the code with X

Vincent

>
>
>
> Author:       raster
> Date:         2011-12-30 05:17:26 -0800 (Fri, 30 Dec 2011)
> New Revision: 66689
> Trac:         http://trac.enlightenment.org/e/changeset/66689
>
> Modified:
>  trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h trunk/emotion/src/modules/gstreamer/emotion_sink.c
>
> Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h
> ===================================================================
> --- trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h     2011-12-30 13:07:09 UTC (rev 66688)
> +++ trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h     2011-12-30 13:17:26 UTC (rev 66689)
> @@ -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,
>
> Modified: trunk/emotion/src/modules/gstreamer/emotion_sink.c
> ===================================================================
> --- trunk/emotion/src/modules/gstreamer/emotion_sink.c  2011-12-30 13:07:09 UTC (rev 66688)
> +++ trunk/emotion/src/modules/gstreamer/emotion_sink.c  2011-12-30 13:17:26 UTC (rev 66689)
> @@ -472,13 +472,13 @@
>  {
>    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 @@
>    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 @@
>    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 @@
>    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 @@
>        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");
>
>
> ------------------------------------------------------------------------------
> Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
> infrastructure or vast IT resources to deliver seamless, secure access to
> virtual desktops. With this all-in-one solution, easily deploy virtual
> desktops for less than the cost of PCs and save 60% on VDI infrastructure
> costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
> _______________________________________________
> enlightenment-svn mailing list
> enl...@li...
> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn