GNOME.org
 

[totem/wip/hadess/bug-fixes: 1/2] rotation: Port plugin to C

commit c3d8faeb6a19460afbddd310578db0f372c5e1c9
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Feb 8 12:46:55 2019 +0100

    rotation: Port plugin to C
    
    So we don't need to rely on Vala to build what is a core functionality.
    Also mark it as builtin, evidently.

 po/POTFILES.in                                  |   2 +-
 src/plugins/meson.build                         |  22 +-
 src/plugins/rotation/bacon-video.vapi           |  19 --
 src/plugins/rotation/meson.build                |  27 +--
 src/plugins/rotation/rotation.plugin.desktop.in |   1 +
 src/plugins/rotation/totem-rotation-plugin.vala | 184 ---------------
 src/plugins/rotation/totem-rotation.c           | 294 ++++++++++++++++++++++++
 7 files changed, 301 insertions(+), 248 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9b3f8aeeb..29cdec3bd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -57,7 +57,7 @@ src/plugins/pythonconsole/pythonconsole.plugin.desktop.in
 src/plugins/pythonconsole/pythonconsole.py
 src/plugins/recent/recent.plugin.desktop.in
 src/plugins/rotation/rotation.plugin.desktop.in
-src/plugins/rotation/totem-rotation-plugin.vala
+src/plugins/rotation/totem-rotation.c
 src/plugins/save-file/save-file.plugin.desktop.in
 src/plugins/save-file/totem-save-file.c
 src/plugins/screensaver/screensaver.plugin.desktop.in
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
index 821b000c9..552cc223b 100644
--- a/src/plugins/meson.build
+++ b/src/plugins/meson.build
@@ -45,6 +45,7 @@ if plugins_option != 'none'
     'media-player-keys',
     'properties',
     'recent',
+    'rotation',
     'save-file',
     'screensaver',
     'screenshot',
@@ -87,27 +88,6 @@ if plugins_option != 'none'
       'samplepython'
     ]
   endif
-
-  if have_vala
-    plugins_vala_deps = [
-      declare_dependency(sources: libtotem_gir[0])
-    ]
-
-    plugins_vala_flags = [
-      '-Wno-unused-but-set-variable',
-      '-Wno-unused-function',
-      '-Wno-unused-variable'
-    ]
-
-    plugins_vala_args = [
-      '--girdir=' + join_paths(meson.build_root(), 'src'),
-      '--pkg=@0@-@1@'.format(totem_gir_ns, totem_api_version)
-    ]
-
-    plugins += [
-      'rotation',
-    ]
-  endif
 endif
 
 pylint_flags = ['-d', 'C0111', '-d', 'W0511', '-d', 'F0401', '-d', 'C0326' ]
diff --git a/src/plugins/rotation/meson.build b/src/plugins/rotation/meson.build
index 18068c27b..fc3a1b12f 100644
--- a/src/plugins/rotation/meson.build
+++ b/src/plugins/rotation/meson.build
@@ -2,31 +2,12 @@ plugin_name = 'rotation'
 
 plugin_dir = join_paths(totem_pluginsdir, plugin_name)
 
