[totem/wip/hadess/glsink: 38/38] clutter gtk removal

[Bastien Nocera <hadess src gnome org>]

commit e292308e31452afdb375d0660203028a559fa72c
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jan 25 15:10:53 2022 +0100

    clutter gtk removal

 meson.build                                      |   3 +-
 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                          |  10 +-
 src/meson.build                                  |   2 +-
 src/plugins/screenshot/totem-screenshot-plugin.c |   5 +-
 src/totem-object.c                               |   5 +-
 10 files changed, 16 insertions(+), 260 deletions(-)
---
diff --git a/meson.build b/meson.build
index 2322a68a4..8768556bf 100644
--- a/meson.build
+++ b/meson.build
@@ -134,6 +134,8 @@ glib_dep =  dependency('glib-2.0', version: glib_req_version)
 gobject_dep =  dependency('gobject-2.0', version: glib_req_version)
 gio_dep = dependency('gio-2.0', version: '>= 2.43.4')
 gtk_dep = dependency('gtk+-3.0', version: gtk_req_version)
+# FIXME check the targets
+x11_dep = dependency('x11')
 gst_dep = dependency('gstreamer-1.0', version: gst_req_version)
 gst_tag_dep = dependency('gstreamer-tag-1.0', version: '>= 0.11.93')
 gst_video_dep = dependency('gstreamer-video-1.0')
@@ -141,7 +143,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 38580e2e3..a36d14bc1 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>
@@ -586,9 +586,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 */
@@ -5626,10 +5626,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 35519bf2f..d994710fa 100644
--- a/src/backend/meson.build
+++ b/src/backend/meson.build
@@ -61,15 +61,13 @@ 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,
   libtotem_gst_pixbuf_helpers_dep,
-  libtotem_time_helpers_dep
+  libtotem_time_helpers_dep,
+  gtk_dep,
+  dependency('gmodule-2.0')
 ]
 
 libbacon_video_widget_cflags = common_flags + warn_flags + [
@@ -97,7 +95,7 @@ executable(
   backend_test,
   backend_test + '.c',
   include_directories: libbacon_video_widget_incs,
-  dependencies: libbacon_video_widget_dep,
+  dependencies: [libbacon_video_widget_dep, x11_dep],
   c_args: libbacon_video_widget_cflags + [
     '-DLOGO_PATH="@0@"'.format(join_paths(totem_pkgdatadir, meson.project_name(), 'totem_logo.png')),
     '-DG_LOG_DOMAIN="@0@"'.format(backend_test)
diff --git a/src/meson.build b/src/meson.build
index 9bffa2a21..f887aa7f6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -184,7 +184,7 @@ totem = executable(
   meson.project_name(),
   'totem.c',
   include_directories: totem_common_incs,
-  dependencies: libtotem_dep,
+  dependencies: [ libtotem_dep, x11_dep ],
   c_args: totem_common_cflags + [
     '-DG_LOG_DOMAIN="Totem"'
   ],
diff --git a/src/plugins/screenshot/totem-screenshot-plugin.c 
b/src/plugins/screenshot/totem-screenshot-plugin.c
index 2754b1851..43cb24146 100644
--- a/src/plugins/screenshot/totem-screenshot-plugin.c
+++ b/src/plugins/screenshot/totem-screenshot-plugin.c
@@ -218,10 +218,7 @@ take_screenshot_action_cb (GSimpleAction         *action,
        g_autofree char *escaped_video_name = NULL;
 
        if (bacon_video_widget_can_get_frames (priv->bvw, &err) == FALSE) {
-               if (err == NULL)
-                       return;
-
-               totem_object_show_error (priv->totem, _("Totem could not get a screenshot of the video."), 
err->message);
+               totem_object_show_error (priv->totem, _("Totem could not get a screenshot of the video."), 
err->message ?: _("No reason."));
                g_error_free (err);
                return;
        }
diff --git a/src/totem-object.c b/src/totem-object.c
index 1f122042f..f8e951e59 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -515,14 +515,15 @@ totem_object_class_init (TotemObjectClass *klass)
 static void
 totem_object_init (TotemObject *totem)
 {
-       GtkSettings *gtk_settings;
+//     GtkSettings *gtk_settings;
 
+#if 0
        if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
                g_warning ("gtk-clutter failed to initialise, expect problems from here on.");
 
        gtk_settings = gtk_settings_get_default ();
        g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme", TRUE, NULL);
-
+#endif
        totem->settings = g_settings_new (TOTEM_GSETTINGS_SCHEMA);
 
        g_application_add_main_option_entries (G_APPLICATION (totem), all_options);