Commit 872fc2ed authored by Luis de Bethencourt's avatar Luis de Bethencourt

clutter: upgrade to clutter-gst-3.0

parent 8f239aa3
......@@ -35,7 +35,7 @@ AC_CANONICAL_HOST
# keep one single GST_REQ, core/base should be same versions anyway
GST_REQ=1.4.0
CLUTTER_REQS=1.20.0
CLUTTER_GST_REQS=2.0.12
CLUTTER_GST_REQS=2.99.2
CLUTTER_GTK_REQS=1.6.0
GTK_REQS=3.5.0
GIO_REQ=2.32
......@@ -55,7 +55,7 @@ PKG_CHECK_MODULES([CLUTTER],
AC_SUBST(CLUTTER_CFLAGS)
AC_SUBST(CLUTTER_LIBS)
PKG_CHECK_MODULES([CLUTTER_GST], [clutter-gst-2.0 >= $CLUTTER_GST_REQS])
PKG_CHECK_MODULES([CLUTTER_GST], [clutter-gst-3.0 >= $CLUTTER_GST_REQS])
AC_SUBST(CLUTTER_GST_CFLAGS)
AC_SUBST(CLUTTER_GST_LIBS)
......
......@@ -724,7 +724,7 @@ cycle_streams (GstEngine * engine, guint streamid)
/* Init GstEngine variables */
gboolean
engine_init (GstEngine * engine, GstElement * sink)
engine_init (GstEngine * engine, ClutterGstVideoSink * sink)
{
engine->playing = FALSE;
engine->direction_foward = TRUE;
......
......@@ -24,6 +24,7 @@
#define __GST_ENGINE_H__
#include <gst/gst.h>
#include <clutter-gst/clutter-gst.h>
/* GStreamer Interfaces */
#include <gst/video/navigation.h>
......@@ -50,7 +51,7 @@ struct _GstEngine
gchar *uri;
GstElement *player;
GstElement *sink;
ClutterGstVideoSink *sink;
GstBus *bus;
......@@ -64,7 +65,7 @@ gboolean bus_call (GstBus * bus, GstMessage * msg, gpointer data);
gboolean change_state (GstEngine * engine, gchar * state);
gboolean check_missing_plugins_error (GstEngine * engine, GstMessage * msg);
gboolean cycle_streams (GstEngine * engine, guint streamid);
gboolean engine_init (GstEngine * engine, GstElement * sink);
gboolean engine_init (GstEngine * engine, ClutterGstVideoSink * sink);
gboolean engine_change_offset (GstEngine * engine, gint64 av_offest);
gboolean engine_change_speed (GstEngine * engine, gdouble rate);
void engine_load_uri (GstEngine * engine, gchar * uri);
......
......@@ -29,9 +29,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <clutter/clutter.h>
#include <clutter-gst/clutter-gst.h>
#include <clutter-gtk/clutter-gtk.h>
#include "user_interface.h"
......@@ -160,7 +157,7 @@ main (int argc, char *argv[])
UserInterface *ui = NULL;
GstEngine *engine = NULL;
ClutterActor *video_texture;
GstElement *sink;
ClutterGstVideoSink *sink;
gboolean ok, blind = FALSE, fullscreen = FALSE, hide = FALSE, loop = FALSE;
gboolean secret = FALSE, tags = FALSE;
......@@ -230,7 +227,7 @@ main (int argc, char *argv[])
/* Gstreamer engine */
engine = g_new (GstEngine, 1);
sink = gst_element_factory_make ("cluttersink", "video-sink");
sink = clutter_gst_video_sink_new ();
if (sink == NULL) {
g_print ("ERROR: Failed to create clutter-gst sink element\n");
return FALSE;
......
......@@ -23,6 +23,10 @@
#ifndef __USER_INTERFACE_H__
#define __USER_INTERFACE_H__
#include <clutter/clutter.h>
#include <clutter-gst/clutter-gst.h>
#include <clutter-gtk/clutter-gtk.h>
#include <gtk/gtk.h>
#include "gst_engine.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment