[totem] backend: port to clutter-gst 3.0



commit 361f76ce9636d3123273b912398b77d29715cf94
Author: Lionel Landwerlin <llandwerlin gmail com>
Date:   Sun Dec 7 00:02:42 2014 +0000

    backend: port to clutter-gst 3.0

 configure.ac                     |    4 ++--
 src/backend/bacon-video-widget.c |   13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b597b51..24e075c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ GST_REQS=1.3.1
 GST_PLUG_BASE_REQS=1.4.2
 GSTPLUG_REQS=0.11.93
 CLUTTER_REQS=1.17.3
-CLUTTER_GST_REQS=1.5.5
+CLUTTER_GST_REQS=2.99.2
 CLUTTER_GTK_REQS=1.5.5
 
 dnl Check for the required GStreamer versions for missing plugins
@@ -130,7 +130,7 @@ fi
 # Backend requirements
 # ================================================================
 
-BACKEND_MODULES="gstreamer-1.0 >= $GST_REQS gstreamer-base-1.0 >= $GST_REQS gstreamer-plugins-base-1.0 >= 
$GST_PLUG_BASE_REQS $MISSING_PLUGINS_MODULES gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-audio-1.0 
gstreamer-video-1.0 clutter-1.0 >= $CLUTTER_REQS clutter-gst-2.0 >= $CLUTTER_GST_REQS clutter-gtk-1.0 cairo 
gsettings-desktop-schemas"
+BACKEND_MODULES="gstreamer-1.0 >= $GST_REQS gstreamer-base-1.0 >= $GST_REQS gstreamer-plugins-base-1.0 >= 
$GST_PLUG_BASE_REQS $MISSING_PLUGINS_MODULES gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-audio-1.0 
gstreamer-video-1.0 clutter-1.0 >= $CLUTTER_REQS clutter-gst-3.0 >= $CLUTTER_GST_REQS clutter-gtk-1.0 cairo 
gsettings-desktop-schemas"
 
 PKG_CHECK_MODULES(BACKEND, $BACKEND_MODULES)
 PKG_CHECK_MODULES(BACKEND_TEST, $BACKEND_MODULES gtk+-3.0 >= $GTK_REQS)
diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c
index 948eb91..e757d0c 100644
--- a/src/backend/bacon-video-widget.c
+++ b/src/backend/bacon-video-widget.c
@@ -5897,7 +5897,8 @@ bacon_video_widget_initable_init (GInitable     *initable,
                                  GError       **error)
 {
   BaconVideoWidget *bvw;
-  GstElement *audio_sink = NULL, *video_sink = NULL;
+  GstElement *audio_sink = NULL;
+  ClutterGstVideoSink *video_sink = NULL;
   gchar *version_str;
   GstPlayFlags flags;
   ClutterActor *layout;
@@ -5924,7 +5925,7 @@ bacon_video_widget_initable_init (GInitable     *initable,
   /* Instantiate all the fallible plugins */
   bvw->priv->play = element_make_or_warn ("playbin", "play");
   bvw->priv->audio_pitchcontrol = element_make_or_warn ("scaletempo", "scaletempo");
-  video_sink = element_make_or_warn ("cluttersink", "video-sink");
+  video_sink = clutter_gst_video_sink_new ();
   audio_sink = element_make_or_warn ("autoaudiosink", "audio-sink");
 
   if (!bvw->priv->play ||
@@ -5969,12 +5970,12 @@ bacon_video_widget_initable_init (GInitable     *initable,
   clutter_actor_set_background_color (bvw->priv->stage, CLUTTER_COLOR_Black);
 
   /* Video sink, with aspect frame */
-  bvw->priv->texture = g_object_new (CLUTTER_TYPE_TEXTURE,
-                                    "disable-slicing", TRUE,
-                                    "reactive", TRUE,
+  bvw->priv->texture = g_object_new (CLUTTER_TYPE_ACTOR,
+                                     "content", g_object_new (CLUTTER_GST_TYPE_CONTENT,
+                                                              "sink", video_sink,
+                                                              NULL),
                                     "name", "texture",
                                     NULL);
-  g_object_set (G_OBJECT (video_sink), "texture", bvw->priv->texture, NULL);
 
   /* The logo */
   bvw->priv->logo_frame = clutter_actor_new ();


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