[clutter-gst] content: use new Cogl API to know if a sink is ready



commit 3d281ed0181612a07013d86c233d2efd72688e91
Author: Lionel Landwerlin <llandwerlin gmail com>
Date:   Fri Jul 26 15:00:19 2013 +0100

    content: use new Cogl API to know if a sink is ready
    
    https://bugzilla.gnome.org/show_bug.cgi?id=704853

 clutter-gst/clutter-gst-content.c |   11 ++++++-----
 configure.ac                      |    4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/clutter-gst/clutter-gst-content.c b/clutter-gst/clutter-gst-content.c
index ce9cb19..71546b3 100644
--- a/clutter-gst/clutter-gst-content.c
+++ b/clutter-gst/clutter-gst-content.c
@@ -181,17 +181,18 @@ content_set_sink (ClutterGstContent *self,
 
   if (sink)
     {
-      CoglPipeline *pipeline;
-
       priv->sink = g_object_ref_sink (sink);
       g_signal_connect (priv->sink, "new-frame",
                         G_CALLBACK (_new_frame_from_pipeline), self);
       g_signal_connect (priv->sink, "notify::pixel-aspect-ratio",
                         G_CALLBACK (_pixel_aspect_ratio_changed), self);
 
-      pipeline = cogl_gst_video_sink_get_pipeline (priv->sink);
-      if (pipeline)
-        update_frame (self, pipeline);
+      if (cogl_gst_video_sink_is_ready (priv->sink))
+        {
+          CoglPipeline *pipeline = cogl_gst_video_sink_get_pipeline (priv->sink);
+          if (pipeline)
+            update_frame (self, pipeline);
+        }
     }
 
   g_object_notify (G_OBJECT (self), "video-sink");
diff --git a/configure.ac b/configure.ac
index 92d7ffa..6972818 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,8 +79,8 @@ AC_SUBST([CLUTTER_GST_RELEASE_STATUS], [clutter_gst_release_status])
 
 # pkg-config requirements
 GLIB_REQ_VERSION=2.18.0
-COGL_REQ_VERSION=1.10.0
-COGL_GST_REQ_VERSION=1.99.0
+COGL_REQ_VERSION=1.15.3
+COGL_GST_REQ_VERSION=2.0.0
 CLUTTER_REQ_VERSION=1.6.0
 GSTREAMER_REQ_VERSION=1.0.0
 GST_PLUGINS_BAD_REQ_VERSION=1.0.0


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]