emotion: don't use the pipeline anymore when it's not needed.
authorcedric <cedric@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 20 Sep 2011 11:04:54 +0000 (11:04 +0000)
committercedric <cedric@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 20 Sep 2011 11:04:54 +0000 (11:04 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/emotion@63497 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/modules/gstreamer/emotion_gstreamer.c
src/modules/gstreamer/emotion_sink.c

index ce903ee..3a38edc 100644 (file)
@@ -870,8 +870,9 @@ em_video_data_size_get(void *video, int *w, int *h)
 
    ev = (Emotion_Gstreamer_Video *)video;
 
-   if (!_emotion_gstreamer_video_pipeline_parse(ev, EINA_FALSE))
-     goto on_error;
+   if (ev->pipeline && (!ev->video_stream_nbr || !ev->video_streams))
+     if (!_emotion_gstreamer_video_pipeline_parse(ev, EINA_FALSE))
+       goto on_error;
 
    vstream = eina_list_nth(ev->video_streams, ev->video_stream_nbr - 1);
    if (vstream)
index d9a2392..dfb6e02 100644 (file)
@@ -1051,7 +1051,6 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev,
 #else
 # warning "no ecore_x or xoverlay"
 #endif
-   fprintf(stderr, "sink: %p\n", sink);
    if (!sink)
      {
         sink = gst_element_factory_make("emotion-sink", "sink");