[totem/wip/hadess/glsink: 33/33] clutter-gtk removal

[Bastien Nocera <hadess src gnome org>]

commit 852afa4cbeff872e2ea1431795591ca594fa0696
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jan 26 12:10:53 2022 +0100

    clutter-gtk removal

 meson.build                      |   1 -
 src/backend/bacon-video-widget.c |   8 +-
 src/backend/bacon-video-widget.h |   2 +-
 src/backend/bvw-test.c           |   3 -
 src/backend/clock.c              | 183 ---------------------------------------
 src/backend/clock.h              |  55 ------------
 src/backend/meson.build          |   4 -
 src/totem-object.c               |   3 -
 8 files changed, 5 insertions(+), 254 deletions(-)
---
diff --git a/meson.build b/meson.build
index 802b51fd5..5c47a380c 100644
--- a/meson.build
+++ b/meson.build
@@ -150,7 +150,6 @@ gst_pbutils_dep = dependency('gstreamer-pbutils-1.0')
 peas_dep = dependency('libpeas-1.0', version: peas_req_version)
 peas_gtk_dep = dependency('libpeas-gtk-1.0', version: peas_req_version)
 totem_plparser_dep = dependency('totem-plparser', version: totem_plparser_req_version)
-clutter_gtk_dep = dependency('clutter-gtk-1.0', version: '>= 1.8.1')
 m_dep = cc.find_library('m', required: true)
 
 libgd = subproject(
diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c
index 150d4c287..8bea1ad8a 100644
--- a/src/backend/bacon-video-widget.c
+++ b/src/backend/bacon-video-widget.c
@@ -63,7 +63,7 @@
 /* for the cover metadata info */
 #include <gst/tag/tag.h>
 
-#include <clutter-gst/clutter-gst.h>
+//#include <clutter-gst/clutter-gst.h>
 
 /* system */
 #include <unistd.h>
@@ -571,9 +571,9 @@ ignore_event (BaconVideoWidget *bvw,
              int               x,
              int               y)
 {
+#if 0
   ClutterActor *actor;
 
-#if 0
   actor = clutter_stage_get_actor_at_pos (CLUTTER_STAGE (bvw->stage), CLUTTER_PICK_REACTIVE, x, y);
 
   /* Eat the GTK+ event if we're not clicking on the video itself */
@@ -5611,10 +5611,10 @@ bacon_video_widget_initable_init (GInitable     *initable,
   gchar *version_str;
   GstPlayFlags flags;
   GtkWidget *tmp;
-  ClutterActor *layout;
+  //ClutterActor *layout;
   GstElement *glsinkbin, *audio_bin;
   GstPad *audio_pad;
-  ClutterAction *action;
+  //ClutterAction *action;
   GObject *item;
   char *template;
 
diff --git a/src/backend/bacon-video-widget.h b/src/backend/bacon-video-widget.h
index 183c97338..4b90bf0cc 100644
--- a/src/backend/bacon-video-widget.h
+++ b/src/backend/bacon-video-widget.h
@@ -27,7 +27,7 @@
 
 #pragma once
 
-#include <clutter-gtk/clutter-gtk.h>
+#include <gtk/gtk.h>
 
 #define BACON_TYPE_VIDEO_WIDGET                     (bacon_video_widget_get_type ())
 G_DECLARE_FINAL_TYPE(BaconVideoWidget, bacon_video_widget, BACON, VIDEO_WIDGET, GtkOverlay)
diff --git a/src/backend/bvw-test.c b/src/backend/bvw-test.c
index 1ab0ab2e2..97ff7d934 100644
--- a/src/backend/bvw-test.c
+++ b/src/backend/bvw-test.c
@@ -85,9 +85,6 @@ int main
        XInitThreads ();
 #endif
 
-       if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
-               g_assert_not_reached ();
-
        context = g_option_context_new ("- Play audio and video inside a web browser");
        baconoptiongroup = bacon_video_widget_get_option_group();
        g_option_context_add_main_entries (context, option_entries, GETTEXT_PACKAGE);
diff --git a/src/backend/meson.build b/src/backend/meson.build
index ce3b03049..ade839c93 100644
--- a/src/backend/meson.build
+++ b/src/backend/meson.build
@@ -61,10 +61,6 @@ libbacon_video_widget_deps = [
   gst_tag_dep,
   dependency('gstreamer-audio-1.0'),
   gst_video_dep,
-  dependency('clutter-1.0', version: '>= 1.17.3'),
-  dependency('clutter-gst-3.0', version: '>= 2.99.2'),
-  clutter_gtk_dep,
-  dependency('cairo', version: '>= 1.14.0'),
   dependency('gsettings-desktop-schemas'),
   m_dep,
   libtotem_gst_helpers_dep,
diff --git a/src/totem-object.c b/src/totem-object.c
index c5872e89c..217cbc169 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -522,9 +522,6 @@ totem_object_class_init (TotemObjectClass *klass)
 static void
 totem_object_init (TotemObject *totem)
 {
-       if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
-               g_warning ("gtk-clutter failed to initialise, expect problems from here on.");
-
        totem->settings = g_settings_new (TOTEM_GSETTINGS_SCHEMA);
 
        g_application_add_main_option_entries (G_APPLICATION (totem), all_options);