-plugin_files = files(
-  'totem-' + plugin_name + '-plugin.vala',
-  'bacon-video.vapi'
-)
-
-plugin_deps = [
-  gtk_dep,
-  peas_dep,
-  dependency('cogl-pango-1.0'),
-  clutter_gtk_dep,
-]
-
 shared_module(
   plugin_name,
-  sources: plugin_files,
-  include_directories: plugins_incs + [
-    backend_inc,
-    src_inc
-  ],
-  dependencies: plugin_deps + plugins_vala_deps,
-  c_args: plugins_cflags + plugins_vala_flags + [
-    '--include=config.h'
-  ],
-  vala_args: plugins_vala_args,
-  link_with: libtotem,
+  sources: 'totem-' + plugin_name + '.c',
+  include_directories: plugins_incs,
+  dependencies: plugins_deps,
+  c_args: plugins_cflags,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/rotation/rotation.plugin.desktop.in b/src/plugins/rotation/rotation.plugin.desktop.in
index 5eadb7a82..46937c8e0 100644
--- a/src/plugins/rotation/rotation.plugin.desktop.in
+++ b/src/plugins/rotation/rotation.plugin.desktop.in
@@ -1,6 +1,7 @@
 [Plugin]
 Module=rotation
 IAge=1
+Builtin=true
 Name=Rotation Plugin
 Description=Allows videos to be rotated if they are in the wrong orientation
 Authors=Simon Wenner <simon wenner ch>
diff --git a/src/plugins/rotation/totem-rotation.c b/src/plugins/rotation/totem-rotation.c
new file mode 100644
index 000000000..db342df23
--- /dev/null
+++ b/src/plugins/rotation/totem-rotation.c
@@ -0,0 +1,294 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Copyright (C) Bastien Nocera 2019 <hadess hadess net>
+ * Copyright (C) Simon Wenner 2011 <simon wenner ch>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ */
+
+#include "config.h"
+
+#include <unistd.h>
+
+#include <glib.h>
+#include <glib-object.h>
+#include <glib/gi18n-lib.h>
+#include <glib/gstdio.h>
+#include <gmodule.h>
+#include <errno.h>
+#include <libpeas/peas-extension-base.h>
+#include <libpeas/peas-object-module.h>
+#include <libpeas/peas-activatable.h>
+
+#include "totem-plugin.h"
+#include "totem-interface.h"
+#include "backend/bacon-video-widget.h"
+
+#define TOTEM_TYPE_ROTATION_PLUGIN             (totem_rotation_plugin_get_type ())
+#define TOTEM_ROTATION_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_CAST ((o), TOTEM_TYPE_ROTATION_PLUGIN, 
TotemRotationPlugin))
+#define TOTEM_ROTATION_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_CAST((k), TOTEM_TYPE_ROTATION_PLUGIN, 
TotemRotationPluginClass))
+#define TOTEM_IS_ROTATION_PLUGIN(o)            (G_TYPE_CHECK_INSTANCE_TYPE ((o), TOTEM_TYPE_ROTATION_PLUGIN))
+#define TOTEM_IS_ROTATION_PLUGIN_CLASS(k)      (G_TYPE_CHECK_CLASS_TYPE ((k), TOTEM_TYPE_ROTATION_PLUGIN))
+#define TOTEM_ROTATION_PLUGIN_GET_CLASS(o)     (G_TYPE_INSTANCE_GET_CLASS ((o), TOTEM_TYPE_ROTATION_PLUGIN, 
TotemRotationPluginClass))
+
+#define GIO_ROTATION_FILE_ATTRIBUTE "metadata::totem::rotation"
+#define STATE_COUNT 4
+
+typedef struct {
+       TotemObject *totem;
+       GtkWidget   *bvw;
+
+       GCancellable *cancellable;
+       GSimpleAction *rotate_left_action;
+       GSimpleAction *rotate_right_action;
+} TotemRotationPluginPrivate;
+
+TOTEM_PLUGIN_REGISTER(TOTEM_TYPE_ROTATION_PLUGIN, TotemRotationPlugin, totem_rotation_plugin)
+
+static void
+store_state_cb (GObject      *source_object,
+               GAsyncResult *res,
+               gpointer      user_data)
+{
+       GError *error = NULL;
+
+       if (!g_file_set_attributes_finish (G_FILE (source_object), res, NULL, &error)) {
+               if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED) &&
+                   !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+                       g_warning ("Could not store file attribute: %s", error->message);
+               }
+               g_error_free (error);
+       }
+}
+
+static void
+store_state (TotemRotationPlugin *pi)
+{
+       TotemRotationPluginPrivate *priv = pi->priv;
+       BvwRotation rotation;
+       char *rotation_s;
+       GFileInfo *info;
+       char *mrl;
+       GFile *file;
+
+       rotation = bacon_video_widget_get_rotation (BACON_VIDEO_WIDGET (priv->bvw));
+       rotation_s = g_strdup_printf ("%u", rotation);
+       info = g_file_info_new ();
+       g_file_info_set_attribute_string (info, GIO_ROTATION_FILE_ATTRIBUTE, rotation_s);
+       g_free (rotation_s);
+
+       mrl = totem_object_get_current_mrl (priv->totem);
+       file = g_file_new_for_uri (mrl);
+       g_free (mrl);
+       g_file_set_attributes_async (file,
+                                    info,
+                                    G_FILE_QUERY_INFO_NONE,
+                                    G_PRIORITY_DEFAULT,
+                                    priv->cancellable,
+                                    store_state_cb,
+                                    pi);
+       g_object_unref (file);
+}
+
+static void
+restore_state_cb (GObject      *source_object,
+                 GAsyncResult *res,
+                 gpointer      user_data)
+{
+       TotemRotationPlugin *pi;
+       GError *error = NULL;
+       GFileInfo *info;
+       const char *rotation_s;
+       BvwRotation rotation;
+
+       info = g_file_query_info_finish (G_FILE (source_object), res, &error);
+       if (info == NULL) {
+               if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED) &&
+                   !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+                       g_warning ("Could not query file attribute: %s", error->message);
+               }
+               g_error_free (error);
+               return;
+       }
+
+       pi = user_data;
+
+       rotation_s = g_file_info_get_attribute_string (info, GIO_ROTATION_FILE_ATTRIBUTE);
+       if (!rotation_s)
+               goto out;
+
+       rotation = atoi (rotation_s);
+       bacon_video_widget_set_rotation (BACON_VIDEO_WIDGET (pi->priv->bvw), rotation);
+
+out:
+       g_object_unref (info);
+}
+
+static void
+restore_state (TotemRotationPlugin *pi)
+{
+       TotemRotationPluginPrivate *priv = pi->priv;
+       char *mrl;
+       GFile *file;
+
+       mrl = totem_object_get_current_mrl (priv->totem);
+       file = g_file_new_for_uri (mrl);
+       g_free (mrl);
+
+       g_file_query_info_async (file,
+                                GIO_ROTATION_FILE_ATTRIBUTE,
+                                G_FILE_QUERY_INFO_NONE,
+                                G_PRIORITY_DEFAULT,
+                                priv->cancellable,
+                                restore_state_cb,
+                                pi);
+       g_object_unref (file);
+}
+
+static void
+update_state (TotemRotationPlugin *pi,
+             const char          *mrl)
+{
+       TotemRotationPluginPrivate *priv = pi->priv;
+
+       if (mrl == NULL) {
+               bacon_video_widget_set_rotation (BACON_VIDEO_WIDGET (priv->bvw),
+                                        BVW_ROTATION_R_ZERO);
+               g_simple_action_set_enabled (priv->rotate_left_action, FALSE);
+               g_simple_action_set_enabled (priv->rotate_right_action, FALSE);
+       } else {
+               g_simple_action_set_enabled (priv->rotate_left_action, TRUE);
+               g_simple_action_set_enabled (priv->rotate_right_action, TRUE);
+               restore_state (pi);
+       }
+}
+
+static void
+cb_rotate_left (GSimpleAction *simple,
+               GVariant      *parameter,
+               gpointer       user_data)
+{
+       TotemRotationPlugin *pi = user_data;
+       TotemRotationPluginPrivate *priv = pi->priv;
+        int state;
+
+        state = (bacon_video_widget_get_rotation (BACON_VIDEO_WIDGET (priv->bvw)) - 1) % STATE_COUNT;
+        bacon_video_widget_set_rotation (BACON_VIDEO_WIDGET (priv->bvw), state);
+        store_state (pi);
+}
+
+static void
+cb_rotate_right (GSimpleAction *simple,
+                GVariant      *parameter,
+                gpointer       user_data)
+{
+       TotemRotationPlugin *pi = user_data;
+       TotemRotationPluginPrivate *priv = pi->priv;
+        int state;
+
+        state = (bacon_video_widget_get_rotation (BACON_VIDEO_WIDGET (priv->bvw)) + 1) % STATE_COUNT;
+        bacon_video_widget_set_rotation (BACON_VIDEO_WIDGET (priv->bvw), state);
+        store_state (pi);
+}
+
+static void
+totem_rotation_file_closed (TotemObject *totem,
+                           TotemRotationPlugin *pi)
+{
+       update_state (pi, NULL);
+}
+
+static void
+totem_rotation_file_opened (TotemObject *totem,
+                           const char *mrl,
+                           TotemRotationPlugin *pi)
+{
+       update_state (pi, mrl);
+}
+
+static void
+impl_activate (PeasActivatable *plugin)
+{
+       TotemRotationPlugin *pi = TOTEM_ROTATION_PLUGIN (plugin);
+       TotemRotationPluginPrivate *priv = pi->priv;
+       GMenu *menu;
+       GMenuItem *item;
+       char *mrl;
+
+       priv->totem = g_object_get_data (G_OBJECT (plugin), "object");
+       priv->bvw = totem_object_get_video_widget (priv->totem);
+       priv->cancellable = g_cancellable_new ();
+
+       g_signal_connect (priv->totem,
+                         "file-opened",
+                         G_CALLBACK (totem_rotation_file_opened),
+                         plugin);
+       g_signal_connect (priv->totem,
+                         "file-closed",
+                         G_CALLBACK (totem_rotation_file_closed),
+                         plugin);
+
+       /* add UI */
+       menu = totem_object_get_menu_section (priv->totem, "rotation-placeholder");
+
+       priv->rotate_left_action = g_simple_action_new ("rotate-left", NULL);
+       g_signal_connect (G_OBJECT (priv->rotate_left_action), "activate",
+                         G_CALLBACK (cb_rotate_left), pi);
+       g_action_map_add_action (G_ACTION_MAP (priv->totem),
+                                G_ACTION (priv->rotate_left_action));
+
+       priv->rotate_right_action = g_simple_action_new ("rotate-right", NULL);
+       g_signal_connect (G_OBJECT (priv->rotate_right_action), "activate",
+                         G_CALLBACK (cb_rotate_right), pi);
+       g_action_map_add_action (G_ACTION_MAP (priv->totem),
+                                G_ACTION (priv->rotate_right_action));
+
+       item = g_menu_item_new (_("_Rotate ↷"), "app.rotate-right");
+       g_menu_item_set_attribute (item, "accel", "s", "<Primary>R");
+       g_menu_append_item (G_MENU (menu), item);
+
+       item = g_menu_item_new (_("Rotate ↶"), "app.rotate-left");
+       g_menu_item_set_attribute (item, "accel", "s", "<Primary><Shift>R");
+       g_menu_append_item (G_MENU (menu), item);
+
+       mrl = totem_object_get_current_mrl (priv->totem);
+       update_state (pi, mrl);
+       g_free (mrl);
+}
+
+static void
+impl_deactivate (PeasActivatable *plugin)
+{
+       TotemRotationPlugin *pi = TOTEM_ROTATION_PLUGIN (plugin);
+       TotemRotationPluginPrivate *priv = pi->priv;
+
+       if (priv->cancellable != NULL) {
+               g_cancellable_cancel (priv->cancellable);
+               g_clear_object (&priv->cancellable);
+       }
+
+       g_signal_handlers_disconnect_by_func (priv->totem, totem_rotation_file_opened, plugin);
+       g_signal_handlers_disconnect_by_func (priv->totem, totem_rotation_file_closed, plugin);
+
+       totem_object_empty_menu_section (priv->totem, "rotation-placeholder");
+       g_action_map_remove_action (G_ACTION_MAP (priv->totem), "rotate-left");
+       g_action_map_remove_action (G_ACTION_MAP (priv->totem), "rotate-right");
+
+       bacon_video_widget_set_rotation (BACON_VIDEO_WIDGET (priv->bvw),
+                                        BVW_ROTATION_R_ZERO);
+
+       priv->totem = NULL;
+       priv->bvw = NULL;
+}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]