clapper-gtk: video: Fix checks when inhibiting session

clapper-gtk: video: Fix sink property type checks
Sometimes property might return a subclass type when object is subclassed. This especially happens with custom GdkPaintable implementations. For this reason instead of comparing object type, check if it inherits what we want.
2025-08-30 16:02:00 +02:00 · 2025-04-26 23:12:40 +02:00 · 2025-01-22 20:27:02 +01:00 · 2025-01-21 22:53:47 +01:00
96 changed files with 977 additions and 4443 deletions
--- a/.github/workflows/flatpak-nightly.yml
+++ b/.github/workflows/flatpak-nightly.yml
@@ -6,32 +6,32 @@ name: "Flatpak Nightly"
 jobs:
  flatpak:
    name: "Flatpak"
+    runs-on: ubuntu-latest
+    timeout-minutes: 600
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
+      options: --privileged
    strategy:
      matrix:
-        os: [ubuntu-24.04, ubuntu-24.04-arm]
-        include:
-        - os: ubuntu-24.04
-          arch: x86_64
-        - os: ubuntu-24.04-arm
-          arch: aarch64
+        arch: [x86_64, aarch64]
      fail-fast: false
-    runs-on: ${{ matrix.os }}
-    container:
-      image: registry.fedoraproject.org/fedora
-      options: --privileged
    steps:
-    - name: Prepare
-      run: |
-        dnf install -y git git-lfs dbus-daemon flatpak flatpak-builder libappstream-glib ccache zstd xorg-x11-server-Xvfb
-        flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-        flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
-        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-stable/${{ matrix.arch }}/24.08
-        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm18/${{ matrix.arch }}/24.08
-        flatpak --system install -y --noninteractive flathub org.flatpak.Builder
    - name: Checkout
      uses: actions/checkout@v4
      with:
        submodules: recursive
+    - name: Install Docker
+      run: |
+        dnf -y install docker
+    - name: Setup QEMU
+      id: qemu
+      uses: docker/setup-qemu-action@v3
+      with:
+        platforms: arm64
+    - name: Prepare Runtime
+      run: |
+        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-stable/${{ matrix.arch }}/24.08
+        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm18/${{ matrix.arch }}/24.08
    - name: Build
      uses: flatpak/flatpak-github-actions/flatpak-builder@master
      with:
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -10,29 +10,28 @@ name: "Flatpak"
 jobs:
  flatpak:
    name: "Flatpak"
+    runs-on: ubuntu-latest
+    timeout-minutes: 600
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-47
+      options: --privileged
    strategy:
      matrix:
-        os: [ubuntu-24.04, ubuntu-24.04-arm]
-        include:
-        - os: ubuntu-24.04
-          arch: x86_64
-        - os: ubuntu-24.04-arm
-          arch: aarch64
+        arch: [x86_64, aarch64]
      fail-fast: false
-    runs-on: ${{ matrix.os }}
-    container:
-      image: registry.fedoraproject.org/fedora
-      options: --privileged
    steps:
-    - name: Prepare
-      run: |
-        dnf install -y git git-lfs dbus-daemon flatpak flatpak-builder libappstream-glib ccache zstd xorg-x11-server-Xvfb
-        flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-        flatpak --system install -y --noninteractive flathub org.flatpak.Builder
    - name: Checkout
      uses: actions/checkout@v4
      with:
        submodules: recursive
+    - name: Install Docker
+      run: |
+        dnf -y install docker
+    - name: Setup QEMU
+      id: qemu
+      uses: docker/setup-qemu-action@v3
+      with:
+        platforms: arm64
    - name: Build
      uses: flatpak/flatpak-github-actions/flatpak-builder@master
      with:
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('clapper', 'c',
-  version: '0.9.0',
+  version: '0.8.0',
  meson_version: '>= 0.64.0',
  license: 'LGPL-2.1-or-later AND GPL-3.0-or-later', # LGPL-2.1+ for libs and gst-plugin, GPL-3.0+ for app
  default_options: [
@@ -89,12 +89,6 @@ libadwaita_dep = dependency('libadwaita-1',
 peas_dep = dependency('libpeas-2',
  required: false,
 )
-cgraph_dep = dependency('libcgraph',
-  required: false,
-)
-gvc_dep = dependency('libgvc',
-  required: false,
-)

 cc = meson.get_compiler('c')
 libm = cc.find_library('m', required: false)
@@ -166,8 +160,3 @@ if build_clapper
    summary(name, clapper_available_features.contains(name) ? 'Yes' : 'No', section: 'Features')
  endforeach
 endif
-if build_clapperapp
-  foreach name : clapperapp_possible_functionalities
-    summary(name, clapperapp_available_functionalities.contains(name)  ? 'Yes' : 'No', section: 'Functionalities')
-  endforeach
-endif
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -41,11 +41,6 @@ option('enhancers-loader',
  value: 'enabled',
  description: 'Ability to load libpeas based plugins that enhance capabilities'
 )
-option('pipeline-preview',
-  type: 'feature',
-  value: 'auto',
-  description: 'Ability to preview GStreamer pipeline in clapper-app'
-)

 # Features
 option('discoverer',
--- a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
+++ b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
@@ -14,13 +14,6 @@
            "add-ld-path": ".",
            "no-autodownload": false,
            "autodelete": false
-        },
-        "com.github.rafostar.Clapper.Enhancers": {
-            "versions": "master;test;stable",
-            "directory": "extensions/clapper/enhancers",
-            "add-ld-path": "lib",
-            "no-autodownload": false,
-            "autodelete": false
        }
    },
    "command": "clapper",
@@ -38,9 +31,7 @@
        "--filesystem=xdg-run/gvfsd",
        "--own-name=org.mpris.MediaPlayer2.Clapper.*",
        "--talk-name=org.gtk.vfs.*",
-        "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0",
-        "--env=CLAPPER_ENHANCERS_PATH=/app/extensions/clapper/enhancers/plugins",
-        "--env=PYTHONPATH=/app/extensions/clapper/enhancers/python/site-packages"
+        "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0"
    ],
    "build-options": {
        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin",
@@ -62,11 +53,11 @@
        "flathub/lib/libdvdnav.json",
        "flathub/lib/libass.json",
        "flathub/lib/libmicrodns.json",
-        "flathub/lib/libpeas.json",
        "testing/dav1d.json",
        "testing/gstreamer.json",
        "testing/gst-plugins-rs.json",
-        "testing/graphviz.json",
+        "testing/yt-dlp.json",
+        "testing/libpeas.json",
        {
            "name": "clapper",
            "buildsystem": "meson",
@@ -76,11 +67,11 @@
                    "path": "../../."
                }
            ]
-        }
+        },
+        "testing/clapper-enhancers.json"
    ],
    "cleanup-commands": [
        "mkdir -p /app/lib/ffmpeg",
-        "mkdir -p /app/extensions/clapper/enhancers",
        "ln -s /lib/$FLATPAK_ARCH-linux-*/gstreamer-1.0/libgstpipewire.so /app/lib/gstreamer-1.0/"
    ]
 }
--- a/pkgs/flatpak/com.github.rafostar.Clapper.json
+++ b/pkgs/flatpak/com.github.rafostar.Clapper.json
@@ -10,13 +10,6 @@
            "add-ld-path": ".",
            "no-autodownload": false,
            "autodelete": false
-        },
-        "com.github.rafostar.Clapper.Enhancers": {
-            "versions": "master;test;stable",
-            "directory": "extensions/clapper/enhancers",
-            "add-ld-path": "lib",
-            "no-autodownload": false,
-            "autodelete": false
        }
    },
    "command": "clapper",
@@ -34,9 +27,7 @@
        "--filesystem=xdg-run/gvfsd",
        "--own-name=org.mpris.MediaPlayer2.Clapper.*",
        "--talk-name=org.gtk.vfs.*",
-        "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0",
-        "--env=CLAPPER_ENHANCERS_PATH=/app/extensions/clapper/enhancers/plugins",
-        "--env=PYTHONPATH=/app/extensions/clapper/enhancers/python/site-packages"
+        "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0"
    ],
    "modules": [
        "flathub/shared-modules/gudev/gudev.json",
@@ -49,9 +40,9 @@
        "flathub/lib/libass.json",
        "flathub/lib/uchardet.json",
        "flathub/lib/libmicrodns.json",
-        "flathub/lib/libpeas.json",
-        "flathub/gstreamer-1.0/gstreamer.json",
-        "testing/graphviz.json",
+        "testing/gstreamer_stable.json",
+        "testing/yt-dlp.json",
+        "testing/libpeas.json",
        {
            "name": "clapper",
            "buildsystem": "meson",
@@ -61,11 +52,11 @@
                    "path": "../../."
                }
            ]
-        }
+        },
+        "testing/clapper-enhancers.json"
    ],
    "cleanup-commands": [
        "mkdir -p /app/lib/ffmpeg",
-        "mkdir -p /app/extensions/clapper/enhancers",
        "ln -s /lib/$FLATPAK_ARCH-linux-*/gstreamer-1.0/libgstpipewire.so /app/lib/gstreamer-1.0/"
    ]
 }
--- a/pkgs/flatpak/flathub
+++ b/pkgs/flatpak/flathub
--- a/pkgs/flatpak/testing/clapper-enhancers.json
+++ b/pkgs/flatpak/testing/clapper-enhancers.json
@@ -0,0 +1,14 @@
+{
+    "name": "clapper-enhancers",
+    "buildsystem": "meson",
+    "config-opts": [
+        "-Dauto_features=enabled"
+    ],
+    "sources": [
+        {
+            "type": "git",
+            "url": "https://github.com/Rafostar/clapper-enhancers.git",
+            "branch": "main"
+        }
+    ]
+}
--- a/pkgs/flatpak/testing/graphviz.json
+++ b/pkgs/flatpak/testing/graphviz.json
@@ -1,38 +0,0 @@
-{
-    "name": "graphviz",
-    "buildsystem": "autotools",
-    "config-opts": [
-        "--without-x",
-        "--without-gtk",
-        "--without-gtkgl",
-        "--without-gtkglext",
-        "--without-gdk",
-        "--without-gdk-pixbuf",
-        "--without-qt",
-        "--disable-static",
-        "--disable-sharp",
-        "--disable-go",
-        "--disable-guile",
-        "--disable-java",
-        "--disable-javascript",
-        "--disable-lua",
-        "--disable-perl",
-        "--disable-php",
-        "--disable-python",
-        "--disable-r",
-        "--disable-ruby",
-        "--disable-tcl"
-    ],
-    "cleanup": [
-        "/bin",
-        "/share/man",
-        "/share/graphviz"
-    ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/12.2.1/graphviz-12.2.1.tar.gz",
-            "sha256": "242bc18942eebda6db4039f108f387ec97856fc91ba47f21e89341c34b554df8"
-        }
-    ]
-}
--- a/pkgs/flatpak/testing/gstreamer_stable.json
+++ b/pkgs/flatpak/testing/gstreamer_stable.json
@@ -0,0 +1,99 @@
+{
+    "name": "gstreamer",
+    "buildsystem": "meson",
+    "config-opts": [
+        "--buildtype=release",
+        "--wrap-mode=nodownload",
+
+        "-Dbase=enabled",
+        "-Dgood=enabled",
+        "-Dbad=enabled",
+        "-Dugly=enabled",
+        "-Dlibav=enabled",
+        "-Dvaapi=enabled",
+        "-Dsharp=disabled",
+        "-Drs=disabled",
+        "-Dpython=disabled",
+        "-Ddevtools=disabled",
+        "-Dges=disabled",
+        "-Drtsp_server=disabled",
+        "-Dgst-examples=disabled",
+        "-Dqt5=disabled",
+        "-Dtests=disabled",
+        "-Dexamples=disabled",
+        "-Dintrospection=enabled",
+        "-Ddoc=disabled",
+        "-Dgtk_doc=disabled",
+        "-Dgpl=enabled",
+
+        "-Dgstreamer:benchmarks=disabled",
+        "-Dgstreamer:gobject-cast-checks=disabled",
+        "-Dgstreamer:glib-asserts=disabled",
+        "-Dgstreamer:glib-checks=disabled",
+        "-Dgstreamer:extra-checks=disabled",
+
+        "-Dgst-plugins-base:gobject-cast-checks=disabled",
+        "-Dgst-plugins-base:glib-asserts=disabled",
+        "-Dgst-plugins-base:glib-checks=disabled",
+        "-Dgst-plugins-base:gl_api=opengl,gles2",
+        "-Dgst-plugins-base:gl_platform=egl,glx",
+
+        "-Dgst-plugins-good:gobject-cast-checks=disabled",
+        "-Dgst-plugins-good:glib-asserts=disabled",
+        "-Dgst-plugins-good:glib-checks=disabled",
+        "-Dgst-plugins-good:gtk3=disabled",
+
+        "-Dgst-plugins-bad:gobject-cast-checks=disabled",
+        "-Dgst-plugins-bad:glib-asserts=disabled",
+        "-Dgst-plugins-bad:glib-checks=disabled",
+        "-Dgst-plugins-bad:extra-checks=disabled",
+        "-Dgst-plugins-bad:vulkan=disabled",
+        "-Dgst-plugins-bad:webrtc=disabled",
+        "-Dgst-plugins-bad:wasapi=disabled",
+        "-Dgst-plugins-bad:wasapi2=disabled",
+        "-Dgst-plugins-bad:winks=disabled",
+        "-Dgst-plugins-bad:winscreencap=disabled",
+        "-Dgst-plugins-bad:assrender=enabled",
+        "-Dgst-plugins-bad:nvcodec=enabled",
+        "-Dgst-plugins-bad:v4l2codecs=enabled",
+        "-Dgst-plugins-bad:va=enabled",
+
+        "-Dgst-plugins-ugly:gobject-cast-checks=disabled",
+        "-Dgst-plugins-ugly:glib-asserts=disabled",
+        "-Dgst-plugins-ugly:glib-checks=disabled",
+        "-Dgst-plugins-ugly:mpeg2dec=enabled"
+    ],
+    "sources": [
+        {
+            "type": "git",
+            "url": "https://gitlab.freedesktop.org/gstreamer/gstreamer.git",
+            "tag": "1.24.9",
+            "commit": "b309f90bfde36e6d175b70bfa0c941f2829dd6a5",
+            "disable-submodules": true
+        },
+        {
+            "type": "patch",
+            "path": "../flathub/gstreamer-1.0/gst-libav-stop-caching-codecs.patch"
+        },
+        {
+            "type": "patch",
+            "path": "../flathub/gstreamer-1.0/gst-plugins-base-autodetect-subtitle-text-encoding.patch"
+        },
+        {
+            "type": "patch",
+            "path": "../flathub/gstreamer-1.0/gst-plugins-good-matroska-fix-attachments-detection.patch"
+        },
+        {
+            "type": "patch",
+            "path": "../flathub/gstreamer-1.0/gst-plugins-good-dashdemux2-play-last-subfragment.patch"
+        },
+        {
+            "type": "patch",
+            "path": "../flathub/gstreamer-1.0/gst-plugins-bad-dashdemux-sidx-range-download.patch"
+        },
+        {
+            "type": "patch",
+            "path": "../flathub/gstreamer-1.0/gst-plugins-bad-dashdemux-improve-initial-representation-selection.patch"
+        }
+    ]
+}
--- a/pkgs/flatpak/testing/yt-dlp.json
+++ b/pkgs/flatpak/testing/yt-dlp.json
@@ -0,0 +1,19 @@
+{
+    "name": "yt-dlp",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install -v --root-user-action=ignore --no-deps --prefix=/app *.whl"
+    ],
+    "sources": [
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/bb/68/548f9819b41d53561d4f3d39588111cf39993c066b6e5300b4ae118eb2e6/yt_dlp-2024.10.22-py3-none-any.whl",
+            "sha256": "ba166602ebe22a220e4dc1ead45bf00eb469ed812b22f4fb8bb54734f9b02084",
+            "x-checker-data": {
+                "type": "pypi",
+                "name": "yt-dlp",
+                "packagetype": "bdist_wheel"
+            }
+        }
+    ]
+}
--- a/src/bin/clapper-app/clapper-app-about-window.c
+++ b/src/bin/clapper-app/clapper-app-about-window.c
@@ -22,24 +22,29 @@
 #include <clapper/clapper.h>
 #include <adwaita.h>

-#include "clapper-app-about-dialog.h"
+#include "clapper-app-about-window.h"

 GtkWidget *
-clapper_app_about_dialog_new (void)
+clapper_app_about_window_new (GtkApplication *gtk_app)
 {
-  AdwAboutDialog *about;
+  AdwAboutWindow *about;
+  GtkWindow *window;
  GString *string;
  gchar *gst_ver, *debug_info;

-  about = ADW_ABOUT_DIALOG (adw_about_dialog_new_from_appdata (
+  about = ADW_ABOUT_WINDOW (adw_about_window_new_from_appdata (
      CLAPPER_APP_RESOURCE_PREFIX "/data/metainfo/" CLAPPER_APP_ID ".metainfo.xml",
      NULL));
+  window = gtk_application_get_active_window (gtk_app);
+
+  gtk_window_set_modal (GTK_WINDOW (about), TRUE);
+  gtk_window_set_transient_for (GTK_WINDOW (about), window);

  /* Also show development versions */
-  adw_about_dialog_set_version (about, CLAPPER_VERSION_S);
+  adw_about_window_set_version (about, CLAPPER_VERSION_S);

  /* TRANSLATORS: Put your name(s) here for credits or leave untranslated */
-  adw_about_dialog_set_translator_credits (about, _("translator-credits"));
+  adw_about_window_set_translator_credits (about, _("translator-credits"));

  string = g_string_new (NULL);

@@ -61,7 +66,7 @@ clapper_app_about_dialog_new (void)
  g_free (gst_ver);

  debug_info = g_string_free_and_steal (string);
-  adw_about_dialog_set_debug_info (about, debug_info);
+  adw_about_window_set_debug_info (about, debug_info);
  g_free (debug_info);

  return GTK_WIDGET (about);
--- a/src/bin/clapper-app/clapper-app-about-window.h
+++ b/src/bin/clapper-app/clapper-app-about-window.h
@@ -24,6 +24,6 @@
 G_BEGIN_DECLS

 G_GNUC_INTERNAL
-GtkWidget * clapper_app_about_dialog_new (void);
+GtkWidget * clapper_app_about_window_new (GtkApplication *gtk_app);

 G_END_DECLS
--- a/src/bin/clapper-app/clapper-app-application.c
+++ b/src/bin/clapper-app/clapper-app-application.c
@@ -28,7 +28,7 @@
 #include "clapper-app-uri-dialog.h"
 #include "clapper-app-info-window.h"
 #include "clapper-app-preferences-window.h"
-#include "clapper-app-about-dialog.h"
+#include "clapper-app-about-window.h"
 #include "clapper-app-utils.h"

 #define PERCENTAGE_ROUND(a) (round ((gdouble) a / 0.01) * 0.01)
@@ -41,7 +41,6 @@ struct _ClapperAppApplication
  GtkApplication parent;

  GSettings *settings;
-  GCancellable *cancellable;

  gboolean need_init_state;
 };
@@ -62,12 +61,6 @@ struct ClapperPluginData
  struct ClapperPluginFeatureData features[10];
 };

-typedef struct
-{
-  ClapperAppApplication *app;
-  guint id;
-} ClapperAppWindowData;
-
 typedef struct
 {
  const gchar *action;
@@ -324,19 +317,6 @@ _assemble_initial_state (GtkWindow *window)
  g_object_unref (builder);
 }

-static void
-_show_error_dialog (GError *error, GtkWindow *parent)
-{
-  AdwDialog *dialog;
-
-  dialog = adw_alert_dialog_new ("Error", error->message);
-  adw_alert_dialog_add_response (ADW_ALERT_DIALOG (dialog), "close", _("Close"));
-  adw_alert_dialog_set_default_response (ADW_ALERT_DIALOG (dialog), "close");
-  adw_alert_dialog_set_close_response (ADW_ALERT_DIALOG (dialog), "close");
-
-  adw_dialog_present (dialog, GTK_WIDGET (parent));
-}
-
 static void
 add_files (GSimpleAction *action, GVariant *param, gpointer user_data)
 {
@@ -415,112 +395,14 @@ show_info (GSimpleAction *action, GVariant *param, gpointer user_data)
  gtk_window_present (GTK_WINDOW (info_window));
 }

-static void
-_launch_pipeline_cb (GtkFileLauncher *launcher,
-    GAsyncResult *res, ClapperAppWindowData *win_data)
-{
-  GError *error = NULL;
-
-  if (!gtk_file_launcher_launch_finish (launcher, res, &error)) {
-    if (error->domain != GTK_DIALOG_ERROR || error->code != GTK_DIALOG_ERROR_DISMISSED) {
-      GtkWindow *window;
-
-      GST_ERROR ("Could not launch pipeline preview, reason: %s",
-          GST_STR_NULL (error->message));
-
-      if ((window = gtk_application_get_window_by_id (
-          GTK_APPLICATION (win_data->app), win_data->id)))
-        _show_error_dialog (error, window);
-    }
-    g_error_free (error);
-  }
-  g_free (win_data);
-}
-
-static void
-_show_pipeline_cb (GObject *source G_GNUC_UNUSED,
-    GAsyncResult *res, ClapperAppWindowData *win_data)
-{
-  GTask *task = G_TASK (res);
-  GtkWindow *window;
-  GFile *svg_file;
-  GError *error = NULL;
-
-  svg_file = (GFile *) g_task_propagate_pointer (task, &error);
-  window = gtk_application_get_window_by_id (
-      GTK_APPLICATION (win_data->app), win_data->id);
-
-  if (error) {
-    if (error->domain != G_IO_ERROR || error->code != G_IO_ERROR_CANCELLED) {
-      GST_ERROR ("Could not create pipeline graph file, reason: %s",
-          GST_STR_NULL (error->message));
-      if (window)
-        _show_error_dialog (error, window);
-    }
-    g_error_free (error);
-    g_free (win_data);
-
-    return;
-  }
-
-  if (window) {
-    GtkFileLauncher *launcher = gtk_file_launcher_new (svg_file);
-
-#if GTK_CHECK_VERSION(4,12,0)
-    gtk_file_launcher_set_always_ask (launcher, TRUE);
-#endif
-
-    gtk_file_launcher_launch (launcher, window, NULL,
-        (GAsyncReadyCallback) _launch_pipeline_cb, win_data);
-    g_object_unref (launcher);
-  } else {
-    g_free (win_data);
-  }
-
-  g_object_unref (svg_file);
-}
-
-static void
-show_pipeline (GSimpleAction *action, GVariant *param, gpointer user_data)
-{
-  ClapperAppApplication *self = CLAPPER_APP_APPLICATION_CAST (user_data);
-  GtkApplication *gtk_app = GTK_APPLICATION (self);
-  GtkWindow *window;
-  ClapperAppWindowData *win_data;
-
-  window = gtk_application_get_active_window (gtk_app);
-
-  while (window && !CLAPPER_APP_IS_WINDOW (window))
-    window = gtk_window_get_transient_for (window);
-
-  if (G_UNLIKELY (window == NULL))
-    return;
-
-  if (self->cancellable) {
-    g_cancellable_cancel (self->cancellable);
-    g_object_unref (self->cancellable);
-  }
-  self->cancellable = g_cancellable_new ();
-
-  win_data = g_new (ClapperAppWindowData, 1);
-  win_data->app = self;
-  win_data->id = gtk_application_window_get_id (GTK_APPLICATION_WINDOW (window));
-
-  clapper_app_utils_create_pipeline_svg_file_async (
-      clapper_app_window_get_player (CLAPPER_APP_WINDOW (window)),
-      self->cancellable, (GAsyncReadyCallback) _show_pipeline_cb, win_data);
-}
-
 static void
 show_about (GSimpleAction *action, GVariant *param, gpointer user_data)
 {
  GtkApplication *gtk_app = GTK_APPLICATION (user_data);
-  GtkWindow *window;
-  GtkWidget *about_dialog;
+  GtkWidget *about_window;

-  window = gtk_application_get_active_window (gtk_app);
-  about_dialog = clapper_app_about_dialog_new ();
-  adw_dialog_present (ADW_DIALOG (about_dialog), GTK_WIDGET (window));
+  about_window = clapper_app_about_window_new (gtk_app);
+  gtk_window_present (GTK_WINDOW (about_window));
 }

 GApplication *
@@ -830,7 +712,6 @@ clapper_app_application_constructed (GObject *object)
    { "clear-queue", clear_queue, NULL, NULL, NULL },
    { "new-window", new_window, NULL, NULL, NULL },
    { "info", show_info, NULL, NULL, NULL },
-    { "pipeline", show_pipeline, NULL, NULL, NULL },
    { "preferences", show_preferences, NULL, NULL, NULL },
    { "about", show_about, NULL, NULL, NULL },
  };
@@ -839,7 +720,6 @@ clapper_app_application_constructed (GObject *object)
    { "app.add-uri", { "<Control>u", NULL, NULL }},
    { "app.new-window", { "<Control>n", NULL, NULL }},
    { "app.info", { "<Control>i", NULL, NULL }},
-    { "app.pipeline", { "<Control><Shift>p", NULL, NULL }},
    { "app.preferences", { "<Control>comma", NULL, NULL }},
    { "app.about", { "F1", NULL, NULL }},
    { "win.toggle-fullscreen", { "F11", "f", NULL }},
@@ -874,19 +754,6 @@ clapper_app_application_constructed (GObject *object)
  G_OBJECT_CLASS (parent_class)->constructed (object);
 }

-static void
-clapper_app_application_dispose (GObject *object)
-{
-  ClapperAppApplication *self = CLAPPER_APP_APPLICATION_CAST (object);
-
-  if (self->cancellable) {
-    g_cancellable_cancel (self->cancellable);
-    g_clear_object (&self->cancellable);
-  }
-
-  G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
 static void
 clapper_app_application_finalize (GObject *object)
 {
@@ -910,7 +777,6 @@ clapper_app_application_class_init (ClapperAppApplicationClass *klass)
      "Clapper App Application");

  gobject_class->constructed = clapper_app_application_constructed;
-  gobject_class->dispose = clapper_app_application_dispose;
  gobject_class->finalize = clapper_app_application_finalize;

  gtk_application_class->window_removed = clapper_app_application_window_removed;
--- a/src/bin/clapper-app/clapper-app-application.h
+++ b/src/bin/clapper-app/clapper-app-application.h
@@ -19,7 +19,6 @@

 #include <glib.h>
 #include <glib-object.h>
-#include <gio/gio.h>
 #include <gtk/gtk.h>

 G_BEGIN_DECLS
--- a/src/bin/clapper-app/clapper-app-file-dialog.c
+++ b/src/bin/clapper-app/clapper-app-file-dialog.c
@@ -72,43 +72,6 @@ _open_subtitles_cb (GtkFileDialog *dialog, GAsyncResult *result, ClapperMediaIte
  gst_object_unref (item); // Borrowed reference
 }

-static void
-_on_select_file_dir_finish (GFile *file, AdwActionRow *action_row, GError *error)
-{
-  if (G_LIKELY (error == NULL)) {
-    gchar *path = g_file_get_path (file);
-
-    adw_action_row_set_subtitle (action_row, path);
-    g_free (path);
-  } else {
-    if (error->domain != GTK_DIALOG_ERROR || error->code != GTK_DIALOG_ERROR_DISMISSED) {
-      g_printerr ("Error: %s\n",
-          (error->message) ? error->message : "Could not open file dialog");
-    }
-    g_error_free (error);
-  }
-  g_clear_object (&file);
-  g_object_unref (action_row); // Borrowed reference
-}
-
-static void
-_select_file_cb (GtkFileDialog *dialog, GAsyncResult *result, AdwActionRow *action_row)
-{
-  GError *error = NULL;
-  GFile *file = gtk_file_dialog_open_finish (dialog, result, &error);
-
-  _on_select_file_dir_finish (file, action_row, error);
-}
-
-static void
-_select_dir_cb (GtkFileDialog *dialog, GAsyncResult *result, AdwActionRow *action_row)
-{
-  GError *error = NULL;
-  GFile *file = gtk_file_dialog_select_folder_finish (dialog, result, &error);
-
-  _on_select_file_dir_finish (file, action_row, error);
-}
-
 static void
 _dialog_add_mime_types (GtkFileDialog *dialog, const gchar *filter_name,
    const gchar *const *mime_types)
@@ -181,35 +144,3 @@ clapper_app_file_dialog_open_subtitles (GtkApplication *gtk_app, ClapperMediaIte

  g_object_unref (dialog);
 }
-
-void
-clapper_app_file_dialog_select_prefs_file (GtkApplication *gtk_app, AdwActionRow *action_row)
-{
-  GtkWindow *window = gtk_application_get_active_window (gtk_app);
-  GtkFileDialog *dialog = gtk_file_dialog_new ();
-
-  gtk_file_dialog_set_modal (dialog, TRUE);
-  gtk_file_dialog_set_title (dialog, "Select File");
-
-  gtk_file_dialog_open (dialog, window, NULL,
-      (GAsyncReadyCallback) _select_file_cb,
-      g_object_ref (action_row));
-
-  g_object_unref (dialog);
-}
-
-void
-clapper_app_file_dialog_select_prefs_dir (GtkApplication *gtk_app, AdwActionRow *action_row)
-{
-  GtkWindow *window = gtk_application_get_active_window (gtk_app);
-  GtkFileDialog *dialog = gtk_file_dialog_new ();
-
-  gtk_file_dialog_set_modal (dialog, TRUE);
-  gtk_file_dialog_set_title (dialog, "Select Folder");
-
-  gtk_file_dialog_select_folder (dialog, window, NULL,
-      (GAsyncReadyCallback) _select_dir_cb,
-      g_object_ref (action_row));
-
-  g_object_unref (dialog);
-}
--- a/src/bin/clapper-app/clapper-app-file-dialog.h
+++ b/src/bin/clapper-app/clapper-app-file-dialog.h
@@ -19,7 +19,6 @@

 #include <glib.h>
 #include <gtk/gtk.h>
-#include <adwaita.h>
 #include <clapper/clapper.h>

 G_BEGIN_DECLS
@@ -30,10 +29,4 @@ void clapper_app_file_dialog_open_files (GtkApplication *gtk_app);
 G_GNUC_INTERNAL
 void clapper_app_file_dialog_open_subtitles (GtkApplication *gtk_app, ClapperMediaItem *item);

-G_GNUC_INTERNAL
-void clapper_app_file_dialog_select_prefs_file (GtkApplication *gtk_app, AdwActionRow *action_row);
-
-G_GNUC_INTERNAL
-void clapper_app_file_dialog_select_prefs_dir (GtkApplication *gtk_app, AdwActionRow *action_row);
-
 G_END_DECLS
--- a/src/bin/clapper-app/clapper-app-info-window.c
+++ b/src/bin/clapper-app/clapper-app-info-window.c
@@ -36,8 +36,6 @@ struct _ClapperAppInfoWindow
  GtkWidget *astreams_list;
  GtkWidget *sstreams_list;

-  GtkWidget *pipeline_button;
-
  ClapperPlayer *player;
 };

@@ -176,10 +174,6 @@ clapper_app_info_window_init (ClapperAppInfoWindow *self)
  gtk_widget_remove_css_class (self->vstreams_list, "view");
  gtk_widget_remove_css_class (self->astreams_list, "view");
  gtk_widget_remove_css_class (self->sstreams_list, "view");
-
-#ifdef HAVE_GRAPHVIZ
-  gtk_widget_set_visible (self->pipeline_button, TRUE);
-#endif
 }

 static void
@@ -262,7 +256,6 @@ clapper_app_info_window_class_init (ClapperAppInfoWindowClass *klass)
  gtk_widget_class_bind_template_child (widget_class, ClapperAppInfoWindow, vstreams_list);
  gtk_widget_class_bind_template_child (widget_class, ClapperAppInfoWindow, astreams_list);
  gtk_widget_class_bind_template_child (widget_class, ClapperAppInfoWindow, sstreams_list);
-  gtk_widget_class_bind_template_child (widget_class, ClapperAppInfoWindow, pipeline_button);

  gtk_widget_class_bind_template_callback (widget_class, media_duration_closure);
  gtk_widget_class_bind_template_callback (widget_class, playback_element_name_closure);
--- a/src/bin/clapper-app/clapper-app-preferences-window.c
+++ b/src/bin/clapper-app/clapper-app-preferences-window.c
@@ -23,7 +23,6 @@

 #include "clapper-app-preferences-window.h"
 #include "clapper-app-application.h"
-#include "clapper-app-file-dialog.h"
 #include "clapper-app-utils.h"

 #define GST_CAT_DEFAULT clapper_app_preferences_window_debug
@@ -42,14 +41,6 @@ struct _ClapperAppPreferencesWindow
  AdwSpinRow *subtitle_offset_spin_row;
  GtkFontDialogButton *font_dialog_button;

-  GtkStack *enhancers_stack;
-  GtkWidget *browse_enhancers_page;
-  GtkWidget *no_enhancers_page;
-
-  AdwNavigationPage *enhancers_subpage;
-  AdwComboRow *enhancers_combo_row;
-  AdwPreferencesGroup *enhancer_config_group;
-
  AdwNavigationPage *plugins_subpage;
  AdwComboRow *plugins_combo_row;
  AdwComboRow *features_combo_row;
@@ -57,8 +48,6 @@ struct _ClapperAppPreferencesWindow

  GSettings *settings;

-  GList *enhancer_pspec_rows;
-
  GList *features;
  GtkStringList *plugins_list;

@@ -78,19 +67,6 @@ typedef struct
  gboolean updated;
 } ClapperAppPreferencesIterRanksData;

-typedef struct
-{
-  GSettings *settings;
-  const gchar *key;
-} ClapperAppPreferencesResetData;
-
-typedef struct
-{
-  GSettings *settings;
-  GParamSpec *pspec;
-  guint flag;
-} ClapperAppPreferencesFlagMapData;
-
 enum
 {
  PROP_0,
@@ -100,347 +76,6 @@ enum

 static GParamSpec *param_specs[PROP_LAST] = { NULL, };

-static void
-_flag_map_data_free (ClapperAppPreferencesFlagMapData *data)
-{
-  GST_TRACE ("Destroying flag map data: %p", data);
-  g_object_unref (data->settings);
-  g_free (data);
-}
-
-static void
-_reset_button_closure (ClapperAppPreferencesResetData *data, GClosure *closure)
-{
-  GST_TRACE ("Destroying reset button data: %p", data);
-  g_object_unref (data->settings);
-  g_free (data);
-}
-
-static void
-_reset_button_clicked_cb (GtkButton *button, ClapperAppPreferencesResetData *data)
-{
-  g_settings_reset (data->settings, data->key);
-}
-
-static void
-file_selection_row_activated_cb (AdwActionRow *action_row, GParamSpec *pspec)
-{
-  GtkApplication *gtk_app;
-  GtkWidget *window;
-
-  if (!(window = gtk_widget_get_ancestor (GTK_WIDGET (action_row), GTK_TYPE_WINDOW))) {
-    GST_ERROR ("Could not get a hold of parent window");
-    return;
-  }
-
-  gtk_app = gtk_window_get_application (GTK_WINDOW (window));
-
-  if (pspec->flags & CLAPPER_ENHANCER_PARAM_FILEPATH)
-    clapper_app_file_dialog_select_prefs_file (gtk_app, action_row);
-  else
-    clapper_app_file_dialog_select_prefs_dir (gtk_app, action_row);
-}
-
-static gboolean
-_get_enum_mapping (GValue *value, GVariant *variant, GParamSpec *pspec)
-{
-  GEnumClass *enum_class = G_ENUM_CLASS (g_type_class_peek (pspec->value_type));
-  const gchar *selected_str = g_variant_get_string (variant, NULL);
-  guint i, selected = 0;
-
-  for (i = 0; i < enum_class->n_values; ++i) {
-    if (g_strcmp0 (selected_str, enum_class->values[i].value_nick) == 0) {
-      selected = i;
-      break;
-    }
-  }
-
-  g_value_set_uint (value, selected);
-  return TRUE;
-}
-
-static GVariant *
-_set_enum_mapping (GValue *value, GVariantType *exp_type, GParamSpec *pspec)
-{
-  GEnumClass *enum_class = G_ENUM_CLASS (g_type_class_peek (pspec->value_type));
-  guint selected = g_value_get_uint (value);
-
-  if (G_UNLIKELY (selected == GTK_INVALID_LIST_POSITION))
-    selected = 0;
-
-  return g_variant_new_string (enum_class->values[selected].value_nick);
-}
-
-static gboolean
-_get_flag_mapping (GValue *value, GVariant *variant, ClapperAppPreferencesFlagMapData *data)
-{
-  guint flags = g_settings_get_flags (data->settings, data->pspec->name);
-
-  g_value_set_boolean (value, (flags & data->flag));
-  return TRUE;
-}
-
-static GVariant *
-_set_flag_mapping (GValue *value, GVariantType *exp_type, ClapperAppPreferencesFlagMapData *data)
-{
-  GFlagsClass *flags_class = G_FLAGS_CLASS (g_type_class_peek (data->pspec->value_type));
-  GStrvBuilder *builder;
-  GVariant *variant;
-  gchar **strv;
-  gboolean active = g_value_get_boolean (value);
-  guint i, flags = g_settings_get_flags (data->settings, data->pspec->name);
-
-  if (active)
-    flags |= data->flag;
-  else
-    flags &= ~(data->flag);
-
-  builder = g_strv_builder_new ();
-
-  for (i = 0; i < flags_class->n_values; ++i) {
-    if (flags & flags_class->values[i].value)
-      g_strv_builder_add (builder, flags_class->values[i].value_nick);
-  }
-
-  strv = g_strv_builder_end (builder);
-  g_strv_builder_unref (builder);
-
-  variant = g_variant_new_strv ((const gchar *const *) strv, -1);
-  g_strfreev (strv);
-
-  return variant;
-}
-
-static gboolean
-_add_enhancer_config_row (ClapperAppPreferencesWindow *self, GParamSpec *pspec,
-    GSettings *enhancer_settings)
-{
-  GtkWidget *row = NULL, *reset_button;
-  ClapperAppPreferencesResetData *reset_data;
-  const gchar *bind_prop = NULL;
-  gboolean is_enum = FALSE, is_flags = FALSE;
-
-  switch (pspec->value_type) {
-    case G_TYPE_BOOLEAN:{
-      row = adw_switch_row_new ();
-      break;
-    }
-    case G_TYPE_INT:{
-      GParamSpecInt *p = (GParamSpecInt *) pspec;
-      row = adw_spin_row_new_with_range (p->minimum, p->maximum, 1);
-      break;
-    }
-    case G_TYPE_UINT:{
-      GParamSpecUInt *p = (GParamSpecUInt *) pspec;
-      row = adw_spin_row_new_with_range (p->minimum, p->maximum, 1);
-      break;
-    }
-    case G_TYPE_DOUBLE:{
-      GParamSpecDouble *p = (GParamSpecDouble *) pspec;
-      row = adw_spin_row_new_with_range (p->minimum, p->maximum, 0.25);
-      break;
-    }
-    case G_TYPE_STRING:{
-      if (pspec->flags & (CLAPPER_ENHANCER_PARAM_FILEPATH | CLAPPER_ENHANCER_PARAM_DIRPATH)) {
-        GtkWidget *image;
-
-        image = gtk_image_new_from_icon_name ("document-open-symbolic");
-        gtk_widget_set_margin_end (image, 10); // matches other rows
-
-        row = adw_action_row_new ();
-        adw_action_row_add_suffix (ADW_ACTION_ROW (row), image);
-        adw_action_row_set_activatable_widget (ADW_ACTION_ROW (row), image);
-
-        g_signal_connect (row, "activated",
-            G_CALLBACK (file_selection_row_activated_cb), pspec);
-      } else {
-        row = adw_entry_row_new ();
-      }
-      break;
-    }
-    default:{
-      if ((is_enum = G_IS_PARAM_SPEC_ENUM (pspec))) {
-        GtkExpression *expression;
-        AdwEnumListModel *enum_model;
-
-        row = adw_combo_row_new ();
-        expression = gtk_property_expression_new (ADW_TYPE_ENUM_LIST_ITEM, NULL, "nick");
-        adw_combo_row_set_expression (ADW_COMBO_ROW (row), expression);
-
-        enum_model = adw_enum_list_model_new (pspec->value_type);
-        adw_combo_row_set_model (ADW_COMBO_ROW (row), G_LIST_MODEL (enum_model));
-
-        gtk_expression_unref (expression);
-        g_object_unref (enum_model);
-        break;
-      } else if ((is_flags = G_IS_PARAM_SPEC_FLAGS (pspec))) {
-        GFlagsClass *flags_class = G_FLAGS_CLASS (g_type_class_peek (pspec->value_type));
-        guint i;
-
-        row = adw_expander_row_new ();
-
-        for (i = 0; i < flags_class->n_values; ++i) {
-          GtkWidget *flag_row = adw_switch_row_new ();
-          ClapperAppPreferencesFlagMapData *fm_data;
-
-          adw_preferences_row_set_title (ADW_PREFERENCES_ROW (flag_row),
-              flags_class->values[i].value_nick);
-
-          fm_data = g_new (ClapperAppPreferencesFlagMapData, 1);
-          fm_data->settings = g_object_ref (enhancer_settings);
-          fm_data->pspec = pspec;
-          fm_data->flag = flags_class->values[i].value;
-
-          GST_TRACE ("Created flag map data: %p", fm_data);
-
-          g_settings_bind_with_mapping (enhancer_settings, pspec->name, flag_row,
-              "active", G_SETTINGS_BIND_DEFAULT,
-              (GSettingsBindGetMapping) _get_flag_mapping,
-              (GSettingsBindSetMapping) _set_flag_mapping,
-              fm_data, (GDestroyNotify) _flag_map_data_free);
-
-          adw_expander_row_add_row (ADW_EXPANDER_ROW (row), flag_row);
-        }
-        break;
-      }
-      g_warning ("Unsupported enhancer \"%s\" property type: %s",
-          pspec->name, g_type_name (pspec->value_type));
-      return FALSE;
-    }
-  }
-
-  reset_button = gtk_button_new_from_icon_name ("view-refresh-symbolic");
-  gtk_widget_set_tooltip_text (reset_button, _("Restore default"));
-
-  gtk_widget_set_halign (reset_button, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (reset_button, GTK_ALIGN_CENTER);
-  gtk_widget_add_css_class (reset_button, "circular");
-
-  gtk_widget_set_tooltip_text (row, g_param_spec_get_blurb (pspec));
-
-  adw_preferences_row_set_title (ADW_PREFERENCES_ROW (row), g_param_spec_get_nick (pspec));
-
-  if (ADW_IS_SWITCH_ROW (row)) {
-    bind_prop = "active";
-  } else if (ADW_IS_SPIN_ROW (row)) {
-    bind_prop = "value";
-    adw_spin_row_set_numeric (ADW_SPIN_ROW (row), TRUE);
-  } else if (ADW_IS_ENTRY_ROW (row)) {
-    bind_prop = "text";
-  } else if (ADW_IS_COMBO_ROW (row)) {
-    bind_prop = "selected";
-  } else if (ADW_IS_ACTION_ROW (row)) {
-    bind_prop = "subtitle";
-  } else if (!is_flags) { // In case of flags we bind individual widgets
-    g_assert_not_reached ();
-    return FALSE;
-  }
-
-  if (ADW_IS_ENTRY_ROW (row))
-    adw_entry_row_add_prefix (ADW_ENTRY_ROW (row), reset_button);
-  else if (ADW_IS_ACTION_ROW (row))
-    adw_action_row_add_prefix (ADW_ACTION_ROW (row), reset_button);
-  else if (ADW_IS_EXPANDER_ROW (row))
-    adw_expander_row_add_prefix (ADW_EXPANDER_ROW (row), reset_button);
-
-  if (is_enum) {
-    g_settings_bind_with_mapping (enhancer_settings, pspec->name, row,
-        bind_prop, G_SETTINGS_BIND_DEFAULT,
-        (GSettingsBindGetMapping) _get_enum_mapping,
-        (GSettingsBindSetMapping) _set_enum_mapping,
-        pspec, NULL);
-  } else if (!is_flags) {
-    g_settings_bind (enhancer_settings, pspec->name, row,
-        bind_prop, G_SETTINGS_BIND_DEFAULT);
-  }
-
-  reset_data = g_new (ClapperAppPreferencesResetData, 1);
-  reset_data->settings = g_object_ref (enhancer_settings);
-  reset_data->key = pspec->name;
-
-  GST_TRACE ("Created reset button data: %p", reset_data);
-
-  g_signal_connect_data (reset_button, "clicked",
-      G_CALLBACK (_reset_button_clicked_cb), reset_data,
-      (GClosureNotify) _reset_button_closure, G_CONNECT_DEFAULT);
-
-  adw_preferences_group_add (self->enhancer_config_group, row);
-  self->enhancer_pspec_rows = g_list_append (self->enhancer_pspec_rows, row);
-
-  return TRUE;
-}
-
-static void
-selected_enhancer_changed_cb (AdwComboRow *combo_row,
-    GParamSpec *pspec G_GNUC_UNUSED, ClapperAppPreferencesWindow *self)
-{
-  guint selected = adw_combo_row_get_selected (combo_row);
-
-  /* Remove old rows */
-  if (self->enhancer_pspec_rows) {
-    GList *el;
-
-    for (el = self->enhancer_pspec_rows; el; el = g_list_next (el))
-      adw_preferences_group_remove (self->enhancer_config_group, GTK_WIDGET (el->data));
-
-    g_clear_list (&self->enhancer_pspec_rows, NULL);
-  }
-
-  /* Add new rows */
-  if (selected != GTK_INVALID_LIST_POSITION) {
-    ClapperEnhancerProxyList *proxies = clapper_get_global_enhancer_proxies ();
-    ClapperEnhancerProxy *proxy = clapper_enhancer_proxy_list_peek_proxy (proxies, selected);
-    GParamSpec **pspecs;
-    guint n_pspecs;
-    gboolean has_props = FALSE;
-
-    if ((pspecs = clapper_enhancer_proxy_get_target_properties (proxy, &n_pspecs))) {
-      GSettings *enhancer_settings = NULL;
-      guint i;
-
-      for (i = 0; i < n_pspecs; ++i) {
-        if (pspecs[i]->flags & CLAPPER_ENHANCER_PARAM_GLOBAL) {
-          if (!enhancer_settings)
-            enhancer_settings = clapper_enhancer_proxy_get_settings (proxy);
-          if (enhancer_settings)
-            has_props |= _add_enhancer_config_row (self, pspecs[i], enhancer_settings);
-        }
-      }
-
-      g_clear_object (&enhancer_settings);
-    }
-
-    if (!has_props) {
-      GtkWidget *row = adw_action_row_new ();
-
-      adw_preferences_row_set_title (ADW_PREFERENCES_ROW (row), _("No configurable properties"));
-      adw_preferences_group_add (self->enhancer_config_group, row);
-      self->enhancer_pspec_rows = g_list_append (self->enhancer_pspec_rows, row);
-    }
-  }
-}
-
-static void
-enhancers_config_activated_cb (AdwActionRow *action_row, ClapperAppPreferencesWindow *self)
-{
-  /* If no model set yet */
-  if (!adw_combo_row_get_model (self->enhancers_combo_row)) {
-    ClapperEnhancerProxyList *proxies = clapper_get_global_enhancer_proxies ();
-
-    adw_combo_row_set_model (self->enhancers_combo_row, G_LIST_MODEL (proxies));
-    adw_combo_row_set_selected (self->enhancers_combo_row, GTK_INVALID_LIST_POSITION);
-
-    GST_DEBUG ("Populated names combo row in enhancers subpage");
-
-    if (clapper_enhancer_proxy_list_get_n_proxies (proxies) > 0)
-      gtk_stack_set_visible_child (self->enhancers_stack, self->browse_enhancers_page);
-    else
-      gtk_stack_set_visible_child (self->enhancers_stack, self->no_enhancers_page);
-  }
-
-  adw_preferences_window_push_subpage (ADW_PREFERENCES_WINDOW (self), self->enhancers_subpage);
-}
-
 /* Sort by plugin name and if the same, sort by element name */
 static gint
 _compare_plugins_cb (gconstpointer ptr_a, gconstpointer ptr_b)
@@ -666,12 +301,6 @@ _make_plugin_features_string_list (ClapperAppPreferencesWindow *self, const gcha
  return features_list;
 }

-static gboolean
-list_has_selection_closure (ClapperAppPreferencesWindow *self, guint selected)
-{
-  return (selected != GTK_INVALID_LIST_POSITION);
-}
-
 static GtkStringList *
 ranking_features_model_closure (ClapperAppPreferencesWindow *self, GtkStringObject *string_obj)
 {
@@ -914,7 +543,6 @@ clapper_app_preferences_window_finalize (GObject *object)

  g_object_unref (self->settings);

-  g_clear_list (&self->enhancer_pspec_rows, NULL);
  g_clear_object (&self->plugins_list);

  if (self->features)
@@ -970,14 +598,6 @@ clapper_app_preferences_window_class_init (ClapperAppPreferencesWindowClass *kla
  gtk_widget_class_bind_template_child (widget_class, ClapperAppPreferencesWindow, subtitle_offset_spin_row);
  gtk_widget_class_bind_template_child (widget_class, ClapperAppPreferencesWindow, font_dialog_button);

-  gtk_widget_class_bind_template_child (widget_class, ClapperAppPreferencesWindow, enhancers_stack);
-  gtk_widget_class_bind_template_child (widget_class, ClapperAppPreferencesWindow, browse_enhancers_page);
-  gtk_widget_class_bind_template_child (widget_class, ClapperAppPreferencesWindow, no_enhancers_page);
-
-  gtk_widget_class_bind_template_child (widget_class, ClapperAppPreferencesWindow, enhancers_subpage);
-  gtk_widget_class_bind_template_child (widget_class, ClapperAppPreferencesWindow, enhancers_combo_row);
-  gtk_widget_class_bind_template_child (widget_class, ClapperAppPreferencesWindow, enhancer_config_group);
-
  gtk_widget_class_bind_template_child (widget_class, ClapperAppPreferencesWindow, plugins_subpage);
  gtk_widget_class_bind_template_child (widget_class, ClapperAppPreferencesWindow, plugins_combo_row);
  gtk_widget_class_bind_template_child (widget_class, ClapperAppPreferencesWindow, features_combo_row);
@@ -985,13 +605,9 @@ clapper_app_preferences_window_class_init (ClapperAppPreferencesWindowClass *kla

  gtk_widget_class_bind_template_callback (widget_class, seek_method_name_closure);

-  gtk_widget_class_bind_template_callback (widget_class, enhancers_config_activated_cb);
-  gtk_widget_class_bind_template_callback (widget_class, selected_enhancer_changed_cb);
-
  gtk_widget_class_bind_template_callback (widget_class, plugin_ranking_activated_cb);
  gtk_widget_class_bind_template_callback (widget_class, plugin_ranking_unrealize_cb);

-  gtk_widget_class_bind_template_callback (widget_class, list_has_selection_closure);
  gtk_widget_class_bind_template_callback (widget_class, ranking_features_model_closure);
  gtk_widget_class_bind_template_callback (widget_class, add_override_button_sensitive_closure);
  gtk_widget_class_bind_template_callback (widget_class, add_override_button_clicked_cb);
--- a/src/bin/clapper-app/clapper-app-uri-dialog.c
+++ b/src/bin/clapper-app/clapper-app-uri-dialog.c
@@ -25,28 +25,30 @@
 #include "clapper-app-utils.h"

 static void
-_entry_text_changed_cb (AdwEntryRow *entry,
-    GParamSpec *pspec G_GNUC_UNUSED, AdwAlertDialog *dialog)
+_entry_text_changed_cb (GtkEntry *entry,
+    GParamSpec *pspec G_GNUC_UNUSED, AdwMessageDialog *dialog)
 {
-  const gchar *text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  GtkEntryBuffer *buffer = gtk_entry_get_buffer (entry);
+  guint text_length = gtk_entry_buffer_get_length (buffer);
  gboolean enabled = FALSE;

-  if (text && *text != '\0') {
-    enabled = gst_uri_is_valid (text);
+  if (text_length > 0) {
+    const gchar *text = gtk_entry_buffer_get_text (buffer);
+    enabled = (text && gst_uri_is_valid (text));
  }

-  adw_alert_dialog_set_response_enabled (dialog, "add", enabled);
+  adw_message_dialog_set_response_enabled (dialog, "add", enabled);
 }

 static void
-_open_uri_cb (AdwAlertDialog *dialog, GAsyncResult *result, GtkApplication *gtk_app)
+_open_uri_cb (AdwMessageDialog *dialog, GAsyncResult *result, GtkApplication *gtk_app)
 {
-  const gchar *response = adw_alert_dialog_choose_finish (dialog, result);
+  const gchar *response = adw_message_dialog_choose_finish (dialog, result);

  if (strcmp (response, "add") == 0) {
-    GtkWidget *extra_child = adw_alert_dialog_get_extra_child (dialog);
-    AdwEntryRow *entry_row = ADW_ENTRY_ROW (gtk_list_box_get_row_at_index (GTK_LIST_BOX (extra_child), 0));
-    const gchar *text = gtk_editable_get_text (GTK_EDITABLE (entry_row));
+    GtkWidget *extra_child = adw_message_dialog_get_extra_child (dialog);
+    GtkEntryBuffer *buffer = gtk_entry_get_buffer (GTK_ENTRY (extra_child));
+    const gchar *text = gtk_entry_buffer_get_text (buffer);
    GFile **files = NULL;
    gint n_files = 0;

@@ -58,15 +60,16 @@ _open_uri_cb (AdwAlertDialog *dialog, GAsyncResult *result, GtkApplication *gtk_
 }

 static void
-_read_text_cb (GdkClipboard *clipboard, GAsyncResult *result, GtkWidget *entry_row)
+_read_text_cb (GdkClipboard *clipboard, GAsyncResult *result, GtkWidget *extra_child)
 {
+  GtkEntry *entry = GTK_ENTRY (extra_child);
  GError *error = NULL;
  gchar *text = gdk_clipboard_read_text_finish (clipboard, result, &error);

  if (G_LIKELY (error == NULL)) {
    if (gst_uri_is_valid (text)) {
-      gtk_editable_set_text (GTK_EDITABLE (entry_row), text);
-      gtk_editable_select_region (GTK_EDITABLE (entry_row), 0, -1);
+      gtk_editable_set_text (GTK_EDITABLE (entry), text);
+      gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
    }
  } else {
    /* Common error when clipboard is empty or has unsupported content.
@@ -86,28 +89,30 @@ clapper_app_uri_dialog_open_uri (GtkApplication *gtk_app)
 {
  GtkWindow *window = gtk_application_get_active_window (gtk_app);
  GtkBuilder *builder;
-  AdwAlertDialog *dialog;
-  GtkWidget *entry_row;
+  AdwMessageDialog *dialog;
+  GtkWidget *extra_child;
  GdkDisplay *display;

  builder = gtk_builder_new_from_resource (
      CLAPPER_APP_RESOURCE_PREFIX "/ui/clapper-app-uri-dialog.ui");

-  dialog = ADW_ALERT_DIALOG (gtk_builder_get_object (builder, "dialog"));
-  entry_row = GTK_WIDGET (gtk_builder_get_object (builder, "entry_row"));
+  dialog = ADW_MESSAGE_DIALOG (gtk_builder_get_object (builder, "dialog"));
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), window);

-  g_signal_connect (GTK_EDITABLE (entry_row), "notify::text",
+  extra_child = adw_message_dialog_get_extra_child (dialog);
+
+  g_signal_connect (GTK_ENTRY (extra_child), "notify::text",
      G_CALLBACK (_entry_text_changed_cb), dialog);

  if ((display = gdk_display_get_default ())) {
    GdkClipboard *clipboard = gdk_display_get_clipboard (display);

    gdk_clipboard_read_text_async (clipboard, NULL,
-        (GAsyncReadyCallback) _read_text_cb, entry_row);
+        (GAsyncReadyCallback) _read_text_cb, extra_child);
  }

  /* NOTE: Dialog will automatically unref itself after response */
-  adw_alert_dialog_choose (dialog, GTK_WIDGET (window), NULL,
+  adw_message_dialog_choose (dialog, NULL,
      (GAsyncReadyCallback) _open_uri_cb,
      gtk_app);

--- a/src/bin/clapper-app/clapper-app-utils.c
+++ b/src/bin/clapper-app/clapper-app-utils.c
@@ -23,11 +23,6 @@
 #include "clapper-app-utils.h"
 #include "clapper-app-media-item-box.h"

-#ifdef HAVE_GRAPHVIZ
-#include <graphviz/cgraph.h>
-#include <graphviz/gvc.h>
-#endif
-
 #ifdef G_OS_WIN32
 #include <windows.h>
 #ifdef HAVE_WIN_PROCESS_THREADS_API
@@ -532,178 +527,3 @@ clapper_app_utils_make_element (const gchar *string)

  return gst_element_factory_make (string, NULL);
 }
-
-/*
- * _get_tmp_dir:
- * @subdir: (nullable): an optional subdirectory
- *
- * Returns: (transfer full): a newly constructed #GFile
- */
-static inline GFile *
-_get_tmp_dir (const gchar *subdir)
-{
-  /* XXX: System tmp directory does not work within containers such as Flatpak
-   * for our usage with file launcher, so make our own temp in app data dir */
-  return g_file_new_build_filename (
-      g_get_user_data_dir (), CLAPPER_APP_ID, "tmp", subdir, NULL);
-}
-
-#ifdef HAVE_GRAPHVIZ
-static GFile *
-_create_tmp_subdir (const gchar *subdir, GCancellable *cancellable, GError **error)
-{
-  GFile *tmp_dir;
-  GError *my_error = NULL;
-
-  tmp_dir = _get_tmp_dir (subdir);
-
-  if (!g_file_make_directory_with_parents (tmp_dir, cancellable, &my_error)) {
-    if (my_error->domain != G_IO_ERROR || my_error->code != G_IO_ERROR_EXISTS) {
-      *error = g_error_copy (my_error);
-      g_clear_object (&tmp_dir); // return NULL
-    }
-    g_error_free (my_error);
-  }
-
-  return tmp_dir;
-}
-#endif
-
-static void
-_create_pipeline_svg_file_in_thread (GTask *task, GObject *source G_GNUC_UNUSED,
-    ClapperPlayer *player, GCancellable *cancellable)
-{
-  GFile *tmp_file = NULL;
-  GError *error = NULL;
-
-#ifdef HAVE_GRAPHVIZ
-  GFile *tmp_subdir;
-  Agraph_t *graph;
-  GVC_t *gvc;
-  gchar *path, *template = NULL, *dot_data = NULL, *img_data = NULL;
-  gint fd;
-  guint size = 0;
-
-  if (!(tmp_subdir = _create_tmp_subdir ("pipelines", cancellable, &error)))
-    goto finish;
-
-  path = g_file_get_path (tmp_subdir);
-  g_object_unref (tmp_subdir);
-
-  template = g_build_filename (path, "pipeline-XXXXXX.svg", NULL);
-  g_free (path);
-
-  fd = g_mkstemp (template); // Modifies template to actual filename
-
-  if (G_UNLIKELY (fd == -1)) {
-    g_set_error (&error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-        "Could not open temp file for writing");
-    goto finish;
-  }
-
-  dot_data = clapper_player_make_pipeline_graph (player, GST_DEBUG_GRAPH_SHOW_ALL);
-
-  if (g_cancellable_is_cancelled (cancellable))
-    goto close_and_finish;
-
-  graph = agmemread (dot_data);
-
-  gvc = gvContext ();
-  gvLayout (gvc, graph, "dot");
-  gvRenderData (gvc, graph, "svg", &img_data, &size);
-
-  agclose (graph);
-  gvFreeContext (gvc);
-
-  if (g_cancellable_is_cancelled (cancellable))
-    goto close_and_finish;
-
-  if (write (fd, img_data, size) != -1) {
-    tmp_file = g_file_new_for_path (template);
-  } else {
-    g_set_error (&error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-        "Could not write data to temp file");
-  }
-
-close_and_finish:
-  /* Always close the file IO */
-  if (G_UNLIKELY (close (fd) == -1))
-    GST_ERROR ("Could not close temp file!");
-
-finish:
-  g_free (template);
-  g_free (dot_data);
-  g_free (img_data);
-#else
-  g_set_error (&error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-      "Cannot create graph file when compiled without Graphviz");
-#endif
-
-  if (tmp_file)
-    g_task_return_pointer (task, tmp_file, (GDestroyNotify) g_object_unref);
-  else
-    g_task_return_error (task, error);
-}
-
-void
-clapper_app_utils_create_pipeline_svg_file_async (ClapperPlayer *player,
-    GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
-{
-  GTask *task;
-
-  task = g_task_new (NULL, cancellable, callback, user_data);
-  g_task_set_task_data (task, gst_object_ref (player), (GDestroyNotify) gst_object_unref);
-  g_task_run_in_thread (task, (GTaskThreadFunc) _create_pipeline_svg_file_in_thread);
-
-  g_object_unref (task);
-}
-
-static gboolean
-_delete_dir_recursive (GFile *dir, GError **error)
-{
-  GFileEnumerator *dir_enum;
-
-  if ((dir_enum = g_file_enumerate_children (dir,
-      G_FILE_ATTRIBUTE_STANDARD_NAME "," G_FILE_ATTRIBUTE_STANDARD_TYPE,
-      G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, error))) {
-    while (TRUE) {
-      GFileInfo *info = NULL;
-      GFile *child = NULL;
-
-      if (!g_file_enumerator_iterate (dir_enum, &info,
-          &child, NULL, error) || !info)
-        break;
-
-      if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) {
-        if (!_delete_dir_recursive (child, error))
-          break;
-      } else if (!g_file_delete (child, NULL, error)) {
-        break;
-      }
-    }
-
-    g_object_unref (dir_enum);
-  }
-
-  if (*error != NULL)
-    return FALSE;
-
-  return g_file_delete (dir, NULL, error);
-}
-
-void
-clapper_app_utils_delete_tmp_dir (void)
-{
-  GFile *tmp_dir = _get_tmp_dir (NULL);
-  GError *error = NULL;
-
-  if (!_delete_dir_recursive (tmp_dir, &error)) {
-    if (error->domain != G_IO_ERROR || error->code != G_IO_ERROR_NOT_FOUND) {
-      GST_ERROR ("Could not remove temp dir, reason: %s",
-          GST_STR_NULL (error->message));
-    }
-    g_error_free (error);
-  }
-
-  g_object_unref (tmp_dir);
-}
--- a/src/bin/clapper-app/clapper-app-utils.h
+++ b/src/bin/clapper-app/clapper-app-utils.h
@@ -84,10 +84,4 @@ void clapper_app_utils_iterate_plugin_feature_ranks (GSettings *settings, Clappe
 G_GNUC_INTERNAL
 GstElement * clapper_app_utils_make_element (const gchar *string);

-G_GNUC_INTERNAL
-void clapper_app_utils_create_pipeline_svg_file_async (ClapperPlayer *player, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-
-G_GNUC_INTERNAL
-void clapper_app_utils_delete_tmp_dir (void);
-
 G_END_DECLS
--- a/src/bin/clapper-app/css/styles.css
+++ b/src/bin/clapper-app/css/styles.css
@@ -21,10 +21,10 @@ window.info .subcontent streamlist preferencesgroup {
 window.preferences .subcontent {
  margin: 16px;
 }
-window.preferences .configsubpage .subcontent popover {
+window.preferences .pluginssubpage .subcontent popover {
  min-width: 264px;
 }
-window.preferences .configsubpage .subcontent button.pill {
+window.preferences .pluginssubpage .subcontent button.pill {
  margin-top: 8px;
  margin-bottom: 8px;
 }
--- a/src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in
+++ b/src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in
@@ -12,7 +12,7 @@ StartupNotify=true
 Terminal=false
 Type=Application
 # Translators: Search terms to find this application. Do NOT translate the semicolons!
-Keywords=Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;
+Keywords=Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;
 # Translators: Do NOT translate or transliterate this text (these are enum types)!
 X-Purism-FormFactor=Workstation;Mobile;
 Actions=new-window;
--- a/src/bin/clapper-app/main.c
+++ b/src/bin/clapper-app/main.c
@@ -74,7 +74,5 @@ main (gint argc, gchar **argv)
    clapper_app_utils_win_hi_res_clock_stop (resolution);
 #endif

-  clapper_app_utils_delete_tmp_dir ();
-
  return status;
 }
--- a/src/bin/clapper-app/meson.build
+++ b/src/bin/clapper-app/meson.build
@@ -67,7 +67,7 @@ configure_file(
 )

 clapperapp_sources = [
-  'clapper-app-about-dialog.c',
+  'clapper-app-about-window.c',
  'clapper-app-application.c',
  'clapper-app-file-dialog.c',
  'clapper-app-headerbar.c',
@@ -94,23 +94,6 @@ clapperapp_c_args = [
  '-DGST_USE_UNSTABLE_API',
 ]

-clapperapp_possible_functionalities = [
-  'pipeline-preview',
-]
-clapperapp_available_functionalities = []
-
-pp_option = get_option('pipeline-preview')
-
-if not pp_option.disabled()
-  if cgraph_dep.found() and gvc_dep.found()
-    clapperapp_c_args += ['-DHAVE_GRAPHVIZ']
-    clapperapp_deps += [cgraph_dep, gvc_dep]
-    clapperapp_available_functionalities += 'pipeline-preview'
-  elif pp_option.enabled()
-    error('pipeline-preview option was enabled, but required dependencies were not found')
-  endif
-endif
-
 is_windows = ['windows'].contains(host_machine.system())

 if is_windows
--- a/src/bin/clapper-app/po/POTFILES
+++ b/src/bin/clapper-app/po/POTFILES
@@ -10,7 +10,7 @@ src/bin/clapper-app/ui/clapper-app-subtitle-stream-list-item.ui
 src/bin/clapper-app/ui/clapper-app-uri-dialog.ui
 src/bin/clapper-app/ui/clapper-app-video-stream-list-item.ui

-src/bin/clapper-app/clapper-app-about-dialog.c
+src/bin/clapper-app/clapper-app-about-window.c
 src/bin/clapper-app/clapper-app-application.c
 src/bin/clapper-app/clapper-app-info-window.c
 src/bin/clapper-app/clapper-app-list-item-utils.c
--- a/src/bin/clapper-app/po/af.po
+++ b/src/bin/clapper-app/po/af.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Afrikaans\n"
 "Language: af_ZA\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr ""
 msgid "Fast"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/ar.po
+++ b/src/bin/clapper-app/po/ar.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "عادي"
 msgid "Fast"
 msgstr "سريع"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/ast.po
+++ b/src/bin/clapper-app/po/ast.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Asturian\n"
 "Language: ast_ES\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "Normal"
 msgid "Fast"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/ca.po
+++ b/src/bin/clapper-app/po/ca.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Catalan\n"
 "Language: ca_ES\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "Normal"
 msgid "Fast"
 msgstr "Ràpid"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Sense progressió"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Consecutiu"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Repeteix l'ítem"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Carrusel"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Aleatori"

--- a/src/bin/clapper-app/po/clapper-app.pot
+++ b/src/bin/clapper-app/po/clapper-app.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,7 +32,9 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid ""
+"Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;"
+"Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -535,23 +537,23 @@ msgstr ""
 msgid "Fast"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/cs.po
+++ b/src/bin/clapper-app/po/cs.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "Normální"
 msgid "Fast"
 msgstr "Rychlý"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Žádný postup"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Po sobě"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Opakovat položku"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Opakovat frontu"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Náhodně"

--- a/src/bin/clapper-app/po/da.po
+++ b/src/bin/clapper-app/po/da.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr ""
 msgid "Fast"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/de.po
+++ b/src/bin/clapper-app/po/de.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-04-11 18:29\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-13 18:01\n"
 "Last-Translator: \n"
 "Language-Team: German\n"
 "Language: de_DE\n"
@@ -32,8 +32,8 @@ msgstr "Gebe Videos uns Musik wieder"

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
-msgstr ""
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
+msgstr "Video;Bewegtbildproduktion;Film;Clip;Serie;Wiedergabe;Wiedergabeliste;DVD;TV;Fernsehen;Platte;Album;Musik;GNOME;Clapper;"

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
 #: src/bin/clapper-app/ui/clapper-app-headerbar.ui:183
@@ -374,7 +374,7 @@ msgstr "Versatz zwischen der Untertitel- und Videospur (in Sekunden)"

 #: src/bin/clapper-app/ui/clapper-app-preferences-window.ui:118
 msgid "Default font"
-msgstr "Standardschriftart"
+msgstr "Standartschriftart"

 #: src/bin/clapper-app/ui/clapper-app-preferences-window.ui:119
 msgid "Text font used for subtitles when media does not explicitly specify one"
@@ -530,23 +530,23 @@ msgstr "Normal"
 msgid "Fast"
 msgstr "Schnell"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Kein Fortschritt"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Fortlaufend"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Wiederholen"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Kreislauf"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Zufallswiedergabe"

--- a/src/bin/clapper-app/po/el.po
+++ b/src/bin/clapper-app/po/el.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr ""
 msgid "Fast"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/es.po
+++ b/src/bin/clapper-app/po/es.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 17:41\n"
 "Last-Translator: \n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
@@ -32,8 +32,8 @@ msgstr "Reproduce videos y música"

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
-msgstr ""
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
+msgstr "Vídeo;Película;Film;Clip;Serie;Reproductor;Playlist;DVD;TV;Disco;Álbum;Música;GNOME;Clapper;"

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
 #: src/bin/clapper-app/ui/clapper-app-headerbar.ui:183
@@ -531,23 +531,23 @@ msgstr "Normal"
 msgid "Fast"
 msgstr "Rápido"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Sin progresión"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Consecutivo"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Repetir elemento"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Carrusel"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Aleatorio"

--- a/src/bin/clapper-app/po/eu.po
+++ b/src/bin/clapper-app/po/eu.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Basque\n"
 "Language: eu_ES\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "Normala"
 msgid "Fast"
 msgstr "Azkarra"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/fa.po
+++ b/src/bin/clapper-app/po/fa.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 13:14\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-13 15:41\n"
 "Last-Translator: \n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
@@ -32,8 +32,8 @@ msgstr "پخش ویدیو و آهنگ"

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
-msgstr "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;ویدیو;فیلم;کلیپ;سریال;نمایش;پخش;دی‌وی‌دی;تلویزیون;دیسک;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
+msgstr "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;ویدیو;فیلم;کلیپ;سریتال;پخش;تلویزیون;آلبوم;آهنگ;گنوم;کلاکت;کلپر;"

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
 #: src/bin/clapper-app/ui/clapper-app-headerbar.ui:183
@@ -531,23 +531,23 @@ msgstr "معمولی"
 msgid "Fast"
 msgstr "تند"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "بدون پیشرفت"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "متوالی"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "تکرار مورد"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "چرخ فلک"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "بر زدن"

--- a/src/bin/clapper-app/po/fi.po
+++ b/src/bin/clapper-app/po/fi.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-17 08:37\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-12 13:02\n"
 "Last-Translator: \n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
@@ -20,7 +20,7 @@ msgstr ""
 #. Translators: Do NOT translate app name!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:4
 msgid "Clapper"
-msgstr "Clapper"
+msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:5
 msgid "Multimedia Player"
@@ -32,8 +32,8 @@ msgstr "Toista videoita ja musiikkia"

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
-msgstr "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;elokuva;leffa;sarja;soittolista;soitin;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
+msgstr "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;elokuva;sarja;soittolista;levy;albumi;musiikki;"

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
 #: src/bin/clapper-app/ui/clapper-app-headerbar.ui:183
@@ -530,23 +530,23 @@ msgstr "Normaali"
 msgid "Fast"
 msgstr "Nopea"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Ei etenemistä"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Perättäinen"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Toista kohde"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Karuselli"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Sekoita"

--- a/src/bin/clapper-app/po/fr.po
+++ b/src/bin/clapper-app/po/fr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-27 20:49\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-18 09:13\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
@@ -32,8 +32,8 @@ msgstr "Lire des vidéos et de la musique"

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
-msgstr "Vidéo;Film;Clip;Série;Lecteur;Playlist;DVD;TV;Disque;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
+msgstr "Vidéo;Movie;Film;Clip;Séries;Player;Lecteur;Playlist;DVD;TV;Disque;Album;Musique;GNOME;Clapper;"

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
 #: src/bin/clapper-app/ui/clapper-app-headerbar.ui:183
@@ -531,23 +531,23 @@ msgstr "Normal"
 msgid "Fast"
 msgstr "Rapide"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Aucune progression"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Chronologique"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Répéter l’élement"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Carrousel"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Aléatoire"

--- a/src/bin/clapper-app/po/he.po
+++ b/src/bin/clapper-app/po/he.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "רגילה"
 msgid "Fast"
 msgstr "מהיר"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/hi.po
+++ b/src/bin/clapper-app/po/hi.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Hindi\n"
 "Language: hi_IN\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "साधारण"
 msgid "Fast"
 msgstr "तेज"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "प्रगति नहीं"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "लगातार"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "मद दोहराएं"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "कैरोसेल"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "शफल"

--- a/src/bin/clapper-app/po/hr.po
+++ b/src/bin/clapper-app/po/hr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "Normalna"
 msgid "Fast"
 msgstr "Brzo"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/hu.po
+++ b/src/bin/clapper-app/po/hu.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "Normál"
 msgid "Fast"
 msgstr "Gyors"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Ne haladjon"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Folyamatos"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Listaelem ismétlése"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Körkörös"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Véletlenszerű"

--- a/src/bin/clapper-app/po/it.po
+++ b/src/bin/clapper-app/po/it.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "Normale"
 msgid "Fast"
 msgstr "Veloce"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/ja.po
+++ b/src/bin/clapper-app/po/ja.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "標準"
 msgid "Fast"
 msgstr "高速"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/ko.po
+++ b/src/bin/clapper-app/po/ko.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr ""
 msgid "Fast"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/lt.po
+++ b/src/bin/clapper-app/po/lt.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Lithuanian\n"
 "Language: lt_LT\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "Numatyta"
 msgid "Fast"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/nl.po
+++ b/src/bin/clapper-app/po/nl.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "Normaal"
 msgid "Fast"
 msgstr "Snel"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/no.po
+++ b/src/bin/clapper-app/po/no.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian\n"
 "Language: no_NO\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "Normal"
 msgid "Fast"
 msgstr "Rask"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Ingen progresjon"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Konsekutiv"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Gjenta element"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Gjenta kø"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Omstokking"

--- a/src/bin/clapper-app/po/oc.po
+++ b/src/bin/clapper-app/po/oc.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Occitan\n"
 "Language: oc_FR\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr ""
 msgid "Fast"
 msgstr "Rapid"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Cap de progression"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Consecutiu"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Repetir l’element"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Vira-vira"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Aleatòri"

--- a/src/bin/clapper-app/po/pl.po
+++ b/src/bin/clapper-app/po/pl.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-19 14:18\n"
 "Last-Translator: \n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
@@ -32,8 +32,8 @@ msgstr "Odtwarzaj filmy i muzykę"

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
-msgstr ""
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
+msgstr "Wideo;Film;Clip;Serie;Odtwarzacz;Playlista;DVD;TV;CD;Album;Muzyka;GNOME;Clapper;"

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
 #: src/bin/clapper-app/ui/clapper-app-headerbar.ui:183
@@ -530,23 +530,23 @@ msgstr "Normalny"
 msgid "Fast"
 msgstr "Szybki"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Brak progresji"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Po kolei"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Powtarzaj rzecz"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Karuzela"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Losowo"

--- a/src/bin/clapper-app/po/pt.po
+++ b/src/bin/clapper-app/po/pt.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-04-01 09:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-14 14:46\n"
 "Last-Translator: \n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
@@ -32,8 +32,8 @@ msgstr "Reproduzir vídeos e música"

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
-msgstr "Vídeo;Filme;Filme;Clipe;Série;Leitor;Reprodutor;Lista de reprodução;DVD;TV;Disco;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
+msgstr "Vídeo;Filme;Clip;Leitor;Reprodutor;Playlist;Lista de reprodução;DVD;TV;Disco;Música;GNOME;Clapper;"

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
 #: src/bin/clapper-app/ui/clapper-app-headerbar.ui:183
@@ -530,23 +530,23 @@ msgstr "Predefinido"
 msgid "Fast"
 msgstr "Rápido"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Sem progressão"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Consecutiva"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Repetir item"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Carrossel"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Aleatório"

--- a/src/bin/clapper-app/po/pt_BR.po
+++ b/src/bin/clapper-app/po/pt_BR.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-16 04:37\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-12 03:17\n"
 "Last-Translator: \n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
@@ -32,8 +32,8 @@ msgstr "Reproduza vídeos e músicas"

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
-msgstr "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Vídeo;Filme;Clipe;Série;Reprodutor;Lista;Reprodução;Disco;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
+msgstr "Vídeo;Filme;Clipe;Série;Show;Reprodutor;Player;Playlist;Lista;DVD;TV;Disco;Álbum;Música;GNOME;Clapper;"

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
 #: src/bin/clapper-app/ui/clapper-app-headerbar.ui:183
@@ -531,23 +531,23 @@ msgstr "Normal"
 msgid "Fast"
 msgstr "Rápido"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Sem progressão"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Consecutiva"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Repetir item"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Repetir tudo"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Aleatório"

--- a/src/bin/clapper-app/po/ro.po
+++ b/src/bin/clapper-app/po/ro.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:10\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-20 20:06\n"
 "Last-Translator: \n"
 "Language-Team: Romanian\n"
 "Language: ro_RO\n"
@@ -32,7 +32,7 @@ msgstr "Redă videoclipuri și muzică"

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr ""
 msgid "Fast"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/ru.po
+++ b/src/bin/clapper-app/po/ru.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-25 20:33\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-14 21:16\n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
@@ -20,25 +20,25 @@ msgstr ""
 #. Translators: Do NOT translate app name!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:4
 msgid "Clapper"
-msgstr "Clapper"
+msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:5
 msgid "Multimedia Player"
-msgstr "Проигрыватель мультимедиа"
+msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:6
 msgid "Play videos and music"
-msgstr "Воспроизведение видео и музыки"
+msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
-msgstr "Видео;Фильм;Фильм;Клип;Серий;Плейлист;DVD;ТВ;Диск;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
+msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
 #: src/bin/clapper-app/ui/clapper-app-headerbar.ui:183
 msgid "New Window"
-msgstr "Новое Окно"
+msgstr ""

 #: src/bin/clapper-app/ui/clapper-app-audio-stream-list-item.ui:14
 #: src/bin/clapper-app/ui/clapper-app-video-stream-list-item.ui:14
@@ -90,7 +90,7 @@ msgstr "Общие"

 #: src/bin/clapper-app/ui/clapper-app-help-overlay.ui:13
 msgid "New window"
-msgstr "Новое окно"
+msgstr ""

 #: src/bin/clapper-app/ui/clapper-app-help-overlay.ui:19
 msgid "Open preferences"
@@ -110,15 +110,15 @@ msgstr "Двойное нажатие | Двойной клик"

 #: src/bin/clapper-app/ui/clapper-app-help-overlay.ui:38
 msgid "Unfullscreen"
-msgstr "Выйти из полноэкранного режима"
+msgstr ""

 #: src/bin/clapper-app/ui/clapper-app-help-overlay.ui:44
 msgid "Auto window resize"
-msgstr "Автоматически изменять размер окна"
+msgstr ""

 #: src/bin/clapper-app/ui/clapper-app-help-overlay.ui:45
 msgid "Middle click"
-msgstr "Клик колёсиком"
+msgstr ""

 #: src/bin/clapper-app/ui/clapper-app-help-overlay.ui:51
 msgid "Quit"
@@ -468,19 +468,19 @@ msgstr "Игорь Дятлов"

 #: src/bin/clapper-app/clapper-app-application.c:696
 msgid "Create a new window"
-msgstr "Создать новое окно"
+msgstr ""

 #: src/bin/clapper-app/clapper-app-application.c:697
 msgid "Add media to queue in primary application instance"
-msgstr "Добавить контент в очередь в основной экземпляр приложения"
+msgstr ""

 #: src/bin/clapper-app/clapper-app-application.c:698
 msgid "Audio volume to set (0 - 2.0 range)"
-msgstr "Установить громкость звука (диапазон 0 - 2,0)"
+msgstr ""

 #: src/bin/clapper-app/clapper-app-application.c:699
 msgid "Playback speed to set (0.05 - 2.0 range)"
-msgstr "Установить скорость воспроизведения (диапазон 0,05 - 2,0)"
+msgstr ""

 #: src/bin/clapper-app/clapper-app-application.c:700
 msgid "Initial bitrate for adaptive streaming"
@@ -492,7 +492,7 @@ msgstr ""

 #: src/bin/clapper-app/clapper-app-application.c:702
 msgid "Set window to be fullscreen"
-msgstr "Запустить в полноэкранном окне"
+msgstr ""

 #: src/bin/clapper-app/clapper-app-application.c:703
 msgid "Video filter to use (\"none\" to disable)"
@@ -530,23 +530,23 @@ msgstr "Обычная"
 msgid "Fast"
 msgstr "Быстрый"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "Нет прогрессии"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Последовательно"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Повторить элемент"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Повтор очереди"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Случайно"

--- a/src/bin/clapper-app/po/sk.po
+++ b/src/bin/clapper-app/po/sk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "Normálne"
 msgid "Fast"
 msgstr "Rýchle"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/sr.po
+++ b/src/bin/clapper-app/po/sr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Serbian (Cyrillic)\n"
 "Language: sr_SP\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr ""
 msgid "Fast"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/sv.po
+++ b/src/bin/clapper-app/po/sv.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr "Normal"
 msgid "Fast"
 msgstr "Snabbt"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/tr.po
+++ b/src/bin/clapper-app/po/tr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 22:52\n"
 "Last-Translator: \n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
@@ -32,8 +32,8 @@ msgstr "Videoları ve müzikleri oynat"

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
-msgstr ""
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
+msgstr "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;Vidyo;Klip;Dizi;Oynatıcı;Oynatma Listesi;Çalma Listesi;Disk;Albüm;Müzik;"

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
 #: src/bin/clapper-app/ui/clapper-app-headerbar.ui:183
@@ -530,23 +530,23 @@ msgstr "Normal"
 msgid "Fast"
 msgstr "Hızlı"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "İlerleme yok"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "Ardaşık"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "Ögeyi Yinele"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "Karosel"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "Karıştır"

--- a/src/bin/clapper-app/po/uk.po
+++ b/src/bin/clapper-app/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr ""
 msgid "Fast"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/vi.po
+++ b/src/bin/clapper-app/po/vi.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr ""
 msgid "Fast"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/po/zh_CN.po
+++ b/src/bin/clapper-app/po/zh_CN.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-19 10:03\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
@@ -32,13 +32,13 @@ msgstr "播放视频和音乐"

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
 #: src/bin/clapper-app/ui/clapper-app-headerbar.ui:183
 msgid "New Window"
-msgstr "新建窗口"
+msgstr ""

 #: src/bin/clapper-app/ui/clapper-app-audio-stream-list-item.ui:14
 #: src/bin/clapper-app/ui/clapper-app-video-stream-list-item.ui:14
@@ -90,7 +90,7 @@ msgstr "常规"

 #: src/bin/clapper-app/ui/clapper-app-help-overlay.ui:13
 msgid "New window"
-msgstr "新建窗口"
+msgstr ""

 #: src/bin/clapper-app/ui/clapper-app-help-overlay.ui:19
 msgid "Open preferences"
@@ -285,7 +285,7 @@ msgstr "过滤器"
 #: src/bin/clapper-app/ui/clapper-app-info-window.ui:182
 #: src/bin/clapper-app/ui/clapper-app-info-window.ui:223
 msgid "Sink"
-msgstr "接收器"
+msgstr "Sink"

 #: src/bin/clapper-app/ui/clapper-app-info-window.ui:196
 msgid "Audio Playback"
@@ -309,11 +309,11 @@ msgstr "添加媒体到播放队列即可开始"

 #: src/bin/clapper-app/ui/clapper-app-preferences-window.ui:15
 msgid "Seeking"
-msgstr "快进/快退"
+msgstr "定位播放"

 #: src/bin/clapper-app/ui/clapper-app-preferences-window.ui:18
 msgid "Method"
-msgstr "方式"
+msgstr "快进/快退方式"

 #: src/bin/clapper-app/ui/clapper-app-preferences-window.ui:19
 msgid "A preferred method used for seeking"
@@ -465,8 +465,7 @@ msgstr "像素格式"
 #: src/bin/clapper-app/clapper-app-about-window.c:47
 msgid "translator-credits"
 msgstr "刘韬\n"
-"Tommy He\n"
-"demo_007"
+"Tommy He"

 #: src/bin/clapper-app/clapper-app-application.c:696
 msgid "Create a new window"
@@ -474,11 +473,11 @@ msgstr "新建一个窗口"

 #: src/bin/clapper-app/clapper-app-application.c:697
 msgid "Add media to queue in primary application instance"
-msgstr "向主应用程序实例播放列队添加媒体"
+msgstr ""

 #: src/bin/clapper-app/clapper-app-application.c:698
 msgid "Audio volume to set (0 - 2.0 range)"
-msgstr "设置音量(范围 0 - 2.0)"
+msgstr "设置音量 (范围 0 - 2.0)"

 #: src/bin/clapper-app/clapper-app-application.c:699
 msgid "Playback speed to set (0.05 - 2.0 range)"
@@ -486,31 +485,31 @@ msgstr "设置播放速度(范围 0.05 - 2.0)"

 #: src/bin/clapper-app/clapper-app-application.c:700
 msgid "Initial bitrate for adaptive streaming"
-msgstr "自适性流的初始比特率"
+msgstr ""

 #: src/bin/clapper-app/clapper-app-application.c:701
 msgid "Initial queue progression mode (0=none, 1=consecutive, 2=repeat-item, 3=carousel, 4=shuffle)"
-msgstr "初始播放列队模式 (0=单集, 1=连续, 2=单机循环, 3=队列循环, 4=随机)"
+msgstr ""

 #: src/bin/clapper-app/clapper-app-application.c:702
 msgid "Set window to be fullscreen"
-msgstr "窗口全屏"
+msgstr "设置窗口为全屏"

 #: src/bin/clapper-app/clapper-app-application.c:703
 msgid "Video filter to use (\"none\" to disable)"
-msgstr "视频过滤器(\"none\"为禁用)"
+msgstr ""

 #: src/bin/clapper-app/clapper-app-application.c:704
 msgid "Audio filter to use (\"none\" to disable)"
-msgstr "音频过滤器(\"none\"为禁用)"
+msgstr ""

 #: src/bin/clapper-app/clapper-app-application.c:705
 msgid "Video sink to use"
-msgstr "视频接收器"
+msgstr ""

 #: src/bin/clapper-app/clapper-app-application.c:706
 msgid "Audio sink to use"
-msgstr "音频接收器"
+msgstr ""

 #: src/bin/clapper-app/clapper-app-info-window.c:86
 msgid "Hardware"
@@ -532,23 +531,23 @@ msgstr "标准"
 msgid "Fast"
 msgstr "快速"

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr "单集"

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr "连续"

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr "单集循环"

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr "队列循环"

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr "随机"

--- a/src/bin/clapper-app/po/zh_TW.po
+++ b/src/bin/clapper-app/po/zh_TW.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 12:47+0100\n"
-"PO-Revision-Date: 2025-02-15 12:11\n"
+"POT-Creation-Date: 2025-01-11 15:22+0100\n"
+"PO-Revision-Date: 2025-01-11 14:36\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
@@ -32,7 +32,7 @@ msgstr ""

 #. Translators: Search terms to find this application. Do NOT translate the semicolons!
 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:16
-msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;"
+msgid "Video;Movie;Film;Clip;Series;Player;Playlist;DVD;TV;Disc;Album;Music;GNOME;Clapper;"
 msgstr ""

 #: src/bin/clapper-app/data/applications/com.github.rafostar.Clapper.desktop.in:22
@@ -530,23 +530,23 @@ msgstr ""
 msgid "Fast"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:207
+#: src/bin/clapper-app/clapper-app-utils.c:90
 msgid "No progression"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:208
+#: src/bin/clapper-app/clapper-app-utils.c:91
 msgid "Consecutive"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:209
+#: src/bin/clapper-app/clapper-app-utils.c:92
 msgid "Repeat item"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:210
+#: src/bin/clapper-app/clapper-app-utils.c:93
 msgid "Carousel"
 msgstr ""

-#: src/bin/clapper-app/clapper-app-utils.c:211
+#: src/bin/clapper-app/clapper-app-utils.c:94
 msgid "Shuffle"
 msgstr ""

--- a/src/bin/clapper-app/ui/clapper-app-help-overlay.ui
+++ b/src/bin/clapper-app/ui/clapper-app-help-overlay.ui
@@ -26,12 +26,6 @@
                <property name="accelerator">&lt;Ctrl&gt;question</property>
              </object>
            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes">Show pipeline</property>
-                <property name="accelerator">&lt;Ctrl&gt;&lt;Shift&gt;p</property>
-              </object>
-            </child>
            <child>
              <object class="GtkShortcutsShortcut">
                <property name="title" translatable="yes">Toggle fullscreen</property>
--- a/src/bin/clapper-app/ui/clapper-app-info-window.ui
+++ b/src/bin/clapper-app/ui/clapper-app-info-window.ui
@@ -232,17 +232,6 @@
                                </child>
                              </object>
                            </child>
-                            <child>
-                              <object class="GtkButton" id="pipeline_button">
-                                <property name="halign">center</property>
-                                <property name="label" translatable="yes">Show Pipeline</property>
-                                <property name="action-name">app.pipeline</property>
-                                <property name="visible">false</property>
-                                <style>
-                                  <class name="pill"/>
-                                </style>
-                              </object>
-                            </child>
                          </object>
                        </child>
                      </object>
--- a/src/bin/clapper-app/ui/clapper-app-preferences-window.ui
+++ b/src/bin/clapper-app/ui/clapper-app-preferences-window.ui
@@ -136,24 +136,6 @@
      <object class="AdwPreferencesPage">
        <property name="title" translatable="yes">Tweaks</property>
        <property name="icon-name">applications-engineering-symbolic</property>
-        <child>
-          <object class="AdwPreferencesGroup">
-            <property name="title" translatable="no">Clapper</property>
-            <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">Enhancers</property>
-                <property name="subtitle" translatable="yes">Browse and configure properties of available enhancers</property>
-                <property name="activatable">true</property>
-                <signal name="activated" handler="enhancers_config_activated_cb"/>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon_name">go-next-symbolic</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
        <child>
          <object class="AdwPreferencesGroup">
            <property name="title" translatable="no">GStreamer</property>
@@ -178,124 +160,6 @@
      <class name="preferences"/>
    </style>
  </template>
-  <object class="AdwNavigationPage" id="enhancers_subpage">
-    <property name="title" translatable="yes">Clapper Enhancers</property>
-    <property name="child">
-      <object class="AdwToolbarView">
-        <child type="top">
-          <object class="AdwHeaderBar"/>
-        </child>
-        <property name="content">
-          <object class="GtkScrolledWindow">
-            <child>
-              <object class="AdwClamp">
-                <style>
-                  <class name="subcontent"/>
-                </style>
-                <child>
-                  <object class="GtkStack" id="enhancers_stack">
-                    <child>
-                      <object class="GtkBox" id="browse_enhancers_page">
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="AdwPreferencesGroup">
-                            <property name="title" translatable="yes">Available enhancers</property>
-                            <property name="description" translatable="yes">Select an enhancer plugin to view its information and properties to configure.</property>
-                            <child>
-                              <object class="AdwComboRow" id="enhancers_combo_row">
-                                <property name="title" translatable="yes">Enhancer</property>
-                                <property name="enable-search">true</property>
-                                <property name="expression">
-                                  <lookup type="ClapperEnhancerProxy" name="friendly-name"/>
-                                </property>
-                                <signal name="notify::selected" handler="selected_enhancer_changed_cb"/>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="orientation">vertical</property>
-                            <binding name="visible">
-                              <closure type="gboolean" function="list_has_selection_closure">
-                                <lookup name="selected">enhancers_combo_row</lookup>
-                              </closure>
-                            </binding>
-                            <child>
-                              <object class="AdwPreferencesGroup">
-                                <property name="title" translatable="yes">Information</property>
-                                <child>
-                                  <object class="AdwActionRow">
-                                    <property name="title" translatable="yes">Module</property>
-                                    <binding name="subtitle">
-                                      <lookup name="module-name" type="ClapperEnhancerProxy">
-                                        <lookup name="selected-item">enhancers_combo_row</lookup>
-                                      </lookup>
-                                    </binding>
-                                    <style>
-                                      <class name="property"/>
-                                    </style>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="AdwActionRow">
-                                    <property name="title" translatable="yes">Description</property>
-                                    <binding name="subtitle">
-                                      <lookup name="description" type="ClapperEnhancerProxy">
-                                        <lookup name="selected-item">enhancers_combo_row</lookup>
-                                      </lookup>
-                                    </binding>
-                                    <style>
-                                      <class name="property"/>
-                                    </style>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="AdwActionRow">
-                                    <property name="title" translatable="yes">Version</property>
-                                    <binding name="subtitle">
-                                      <lookup name="version" type="ClapperEnhancerProxy">
-                                        <lookup name="selected-item">enhancers_combo_row</lookup>
-                                      </lookup>
-                                    </binding>
-                                    <style>
-                                      <class name="property"/>
-                                    </style>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="AdwPreferencesGroup" id="enhancer_config_group">
-                                <property name="title" translatable="yes">Properties</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwStatusPage" id="no_enhancers_page">
-                        <property name="vexpand">true</property>
-                        <property name="hexpand">true</property>
-                        <property name="icon-name">edit-find-symbolic</property>
-                        <property name="title" translatable="yes">No Clapper Enhancers Found</property>
-                        <property name="description" translatable="yes">Install some to add more cool functionalities to the player!</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </property>
-      </object>
-    </property>
-    <signal name="unrealize" handler="plugin_ranking_unrealize_cb"/>
-    <style>
-      <class name="configsubpage"/>
-    </style>
-  </object>
  <object class="AdwNavigationPage" id="plugins_subpage">
    <property name="title" translatable="yes">Plugin Ranking</property>
    <property name="child">
@@ -376,7 +240,7 @@
    </property>
    <signal name="unrealize" handler="plugin_ranking_unrealize_cb"/>
    <style>
-      <class name="configsubpage"/>
+      <class name="pluginssubpage"/>
    </style>
  </object>
 </interface>
--- a/src/bin/clapper-app/ui/clapper-app-uri-dialog.ui
+++ b/src/bin/clapper-app/ui/clapper-app-uri-dialog.ui
@@ -1,28 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="clapper-app">
-  <object class="AdwAlertDialog" id="dialog">
+  <object class="AdwMessageDialog" id="dialog">
+    <property name="modal">true</property>
+    <property name="width-request">420</property>
    <property name="heading" translatable="yes">Add URI</property>
    <property name="body" translatable="yes">Insert an URI to be added to playback queue</property>
    <property name="close-response">cancel</property>
    <property name="default-response">add</property>
-    <property name="follows-content-size">false</property>
-    <property name="content-width">420</property>
    <property name="extra-child">
-      <object class="GtkListBox">
-        <property name="selection-mode">none</property>
-        <style>
-          <class name="boxed-list"/>
-        </style>
-        <child>
-          <object class="AdwEntryRow" id="entry_row">
-            <property name="halign">fill</property>
-            <property name="valign">center</property>
-            <property name="hexpand">true</property>
-            <property name="activates-default">true</property>
-            <property name="input-purpose">url</property>
-            <property name="title" translatable="yes">Enter or drop URI here</property>
-          </object>
-        </child>
+      <object class="GtkEntry">
+        <property name="halign">fill</property>
+        <property name="valign">center</property>
+        <property name="hexpand">true</property>
+        <property name="activates-default">true</property>
+        <property name="truncate-multiline">true</property>
+        <property name="input-purpose">url</property>
+        <property name="placeholder-text" translatable="yes">Enter or drop URI here</property>
      </object>
    </property>
    <responses>
--- a/src/lib/clapper-gtk/clapper-gtk-video.c
+++ b/src/lib/clapper-gtk/clapper-gtk-video.c
@@ -909,7 +909,7 @@ _set_inhibit_session (ClapperGtkVideo *self, gboolean inhibit)

  root = gtk_widget_get_root (GTK_WIDGET (self));

-  if (!root && !GTK_IS_WINDOW (root)) {
+  if (!root || !GTK_IS_WINDOW (root)) {
    GST_WARNING_OBJECT (self, "Cannot %sinhibit session "
        "without root window", (inhibit) ? "" : "un");
    return;
@@ -919,7 +919,7 @@ _set_inhibit_session (ClapperGtkVideo *self, gboolean inhibit)
   * as it goes away early when unrooting */
  app = g_application_get_default ();

-  if (!app && !GTK_IS_APPLICATION (app)) {
+  if (!app || !GTK_IS_APPLICATION (app)) {
    GST_WARNING_OBJECT (self, "Cannot %sinhibit session "
        "without window application set", (inhibit) ? "" : "un");
    return;
@@ -977,20 +977,24 @@ _get_widget_from_video_sink (GstElement *vsink)
  GParamSpec *pspec;

  if ((pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (vsink), "widget"))
-      && pspec->value_type == GTK_TYPE_WIDGET) {
+      && g_type_is_a (pspec->value_type, GTK_TYPE_WIDGET)) {
    GST_DEBUG ("Video sink provides a widget");
    g_object_get (vsink, "widget", &widget, NULL);
  } else if ((pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (vsink), "paintable"))
-      && pspec->value_type == GDK_TYPE_PAINTABLE) {
-    GdkPaintable *paintable = NULL;
+      && g_type_is_a (pspec->value_type, G_TYPE_OBJECT)) {
+    GObject *paintable = NULL;

    GST_DEBUG ("Video sink provides a paintable");
    g_object_get (vsink, "paintable", &paintable, NULL);

-    widget = g_object_ref_sink (gtk_picture_new ());
-    gtk_picture_set_paintable (GTK_PICTURE (widget), paintable);
+    if (G_LIKELY (paintable != NULL)) {
+      if (GDK_IS_PAINTABLE (paintable)) {
+        widget = g_object_ref_sink (gtk_picture_new ());
+        gtk_picture_set_paintable (GTK_PICTURE (widget), GDK_PAINTABLE (paintable));
+      }

-    g_object_unref (paintable);
+      g_object_unref (paintable);
+    }
  }

  return widget;
--- a/src/lib/clapper-gtk/po/ru.po
+++ b/src/lib/clapper-gtk/po/ru.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: clapper\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-01-07 19:03+0100\n"
-"PO-Revision-Date: 2025-02-25 20:33\n"
+"PO-Revision-Date: 2025-01-07 18:32\n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
@@ -50,11 +50,11 @@ msgstr "Сброс"

 #: src/lib/clapper-gtk/ui/clapper-gtk-video-placeholder.ui:25
 msgid "External video output"
-msgstr "Внешний источник видео"
+msgstr ""

 #: src/lib/clapper-gtk/ui/clapper-gtk-video-placeholder.ui:37
 msgid "Used video sink cannot be embedded within application window"
-msgstr "Используемый видеосигнал не может быть встроен в окно приложения"
+msgstr ""

 #: src/lib/clapper-gtk/clapper-gtk-status.c:79
 msgid "Unplayable Content"
--- a/src/lib/clapper/clapper-basic-functions.h
+++ b/src/lib/clapper/clapper-basic-functions.h
@@ -1,46 +0,0 @@
-/* Clapper Playback Library
- * Copyright (C) 2025 Rafał Dzięgiel <rafostar.github@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-#if !defined(__CLAPPER_INSIDE__) && !defined(CLAPPER_COMPILATION)
-#error "Only <clapper/clapper.h> can be included directly."
-#endif
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <clapper/clapper-visibility.h>
-#include <clapper/clapper-enhancer-proxy-list.h>
-
-G_BEGIN_DECLS
-
-CLAPPER_API
-void clapper_init (int *argc, char **argv[]);
-
-CLAPPER_API
-gboolean clapper_init_check (int *argc, char **argv[]);
-
-CLAPPER_DEPRECATED
-gboolean clapper_enhancer_check (GType iface_type, const gchar *scheme, const gchar *host, const gchar **name);
-
-CLAPPER_API
-ClapperEnhancerProxyList * clapper_get_global_enhancer_proxies (void);
-
-G_END_DECLS
--- a/src/lib/clapper/clapper-cache-private.h
+++ b/src/lib/clapper/clapper-cache-private.h
@@ -1,93 +0,0 @@
-/* Clapper Playback Library
- * Copyright (C) 2025 Rafał Dzięgiel <rafostar.github@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-G_GNUC_INTERNAL
-void clapper_cache_initialize (void);
-
-G_GNUC_INTERNAL
-GMappedFile * clapper_cache_open (const gchar *filename, const gchar **data, GError **error);
-
-G_GNUC_INTERNAL
-gboolean clapper_cache_read_boolean (const gchar **data);
-
-G_GNUC_INTERNAL
-gint clapper_cache_read_int (const gchar **data);
-
-G_GNUC_INTERNAL
-guint clapper_cache_read_uint (const gchar **data);
-
-G_GNUC_INTERNAL
-gdouble clapper_cache_read_double (const gchar **data);
-
-G_GNUC_INTERNAL
-const gchar * clapper_cache_read_string (const gchar **data);
-
-G_GNUC_INTERNAL
-GType clapper_cache_read_enum (const gchar **data);
-
-G_GNUC_INTERNAL
-GType clapper_cache_read_flags (const gchar **data);
-
-G_GNUC_INTERNAL
-GType clapper_cache_read_iface (const gchar **data);
-
-G_GNUC_INTERNAL
-GParamSpec * clapper_cache_read_pspec (const gchar **data);
-
-G_GNUC_INTERNAL
-GByteArray * clapper_cache_create (void);
-
-G_GNUC_INTERNAL
-void clapper_cache_store_boolean (GByteArray *bytes, gboolean val);
-
-G_GNUC_INTERNAL
-void clapper_cache_store_int (GByteArray *bytes, gint val);
-
-G_GNUC_INTERNAL
-void clapper_cache_store_uint (GByteArray *bytes, guint val);
-
-G_GNUC_INTERNAL
-void clapper_cache_store_double (GByteArray *bytes, gdouble val);
-
-G_GNUC_INTERNAL
-void clapper_cache_store_string (GByteArray *bytes, const gchar *val);
-
-G_GNUC_INTERNAL
-void clapper_cache_store_enum (GByteArray *bytes, GType enum_type);
-
-G_GNUC_INTERNAL
-void clapper_cache_store_flags (GByteArray *bytes, GType flags_type);
-
-G_GNUC_INTERNAL
-gboolean clapper_cache_store_iface (GByteArray *bytes, GType iface);
-
-G_GNUC_INTERNAL
-gboolean clapper_cache_store_pspec (GByteArray *bytes, GParamSpec *pspec);
-
-G_GNUC_INTERNAL
-gboolean clapper_cache_write (const gchar *filename, GByteArray *bytes, GError **error);
-
-G_END_DECLS
--- a/src/lib/clapper/clapper-cache.c
+++ b/src/lib/clapper/clapper-cache.c
@@ -1,491 +0,0 @@
-/* Clapper Playback Library
- * Copyright (C) 2025 Rafał Dzięgiel <rafostar.github@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "clapper-cache-private.h"
-#include "clapper-version.h"
-#include "clapper-extractable.h"
-
-#define CLAPPER_CACHE_HEADER "CLAPPER"
-
-typedef enum
-{
-  CLAPPER_CACHE_IFACE_EXTRACTABLE = 1,
-} ClapperCacheIfaces;
-
-static GArray *enum_registry = NULL;
-static GArray *flags_registry = NULL;
-static gboolean cache_disabled = FALSE;
-
-void
-clapper_cache_initialize (void)
-{
-  const gchar *env = g_getenv ("CLAPPER_DISABLE_CACHE");
-
-  if (G_LIKELY (!env || !g_str_has_prefix (env, "1"))) {
-    enum_registry = g_array_new (FALSE, TRUE, sizeof (GEnumValue *));
-    flags_registry = g_array_new (FALSE, TRUE, sizeof (GFlagsValue *));
-  } else {
-    cache_disabled = TRUE;
-  }
-}
-
-GMappedFile *
-clapper_cache_open (const gchar *filename, const gchar **data, GError **error)
-{
-  GMappedFile *file;
-
-  if (G_UNLIKELY (cache_disabled))
-    return NULL;
-
-  if (!(file = g_mapped_file_new (filename, FALSE, error)))
-    return NULL;
-
-  if (G_UNLIKELY (g_mapped_file_get_length (file) == 0)) {
-    g_mapped_file_unref (file);
-    g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-        "File is empty");
-    return NULL;
-  }
-
-  *data = g_mapped_file_get_contents (file);
-
-  /* Header name check */
-  if (G_UNLIKELY (g_strcmp0 (*data, CLAPPER_CACHE_HEADER) != 0)) {
-    g_mapped_file_unref (file);
-    g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-        "Invalid file header");
-    return NULL;
-  }
-  *data += strlen (*data) + 1;
-
-  /* Header version check */
-  if (clapper_cache_read_uint (data) != CLAPPER_VERSION_HEX) {
-    g_mapped_file_unref (file);
-    /* Just different version, so no error set */
-    return NULL;
-  }
-
-  return file;
-}
-
-inline gboolean
-clapper_cache_read_boolean (const gchar **data)
-{
-  gboolean val = *(const gboolean *) *data;
-  *data += sizeof (gboolean);
-
-  return val;
-}
-
-inline gint
-clapper_cache_read_int (const gchar **data)
-{
-  gint val = *(const gint *) *data;
-  *data += sizeof (gint);
-
-  return val;
-}
-
-inline guint
-clapper_cache_read_uint (const gchar **data)
-{
-  guint val = *(const guint *) *data;
-  *data += sizeof (guint);
-
-  return val;
-}
-
-inline gdouble
-clapper_cache_read_double (const gchar **data)
-{
-  gdouble val = *(const gdouble *) *data;
-  *data += sizeof (gdouble);
-
-  return val;
-}
-
-inline const gchar *
-clapper_cache_read_string (const gchar **data)
-{
-  const gboolean is_null = clapper_cache_read_boolean (data);
-  const gchar *str = NULL;
-
-  if (!is_null) {
-    str = *data;
-    *data += strlen (str) + 1;
-  }
-
-  return str;
-}
-
-inline GType
-clapper_cache_read_enum (const gchar **data)
-{
-  GType type;
-  const gchar *enum_name;
-  guint i, n_values;
-
-  enum_name = clapper_cache_read_string (data);
-  n_values = clapper_cache_read_uint (data);
-
-  /* If not registered yet */
-  if ((type = g_type_from_name (enum_name)) == 0) {
-    GEnumValue *values = g_new0 (GEnumValue, n_values + 1);
-
-    for (i = 0; i < n_values; ++i) {
-      values[i].value = clapper_cache_read_int (data);
-      values[i].value_name = g_intern_string (clapper_cache_read_string (data));
-      values[i].value_nick = g_intern_string (clapper_cache_read_string (data));
-    }
-    g_array_append_val (enum_registry, values); // store statically
-
-    type = g_enum_register_static (g_intern_string (enum_name),
-        g_array_index (enum_registry, GEnumValue *, enum_registry->len - 1));
-  } else {
-    /* Skip over data */
-    for (i = 0; i < n_values; ++i) {
-      clapper_cache_read_int (data); // value
-      clapper_cache_read_string (data); // value_name
-      clapper_cache_read_string (data); // value_nick
-    }
-  }
-
-  return type;
-}
-
-inline GType
-clapper_cache_read_flags (const gchar **data)
-{
-  GType type;
-  const gchar *flags_name;
-  guint i, n_values;
-
-  flags_name = clapper_cache_read_string (data);
-  n_values = clapper_cache_read_uint (data);
-
-  /* If not registered yet */
-  if ((type = g_type_from_name (flags_name)) == 0) {
-    GFlagsValue *values = g_new0 (GFlagsValue, n_values + 1);
-
-    for (i = 0; i < n_values; ++i) {
-      values[i].value = clapper_cache_read_int (data);
-      values[i].value_name = g_intern_string (clapper_cache_read_string (data));
-      values[i].value_nick = g_intern_string (clapper_cache_read_string (data));
-    }
-    g_array_append_val (flags_registry, values); // store statically
-
-    type = g_flags_register_static (g_intern_string (flags_name),
-        g_array_index (flags_registry, GFlagsValue *, flags_registry->len - 1));
-  } else {
-    /* Skip over data */
-    for (i = 0; i < n_values; ++i) {
-      clapper_cache_read_int (data); // value
-      clapper_cache_read_string (data); // value_name
-      clapper_cache_read_string (data); // value_nick
-    }
-  }
-
-  return type;
-}
-
-GType
-clapper_cache_read_iface (const gchar **data)
-{
-  gint iface_id = clapper_cache_read_int (data);
-
-  switch (iface_id) {
-    case CLAPPER_CACHE_IFACE_EXTRACTABLE:
-      return CLAPPER_TYPE_EXTRACTABLE;
-    default:
-      return 0;
-  }
-}
-
-GParamSpec *
-clapper_cache_read_pspec (const gchar **data)
-{
-  GParamSpec *pspec;
-  GType value_type;
-  const gchar *name, *nick, *blurb;
-  GParamFlags flags;
-
-  value_type = *(const GType *) *data;
-  *data += sizeof (GType);
-
-  name = clapper_cache_read_string (data);
-  nick = clapper_cache_read_string (data);
-  blurb = clapper_cache_read_string (data);
-
-  flags = *(const GParamFlags *) *data;
-  *data += sizeof (GParamFlags);
-
-  /* NOTE: C does not guarantee order in which function arguments
-   * are evaluated, so read into variables and then create pspec  */
-
-  switch (value_type) {
-    case G_TYPE_BOOLEAN:
-      pspec = g_param_spec_boolean (name, nick, blurb,
-          clapper_cache_read_boolean (data), flags);
-      break;
-    case G_TYPE_INT:{
-      gint minimum = clapper_cache_read_int (data);
-      gint maximum = clapper_cache_read_int (data);
-      gint default_value = clapper_cache_read_int (data);
-
-      pspec = g_param_spec_int (name, nick, blurb,
-          minimum, maximum, default_value, flags);
-      break;
-    }
-    case G_TYPE_UINT:{
-      guint minimum = clapper_cache_read_uint (data);
-      guint maximum = clapper_cache_read_uint (data);
-      guint default_value = clapper_cache_read_uint (data);
-
-      pspec = g_param_spec_uint (name, nick, blurb,
-          minimum, maximum, default_value, flags);
-      break;
-    }
-    case G_TYPE_DOUBLE:{
-      gdouble minimum = clapper_cache_read_double (data);
-      gdouble maximum = clapper_cache_read_double (data);
-      gdouble default_value = clapper_cache_read_double (data);
-
-      pspec = g_param_spec_double (name, nick, blurb,
-          minimum, maximum, default_value, flags);
-      break;
-    }
-    case G_TYPE_STRING:
-      pspec = g_param_spec_string (name, nick, blurb,
-          clapper_cache_read_string (data), flags);
-      break;
-    case G_TYPE_ENUM:{
-      GType enum_type = clapper_cache_read_enum (data);
-      gint default_value = clapper_cache_read_int (data);
-
-      pspec = g_param_spec_enum (name, nick, blurb,
-          enum_type, default_value, flags);
-      break;
-    }
-    case G_TYPE_FLAGS:{
-      GType flags_type = clapper_cache_read_flags (data);
-      guint default_value = clapper_cache_read_uint (data);
-
-      pspec = g_param_spec_flags (name, nick, blurb,
-          flags_type, default_value, flags);
-      break;
-    }
-    default:
-      return NULL;
-  }
-
-  return g_param_spec_ref_sink (pspec);
-}
-
-GByteArray *
-clapper_cache_create (void)
-{
-  GByteArray *bytes;
-
-  if (G_UNLIKELY (cache_disabled))
-    return NULL;
-
-  bytes = g_byte_array_new ();
-
-  /* NOTE: We do not store whether string is NULL here, since it never is */
-  g_byte_array_append (bytes, (const guint8 *) CLAPPER_CACHE_HEADER, 8); // 7 + 1
-  clapper_cache_store_uint (bytes, CLAPPER_VERSION_HEX);
-
-  return bytes;
-}
-
-inline void
-clapper_cache_store_boolean (GByteArray *bytes, gboolean val)
-{
-  g_byte_array_append (bytes, (const guint8 *) &val, sizeof (gboolean));
-}
-
-inline void
-clapper_cache_store_int (GByteArray *bytes, gint val)
-{
-  g_byte_array_append (bytes, (const guint8 *) &val, sizeof (gint));
-}
-
-inline void
-clapper_cache_store_uint (GByteArray *bytes, guint val)
-{
-  g_byte_array_append (bytes, (const guint8 *) &val, sizeof (guint));
-}
-
-inline void
-clapper_cache_store_double (GByteArray *bytes, gdouble val)
-{
-  g_byte_array_append (bytes, (const guint8 *) &val, sizeof (gdouble));
-}
-
-inline void
-clapper_cache_store_string (GByteArray *bytes, const gchar *val)
-{
-  /* Distinguish empty string from NULL */
-  const gboolean is_null = (val == NULL);
-
-  clapper_cache_store_boolean (bytes, is_null);
-  if (!is_null)
-    g_byte_array_append (bytes, (const guint8 *) val, strlen (val) + 1);
-}
-
-inline void
-clapper_cache_store_enum (GByteArray *bytes, GType enum_type)
-{
-  GEnumClass *enum_class = G_ENUM_CLASS (g_type_class_peek (enum_type));
-  guint i;
-
-  clapper_cache_store_string (bytes, g_type_name (enum_type));
-  clapper_cache_store_uint (bytes, enum_class->n_values);
-
-  for (i = 0; i < enum_class->n_values; ++i) {
-    clapper_cache_store_int (bytes, enum_class->values[i].value);
-    clapper_cache_store_string (bytes, enum_class->values[i].value_name);
-    clapper_cache_store_string (bytes, enum_class->values[i].value_nick);
-  }
-}
-
-inline void
-clapper_cache_store_flags (GByteArray *bytes, GType flags_type)
-{
-  GFlagsClass *flags_class = G_FLAGS_CLASS (g_type_class_peek (flags_type));
-  guint i;
-
-  clapper_cache_store_string (bytes, g_type_name (flags_type));
-  clapper_cache_store_uint (bytes, flags_class->n_values);
-
-  for (i = 0; i < flags_class->n_values; ++i) {
-    clapper_cache_store_int (bytes, flags_class->values[i].value);
-    clapper_cache_store_string (bytes, flags_class->values[i].value_name);
-    clapper_cache_store_string (bytes, flags_class->values[i].value_nick);
-  }
-}
-
-gboolean
-clapper_cache_store_iface (GByteArray *bytes, GType iface)
-{
-  gint iface_id = 0;
-
-  if (iface == CLAPPER_TYPE_EXTRACTABLE)
-    iface_id = CLAPPER_CACHE_IFACE_EXTRACTABLE;
-  else
-    return FALSE;
-
-  clapper_cache_store_int (bytes, iface_id);
-  return TRUE;
-}
-
-gboolean
-clapper_cache_store_pspec (GByteArray *bytes, GParamSpec *pspec)
-{
-  GParamFlags flags;
-  const gboolean is_enum = G_IS_PARAM_SPEC_ENUM (pspec);
-  const gboolean is_flags = (!is_enum && G_IS_PARAM_SPEC_FLAGS (pspec));
-
-  if (is_enum) {
-    GType enum_type = G_TYPE_ENUM;
-    g_byte_array_append (bytes, (const guint8 *) &enum_type, sizeof (GType));
-  } else if (is_flags) {
-    GType flags_type = G_TYPE_FLAGS;
-    g_byte_array_append (bytes, (const guint8 *) &flags_type, sizeof (GType));
-  } else {
-    g_byte_array_append (bytes, (const guint8 *) &pspec->value_type, sizeof (GType));
-  }
-
-  clapper_cache_store_string (bytes, g_param_spec_get_name (pspec));
-  clapper_cache_store_string (bytes, g_param_spec_get_nick (pspec));
-  clapper_cache_store_string (bytes, g_param_spec_get_blurb (pspec));
-
-  flags = pspec->flags;
-  flags &= ~G_PARAM_STATIC_STRINGS; // Data read from cache is never static
-  g_byte_array_append (bytes, (const guint8 *) &flags, sizeof (GParamFlags));
-
-  switch (pspec->value_type) {
-    case G_TYPE_BOOLEAN:{
-      GParamSpecBoolean *p = (GParamSpecBoolean *) pspec;
-      clapper_cache_store_boolean (bytes, p->default_value);
-      break;
-    }
-    case G_TYPE_INT:{
-      GParamSpecInt *p = (GParamSpecInt *) pspec;
-      clapper_cache_store_int (bytes, p->minimum);
-      clapper_cache_store_int (bytes, p->maximum);
-      clapper_cache_store_int (bytes, p->default_value);
-      break;
-    }
-    case G_TYPE_UINT:{
-      GParamSpecUInt *p = (GParamSpecUInt *) pspec;
-      clapper_cache_store_uint (bytes, p->minimum);
-      clapper_cache_store_uint (bytes, p->maximum);
-      clapper_cache_store_uint (bytes, p->default_value);
-      break;
-    }
-    case G_TYPE_DOUBLE:{
-      GParamSpecDouble *p = (GParamSpecDouble *) pspec;
-      clapper_cache_store_double (bytes, p->minimum);
-      clapper_cache_store_double (bytes, p->maximum);
-      clapper_cache_store_double (bytes, p->default_value);
-      break;
-    }
-    case G_TYPE_STRING:{
-      GParamSpecString *p = (GParamSpecString *) pspec;
-      clapper_cache_store_string (bytes, p->default_value);
-      break;
-    }
-    default:{
-      if (is_enum) {
-        GParamSpecEnum *p = (GParamSpecEnum *) pspec;
-        clapper_cache_store_enum (bytes, pspec->value_type);
-        clapper_cache_store_int (bytes, p->default_value);
-        break;
-      } else if (is_flags) {
-        GParamSpecFlags *p = (GParamSpecFlags *) pspec;
-        clapper_cache_store_flags (bytes, pspec->value_type);
-        clapper_cache_store_uint (bytes, p->default_value);
-        break;
-      }
-      return FALSE;
-    }
-  }
-
-  return TRUE;
-}
-
-gboolean
-clapper_cache_write (const gchar *filename, GByteArray *bytes, GError **error)
-{
-  gchar *dirname = g_path_get_dirname (filename);
-  gboolean has_dir;
-
-  has_dir = (g_mkdir_with_parents (dirname, 0755) == 0);
-  g_free (dirname);
-
-  if (!has_dir) {
-    g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-        "Could not create directory to store cache content");
-    return FALSE;
-  }
-
-  /* Using "g_file_set_contents" to replace file atomically */
-  return g_file_set_contents (filename, (const gchar *) bytes->data, bytes->len, error);
-}
--- a/src/lib/clapper/clapper-enhancer-proxy-list-private.h
+++ b/src/lib/clapper/clapper-enhancer-proxy-list-private.h
@@ -1,41 +0,0 @@
-/* Clapper Playback Library
- * Copyright (C) 2025 Rafał Dzięgiel <rafostar.github@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-#include <glib.h>
-
-#include "clapper-enhancer-proxy-list.h"
-#include "clapper-enhancer-proxy.h"
-
-G_BEGIN_DECLS
-
-G_GNUC_INTERNAL
-ClapperEnhancerProxyList * clapper_enhancer_proxy_list_new_named (const gchar *name);
-
-G_GNUC_INTERNAL
-void clapper_enhancer_proxy_list_take_proxy (ClapperEnhancerProxyList *list, ClapperEnhancerProxy *proxy);
-
-G_GNUC_INTERNAL
-void clapper_enhancer_proxy_list_fill_from_global_proxies (ClapperEnhancerProxyList *list);
-
-G_GNUC_INTERNAL
-void clapper_enhancer_proxy_list_sort (ClapperEnhancerProxyList *list);
-
-G_END_DECLS
--- a/src/lib/clapper/clapper-enhancer-proxy-list.c
+++ b/src/lib/clapper/clapper-enhancer-proxy-list.c
@@ -1,329 +0,0 @@
-/* Clapper Playback Library
- * Copyright (C) 2025 Rafał Dzięgiel <rafostar.github@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/**
- * ClapperEnhancerProxyList:
- *
- * A list of enhancer proxies.
- *
- * Since: 0.10
- */
-
-#include <gio/gio.h>
-
-#include "clapper-basic-functions.h"
-#include "clapper-enhancer-proxy-list-private.h"
-#include "clapper-enhancer-proxy-private.h"
-
-#define GST_CAT_DEFAULT clapper_enhancer_proxy_list_debug
-GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
-
-struct _ClapperEnhancerProxyList
-{
-  GstObject parent;
-
-  GPtrArray *proxies;
-};
-
-enum
-{
-  PROP_0,
-  PROP_N_PROXIES,
-  PROP_LAST
-};
-
-static void clapper_enhancer_proxy_list_model_iface_init (GListModelInterface *iface);
-
-#define parent_class clapper_enhancer_proxy_list_parent_class
-G_DEFINE_TYPE_WITH_CODE (ClapperEnhancerProxyList, clapper_enhancer_proxy_list, GST_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, clapper_enhancer_proxy_list_model_iface_init));
-
-static GParamSpec *param_specs[PROP_LAST] = { NULL, };
-
-static GType
-clapper_enhancer_proxy_list_model_get_item_type (GListModel *model)
-{
-  return CLAPPER_TYPE_ENHANCER_PROXY;
-}
-
-static guint
-clapper_enhancer_proxy_list_model_get_n_items (GListModel *model)
-{
-  return CLAPPER_ENHANCER_PROXY_LIST_CAST (model)->proxies->len;
-}
-
-static gpointer
-clapper_enhancer_proxy_list_model_get_item (GListModel *model, guint index)
-{
-  ClapperEnhancerProxyList *self = CLAPPER_ENHANCER_PROXY_LIST_CAST (model);
-  ClapperEnhancerProxy *proxy = NULL;
-
-  if (G_LIKELY (index < self->proxies->len))
-    proxy = gst_object_ref (g_ptr_array_index (self->proxies, index));
-
-  return proxy;
-}
-
-static void
-clapper_enhancer_proxy_list_model_iface_init (GListModelInterface *iface)
-{
-  iface->get_item_type = clapper_enhancer_proxy_list_model_get_item_type;
-  iface->get_n_items = clapper_enhancer_proxy_list_model_get_n_items;
-  iface->get_item = clapper_enhancer_proxy_list_model_get_item;
-}
-
-/*
- * clapper_enhancer_proxy_list_new_named:
- * @name: (nullable): name of the #GstObject
- *
- * Returns: (transfer full): a new #ClapperEnhancerProxyList instance
- */
-ClapperEnhancerProxyList *
-clapper_enhancer_proxy_list_new_named (const gchar *name)
-{
-  ClapperEnhancerProxyList *list;
-
-  list = g_object_new (CLAPPER_TYPE_ENHANCER_PROXY_LIST,
-      "name", name, NULL);
-  gst_object_ref_sink (list);
-
-  return list;
-}
-
-void
-clapper_enhancer_proxy_list_take_proxy (ClapperEnhancerProxyList *self, ClapperEnhancerProxy *proxy)
-{
-  g_ptr_array_add (self->proxies, proxy);
-  gst_object_set_parent (GST_OBJECT_CAST (proxy), GST_OBJECT_CAST (self));
-}
-
-/*
- * clapper_enhancer_proxy_list_fill_from_global_proxies:
- *
- * Fill list with unconfigured proxies from global proxies list.
- */
-void
-clapper_enhancer_proxy_list_fill_from_global_proxies (ClapperEnhancerProxyList *self)
-{
-  ClapperEnhancerProxyList *global_list = clapper_get_global_enhancer_proxies ();
-  static guint _list_id = 0;
-  guint i;
-
-  for (i = 0; i < global_list->proxies->len; ++i) {
-    ClapperEnhancerProxy *proxy, *proxy_copy;
-    gchar obj_name[64];
-
-    proxy = clapper_enhancer_proxy_list_peek_proxy (global_list, i);
-
-    /* Name newly created proxy, very useful for debugging. Keep index per
-     * list, so it will be the same as the player that proxy belongs to. */
-    g_snprintf (obj_name, sizeof (obj_name), "%s-proxy%u",
-        clapper_enhancer_proxy_get_friendly_name (proxy), _list_id);
-    proxy_copy = clapper_enhancer_proxy_copy (proxy, obj_name);
-
-    clapper_enhancer_proxy_list_take_proxy (self, proxy_copy);
-  }
-  _list_id++;
-}
-
-static gint
-_sort_values_by_name (ClapperEnhancerProxy *proxy_a, ClapperEnhancerProxy *proxy_b)
-{
-  return g_ascii_strcasecmp (
-      clapper_enhancer_proxy_get_friendly_name (proxy_a),
-      clapper_enhancer_proxy_get_friendly_name (proxy_b));
-}
-
-/*
- * clapper_enhancer_proxy_list_sort:
- *
- * Sort all list elements by enhancer friendly name.
- */
-void
-clapper_enhancer_proxy_list_sort (ClapperEnhancerProxyList *self)
-{
-  g_ptr_array_sort_values (self->proxies, (GCompareFunc) _sort_values_by_name);
-}
-
-/**
- * clapper_enhancer_proxy_list_get_proxy:
- * @list: a #ClapperEnhancerProxyList
- * @index: an enhancer proxy index
- *
- * Get the #ClapperEnhancerProxy at index.
- *
- * This behaves the same as [method@Gio.ListModel.get_item], and is here
- * for code uniformity and convenience to avoid type casting by user.
- *
- * Returns: (transfer full) (nullable): The #ClapperEnhancerProxy at @index.
- *
- * Since: 0.10
- */
-ClapperEnhancerProxy *
-clapper_enhancer_proxy_list_get_proxy (ClapperEnhancerProxyList *self, guint index)
-{
-  g_return_val_if_fail (CLAPPER_IS_ENHANCER_PROXY_LIST (self), NULL);
-
-  return g_list_model_get_item (G_LIST_MODEL (self), index);
-}
-
-/**
- * clapper_enhancer_proxy_list_peek_proxy: (skip)
- * @list: a #ClapperEnhancerProxyList
- * @index: an enhancer proxy index
- *
- * Get the #ClapperEnhancerProxy at index.
- *
- * Similar to [method@Clapper.EnhancerProxyList.get_proxy], but does not take
- * a new reference on proxy.
- *
- * Proxies in a list are only removed when a [class@Clapper.Player] instance
- * they originate from is destroyed, so do not use returned object afterwards
- * unless you take an additional reference on it.
- *
- * Returns: (transfer none) (nullable): The #ClapperEnhancerProxy at @index.
- *
- * Since: 0.10
- */
-ClapperEnhancerProxy *
-clapper_enhancer_proxy_list_peek_proxy (ClapperEnhancerProxyList *self, guint index)
-{
-  g_return_val_if_fail (CLAPPER_IS_ENHANCER_PROXY_LIST (self), NULL);
-
-  return g_ptr_array_index (self->proxies, index);
-}
-
-/**
- * clapper_enhancer_proxy_list_get_proxy_by_module:
- * @list: a #ClapperEnhancerProxyList
- * @module_name: an enhancer module name
- *
- * Get the #ClapperEnhancerProxy by module name as defined in its plugin file.
- *
- * A convenience function to find a #ClapperEnhancerProxy by its unique
- * module name in the list.
- *
- * Returns: (transfer full) (nullable): The #ClapperEnhancerProxy with requested module name.
- *
- * Since: 0.10
- */
-ClapperEnhancerProxy *
-clapper_enhancer_proxy_list_get_proxy_by_module (ClapperEnhancerProxyList *self, const gchar *module_name)
-{
-  guint i;
-
-  g_return_val_if_fail (CLAPPER_IS_ENHANCER_PROXY_LIST (self), NULL);
-  g_return_val_if_fail (module_name != NULL, NULL);
-
-  for (i = 0; i < self->proxies->len; ++i) {
-    ClapperEnhancerProxy *proxy = g_ptr_array_index (self->proxies, i);
-
-    if (strcmp (clapper_enhancer_proxy_get_module_name (proxy), module_name) == 0)
-      return gst_object_ref (proxy);
-  }
-
-  return NULL;
-}
-
-/**
- * clapper_enhancer_proxy_list_get_n_proxies:
- * @list: a #ClapperEnhancerProxyList
- *
- * Get the number of proxies in #ClapperEnhancerProxyList.
- *
- * This behaves the same as [method@Gio.ListModel.get_n_items], and is here
- * for code uniformity and convenience to avoid type casting by user.
- *
- * Returns: The number of proxies in #ClapperEnhancerProxyList.
- *
- * Since: 0.10
- */
-guint
-clapper_enhancer_proxy_list_get_n_proxies (ClapperEnhancerProxyList *self)
-{
-  g_return_val_if_fail (CLAPPER_IS_ENHANCER_PROXY_LIST (self), 0);
-
-  return g_list_model_get_n_items (G_LIST_MODEL (self));
-}
-
-static void
-_proxy_remove_func (ClapperEnhancerProxy *proxy)
-{
-  gst_object_unparent (GST_OBJECT_CAST (proxy));
-  gst_object_unref (proxy);
-}
-
-static void
-clapper_enhancer_proxy_list_init (ClapperEnhancerProxyList *self)
-{
-  self->proxies = g_ptr_array_new_with_free_func ((GDestroyNotify) _proxy_remove_func);
-}
-
-static void
-clapper_enhancer_proxy_list_finalize (GObject *object)
-{
-  ClapperEnhancerProxyList *self = CLAPPER_ENHANCER_PROXY_LIST_CAST (object);
-
-  GST_TRACE_OBJECT (self, "Finalize");
-
-  g_ptr_array_unref (self->proxies);
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-clapper_enhancer_proxy_list_get_property (GObject *object, guint prop_id,
-    GValue *value, GParamSpec *pspec)
-{
-  ClapperEnhancerProxyList *self = CLAPPER_ENHANCER_PROXY_LIST_CAST (object);
-
-  switch (prop_id) {
-    case PROP_N_PROXIES:
-      g_value_set_uint (value, clapper_enhancer_proxy_list_get_n_proxies (self));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-clapper_enhancer_proxy_list_class_init (ClapperEnhancerProxyListClass *klass)
-{
-  GObjectClass *gobject_class = (GObjectClass *) klass;
-
-  GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "clapperenhancerproxylist", 0,
-      "Clapper Enhancer Proxy List");
-
-  gobject_class->get_property = clapper_enhancer_proxy_list_get_property;
-  gobject_class->finalize = clapper_enhancer_proxy_list_finalize;
-
-  /**
-   * ClapperEnhancerProxyList:n-proxies:
-   *
-   * Number of proxies in the list.
-   *
-   * Since: 0.10
-   */
-  param_specs[PROP_N_PROXIES] = g_param_spec_uint ("n-proxies",
-      NULL, NULL, 0, G_MAXUINT, 0,
-      G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (gobject_class, PROP_LAST, param_specs);
-}
--- a/src/lib/clapper/clapper-enhancer-proxy-list.h
+++ b/src/lib/clapper/clapper-enhancer-proxy-list.h
@@ -1,53 +0,0 @@
-/* Clapper Playback Library
- * Copyright (C) 2025 Rafał Dzięgiel <rafostar.github@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-#if !defined(__CLAPPER_INSIDE__) && !defined(CLAPPER_COMPILATION)
-#error "Only <clapper/clapper.h> can be included directly."
-#endif
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gst/gst.h>
-
-#include <clapper/clapper-visibility.h>
-#include <clapper/clapper-enhancer-proxy.h>
-
-G_BEGIN_DECLS
-
-#define CLAPPER_TYPE_ENHANCER_PROXY_LIST (clapper_enhancer_proxy_list_get_type())
-#define CLAPPER_ENHANCER_PROXY_LIST_CAST(obj) ((ClapperEnhancerProxyList *)(obj))
-
-CLAPPER_API
-G_DECLARE_FINAL_TYPE (ClapperEnhancerProxyList, clapper_enhancer_proxy_list, CLAPPER, ENHANCER_PROXY_LIST, GstObject)
-
-CLAPPER_API
-ClapperEnhancerProxy * clapper_enhancer_proxy_list_get_proxy (ClapperEnhancerProxyList *list, guint index);
-
-CLAPPER_API
-ClapperEnhancerProxy * clapper_enhancer_proxy_list_peek_proxy (ClapperEnhancerProxyList *list, guint index);
-
-CLAPPER_API
-ClapperEnhancerProxy * clapper_enhancer_proxy_list_get_proxy_by_module (ClapperEnhancerProxyList *list, const gchar *module_name);
-
-CLAPPER_API
-guint clapper_enhancer_proxy_list_get_n_proxies (ClapperEnhancerProxyList *list);
-
-G_END_DECLS
--- a/src/lib/clapper/clapper-enhancer-proxy-private.h
+++ b/src/lib/clapper/clapper-enhancer-proxy-private.h
@@ -1,50 +0,0 @@
-/* Clapper Playback Library
- * Copyright (C) 2025 Rafał Dzięgiel <rafostar.github@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include "clapper-enhancer-proxy.h"
-
-G_BEGIN_DECLS
-
-G_GNUC_INTERNAL
-ClapperEnhancerProxy * clapper_enhancer_proxy_new_global_take (GObject *peas_info); // Using parent type for building without libpeas
-
-G_GNUC_INTERNAL
-ClapperEnhancerProxy * clapper_enhancer_proxy_copy (ClapperEnhancerProxy *src_proxy, const gchar *copy_name);
-
-G_GNUC_INTERNAL
-gboolean clapper_enhancer_proxy_fill_from_cache (ClapperEnhancerProxy *proxy);
-
-G_GNUC_INTERNAL
-gboolean clapper_enhancer_proxy_fill_from_instance (ClapperEnhancerProxy *proxy, GObject *enhancer);
-
-G_GNUC_INTERNAL
-void clapper_enhancer_proxy_export_to_cache (ClapperEnhancerProxy *proxy);
-
-G_GNUC_INTERNAL
-GObject * clapper_enhancer_proxy_get_peas_info (ClapperEnhancerProxy *proxy);
-
-G_GNUC_INTERNAL
-void clapper_enhancer_proxy_apply_current_config_to_enhancer (ClapperEnhancerProxy *proxy, GObject *enhancer);
-
-G_END_DECLS
--- a/src/lib/clapper/clapper-enhancer-proxy.c
+++ b/src/lib/clapper/clapper-enhancer-proxy.c
--- a/src/lib/clapper/clapper-enhancer-proxy.h
+++ b/src/lib/clapper/clapper-enhancer-proxy.h
@@ -1,80 +0,0 @@
-/* Clapper Playback Library
- * Copyright (C) 2025 Rafał Dzięgiel <rafostar.github@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-#if !defined(__CLAPPER_INSIDE__) && !defined(CLAPPER_COMPILATION)
-#error "Only <clapper/clapper.h> can be included directly."
-#endif
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gio/gio.h>
-#include <gst/gst.h>
-
-#include <clapper/clapper-visibility.h>
-
-G_BEGIN_DECLS
-
-#define CLAPPER_TYPE_ENHANCER_PROXY (clapper_enhancer_proxy_get_type())
-#define CLAPPER_ENHANCER_PROXY_CAST(obj) ((ClapperEnhancerProxy *)(obj))
-
-CLAPPER_API
-G_DECLARE_FINAL_TYPE (ClapperEnhancerProxy, clapper_enhancer_proxy, CLAPPER, ENHANCER_PROXY, GstObject)
-
-CLAPPER_API
-const gchar * clapper_enhancer_proxy_get_friendly_name (ClapperEnhancerProxy *proxy);
-
-CLAPPER_API
-const gchar * clapper_enhancer_proxy_get_module_name (ClapperEnhancerProxy *proxy);
-
-CLAPPER_API
-const gchar * clapper_enhancer_proxy_get_module_dir (ClapperEnhancerProxy *proxy);
-
-CLAPPER_API
-const gchar * clapper_enhancer_proxy_get_description (ClapperEnhancerProxy *proxy);
-
-CLAPPER_API
-const gchar * clapper_enhancer_proxy_get_version (ClapperEnhancerProxy *proxy);
-
-CLAPPER_API
-const gchar * clapper_enhancer_proxy_get_extra_data (ClapperEnhancerProxy *proxy, const gchar *key);
-
-CLAPPER_API
-gboolean clapper_enhancer_proxy_extra_data_lists_value (ClapperEnhancerProxy *proxy, const gchar *key, const gchar *value);
-
-CLAPPER_API
-GType * clapper_enhancer_proxy_get_target_interfaces (ClapperEnhancerProxy *proxy, guint *n_interfaces);
-
-CLAPPER_API
-gboolean clapper_enhancer_proxy_target_has_interface (ClapperEnhancerProxy *proxy, GType iface_type);
-
-CLAPPER_API
-GParamSpec ** clapper_enhancer_proxy_get_target_properties (ClapperEnhancerProxy *proxy, guint *n_properties);
-
-CLAPPER_API
-GSettings * clapper_enhancer_proxy_get_settings (ClapperEnhancerProxy *proxy);
-
-CLAPPER_API
-void clapper_enhancer_proxy_set_locally (ClapperEnhancerProxy *proxy, const gchar *first_property_name, ...) G_GNUC_NULL_TERMINATED;
-
-CLAPPER_API
-void clapper_enhancer_proxy_set_locally_with_table (ClapperEnhancerProxy *proxy, GHashTable *table);
-
-G_END_DECLS
--- a/src/lib/clapper/clapper-enhancers-loader-private.h
+++ b/src/lib/clapper/clapper-enhancers-loader-private.h
@@ -22,15 +22,21 @@
 #include <glib.h>
 #include <glib-object.h>

-#include "clapper-enhancer-proxy-list.h"
-#include "clapper-enhancer-proxy.h"
-
 G_BEGIN_DECLS

 G_GNUC_INTERNAL
-void clapper_enhancers_loader_initialize (ClapperEnhancerProxyList *proxies);
+void clapper_enhancers_loader_initialize (void);

 G_GNUC_INTERNAL
-GObject * clapper_enhancers_loader_create_enhancer (ClapperEnhancerProxy *proxy, GType iface_type);
+gboolean clapper_enhancers_loader_has_enhancers (GType iface_type);
+
+G_GNUC_INTERNAL
+gchar ** clapper_enhancers_loader_get_schemes (GType iface_type);
+
+G_GNUC_INTERNAL
+gboolean clapper_enhancers_loader_check (GType iface_type, const gchar *scheme, const gchar *host, const gchar **name);
+
+G_GNUC_INTERNAL
+GObject * clapper_enhancers_loader_create_enhancer_for_uri (GType iface_type, GUri *uri);

 G_END_DECLS
--- a/src/lib/clapper/clapper-enhancers-loader.c
+++ b/src/lib/clapper/clapper-enhancers-loader.c
@@ -28,11 +28,11 @@ static HMODULE _enhancers_dll_handle = NULL;
 #endif

 #include "clapper-enhancers-loader-private.h"
-#include "clapper-enhancer-proxy-list-private.h"
-#include "clapper-enhancer-proxy-private.h"

-// Supported interfaces
-#include "clapper-extractable.h"
+#define ENHANCER_INTERFACES "X-Interfaces"
+#define ENHANCER_SCHEMES "X-Schemes"
+#define ENHANCER_HOSTS "X-Hosts"
+#define ENHANCER_IFACE_NAME_FROM_TYPE(type) (g_type_name (type) + 7) // strip "Clapper" prefix

 #define GST_CAT_DEFAULT clapper_enhancers_loader_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
@@ -58,11 +58,10 @@ _import_enhancers (const gchar *enhancers_path)
 * Initializes #PeasEngine with directories that store enhancers.
 */
 void
-clapper_enhancers_loader_initialize (ClapperEnhancerProxyList *proxies)
+clapper_enhancers_loader_initialize (void)
 {
  const gchar *enhancers_path;
  gchar *custom_path = NULL;
-  guint i, n_items;

  GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "clapperenhancersloader", 0,
      "Clapper Enhancer Loader");
@@ -75,8 +74,9 @@ clapper_enhancers_loader_initialize (ClapperEnhancerProxyList *proxies)

    win_base_dir = g_win32_get_package_installation_directory_of_module (
        _enhancers_dll_handle);
+    /* FIXME: Avoid hardcoded major version */
    custom_path = g_build_filename (win_base_dir,
-        "lib", CLAPPER_API_NAME, "enhancers", NULL);
+        "lib", "clapper-0.0", "enhancers", NULL);
    enhancers_path = custom_path; // assign temporarily

    g_free (win_base_dir);
@@ -104,85 +104,321 @@ clapper_enhancers_loader_initialize (ClapperEnhancerProxyList *proxies)
    _import_enhancers (enhancers_path);
  }

-  n_items = g_list_model_get_n_items ((GListModel *) _engine);
-  for (i = 0; i < n_items; ++i) {
-    PeasPluginInfo *info = (PeasPluginInfo *) g_list_model_get_item ((GListModel *) _engine, i);
-    ClapperEnhancerProxy *proxy;
-    gboolean filled;
+  if (gst_debug_category_get_threshold (GST_CAT_DEFAULT) >= GST_LEVEL_INFO) {
+    GListModel *list = (GListModel *) _engine;
+    guint i, n_items = g_list_model_get_n_items (list);

-    /* Clapper supports only 1 proxy per plugin. Each plugin can
-     * ship 1 class, but it can implement more than 1 interface. */
-    proxy = clapper_enhancer_proxy_new_global_take ((GObject *) info);
-
-    /* Try to fill missing data from cache (fast).
-     * Otherwise make an instance and fill missing data from it (slow). */
-    if (!(filled = clapper_enhancer_proxy_fill_from_cache (proxy))) {
-      GObject *enhancer;
-      GType main_types[1] = { CLAPPER_TYPE_EXTRACTABLE };
-      guint j;
-
-      /* We cannot ask libpeas for "any" of our main interfaces, so try each one until found */
-      for (j = 0; j < G_N_ELEMENTS (main_types); ++j) {
-        if ((enhancer = clapper_enhancers_loader_create_enhancer (proxy, main_types[j]))) {
-          filled = clapper_enhancer_proxy_fill_from_instance (proxy, enhancer);
-          g_object_unref (enhancer);
-
-          clapper_enhancer_proxy_export_to_cache (proxy);
-          break;
-        }
-      }
+    for (i = 0; i < n_items; ++i) {
+      PeasPluginInfo *info = (PeasPluginInfo *) g_list_model_get_item (list, i);
+      GST_INFO ("Found enhancer: %s (%s)", peas_plugin_info_get_name (info),
+          peas_plugin_info_get_external_data (info, ENHANCER_INTERFACES));
+      g_object_unref (info);
    }

-    if (G_LIKELY (filled)) {
-      GST_INFO ("Found enhancer: \"%s\" (%s)",
-          clapper_enhancer_proxy_get_friendly_name (proxy),
-          clapper_enhancer_proxy_get_module_name (proxy));
-      clapper_enhancer_proxy_list_take_proxy (proxies, proxy);
-    } else {
-      GST_WARNING ("Enhancer init failed: \"%s\" (%s)",
-          clapper_enhancer_proxy_get_friendly_name (proxy),
-          clapper_enhancer_proxy_get_module_name (proxy));
-      gst_object_unref (proxy);
-    }
+    GST_INFO ("Clapper enhancers initialized, found: %u", n_items);
  }

-  clapper_enhancer_proxy_list_sort (proxies);
-
-  GST_INFO ("Clapper enhancers initialized, found: %u",
-      clapper_enhancer_proxy_list_get_n_proxies (proxies));
-
  g_free (custom_path);
 }

+static inline gboolean
+_is_name_listed (const gchar *name, const gchar *list_str)
+{
+  gsize name_len = strlen (name);
+  guint i = 0;
+
+  while (list_str[i] != '\0') {
+    guint end = i;
+
+    while (list_str[end] != ';' && list_str[end] != '\0')
+      ++end;
+
+    /* Compare letters count until separator and prefix of whole string */
+    if (end - i == name_len && g_str_has_prefix (list_str + i, name))
+      return TRUE;
+
+    i = end;
+
+    /* Move to the next letter after ';' */
+    if (list_str[i] != '\0')
+      ++i;
+  }
+
+  return FALSE;
+}
+
 /*
- * clapper_enhancers_loader_create_enhancer:
- * @iface_type: a requested #GType
- * @info: a #PeasPluginInfo
+ * clapper_enhancers_loader_get_info:
+ * @iface_type: an interface #GType
+ * @scheme: an URI scheme
+ * @host: (nullable): an URI host
 *
- * Creates a new enhancer object using @info.
+ * Returns: (transfer full) (nullable): available #PeasPluginInfo or %NULL.
+ */
+static PeasPluginInfo *
+clapper_enhancers_loader_get_info (GType iface_type, const gchar *scheme, const gchar *host)
+{
+  GListModel *list = (GListModel *) _engine;
+  PeasPluginInfo *found_info = NULL;
+  guint i, n_plugins = g_list_model_get_n_items (list);
+  const gchar *iface_name;
+  gboolean is_https;
+
+  if (n_plugins == 0) {
+    GST_INFO ("No Clapper enhancers found");
+    return NULL;
+  }
+
+  iface_name = ENHANCER_IFACE_NAME_FROM_TYPE (iface_type);
+
+  /* Strip common subdomains, so plugins do not
+   * have to list all combinations */
+  if (host) {
+    if (g_str_has_prefix (host, "www."))
+      host += 4;
+    else if (g_str_has_prefix (host, "m."))
+      host += 2;
+  }
+
+  GST_INFO ("Enhancer check, iface: %s, scheme: %s, host: %s",
+      iface_name, scheme, GST_STR_NULL (host));
+
+  is_https = (g_str_has_prefix (scheme, "http")
+      && (scheme[4] == '\0' || (scheme[4] == 's' && scheme[5] == '\0')));
+
+  if (!host && is_https)
+    return NULL;
+
+  for (i = 0; i < n_plugins; ++i) {
+    PeasPluginInfo *info = (PeasPluginInfo *) g_list_model_get_item (list, i);
+    const gchar *iface_names, *schemes, *hosts;
+
+    if (!(iface_names = peas_plugin_info_get_external_data (info, ENHANCER_INTERFACES))) {
+      GST_DEBUG ("Skipping enhancer without interfaces: %s", peas_plugin_info_get_name (info));
+      g_object_unref (info);
+      continue;
+    }
+    if (!_is_name_listed (iface_name, iface_names)) {
+      g_object_unref (info);
+      continue;
+    }
+    if (!(schemes = peas_plugin_info_get_external_data (info, ENHANCER_SCHEMES))) {
+      GST_DEBUG ("Skipping enhancer without schemes: %s", peas_plugin_info_get_name (info));
+      g_object_unref (info);
+      continue;
+    }
+    if (!_is_name_listed (scheme, schemes)) {
+      g_object_unref (info);
+      continue;
+    }
+    if (is_https) {
+      if (!(hosts = peas_plugin_info_get_external_data (info, ENHANCER_HOSTS))) {
+        GST_DEBUG ("Skipping enhancer without hosts: %s", peas_plugin_info_get_name (info));
+        g_object_unref (info);
+        continue;
+      }
+      if (!_is_name_listed (host, hosts)) {
+        g_object_unref (info);
+        continue;
+      }
+    }
+
+    found_info = info;
+    break;
+  }
+
+  return found_info;
+}
+
+/*
+ * clapper_enhancers_loader_has_enhancers:
+ * @iface_type: an interface #GType
+ *
+ * Check if any enhancer implementing given interface type is available.
+ *
+ * Returns: whether any valid enhancer was found.
+ */
+gboolean
+clapper_enhancers_loader_has_enhancers (GType iface_type)
+{
+  GListModel *list = (GListModel *) _engine;
+  const gchar *iface_name = ENHANCER_IFACE_NAME_FROM_TYPE (iface_type);
+  guint i, n_plugins;
+
+  GST_DEBUG ("Checking for any enhancers of type: \"%s\"", iface_name);
+
+  n_plugins = g_list_model_get_n_items (list);
+
+  for (i = 0; i < n_plugins; ++i) {
+    PeasPluginInfo *info = (PeasPluginInfo *) g_list_model_get_item (list, i);
+    const gchar *iface_names;
+
+    if (!(iface_names = peas_plugin_info_get_external_data (info, ENHANCER_INTERFACES))) {
+      g_object_unref (info);
+      continue;
+    }
+    if (!_is_name_listed (iface_name, iface_names)) {
+      g_object_unref (info);
+      continue;
+    }
+
+    /* Additional validation */
+    if (!peas_plugin_info_get_external_data (info, ENHANCER_SCHEMES)
+        || !peas_plugin_info_get_external_data (info, ENHANCER_HOSTS)) {
+      g_object_unref (info);
+      continue;
+    }
+
+    GST_DEBUG ("Found valid enhancers of type: \"%s\"", iface_name);
+    g_object_unref (info);
+
+    return TRUE;
+  }
+
+  GST_DEBUG ("No available enhancers of type: \"%s\"", iface_name);
+
+  return FALSE;
+}
+
+/*
+ * clapper_enhancers_loader_get_schemes:
+ * @iface_type: an interface #GType
+ *
+ * Get all supported schemes for a given interface type.
+ * The returned array consists of unique strings (no duplicates).
+ *
+ * Returns: (transfer full): all supported schemes by enhancers of type.
+ */
+gchar **
+clapper_enhancers_loader_get_schemes (GType iface_type)
+{
+  GListModel *list = (GListModel *) _engine;
+  GSList *found_schemes = NULL, *fs;
+  const gchar *iface_name = ENHANCER_IFACE_NAME_FROM_TYPE (iface_type);
+  gchar **schemes_strv;
+  guint i, n_plugins, n_schemes;
+
+  GST_DEBUG ("Checking supported URI schemes for \"%s\"", iface_name);
+
+  n_plugins = g_list_model_get_n_items (list);
+
+  for (i = 0; i < n_plugins; ++i) {
+    PeasPluginInfo *info = (PeasPluginInfo *) g_list_model_get_item (list, i);
+    const gchar *iface_names, *schemes;
+    gchar **tmp_strv;
+    gint j;
+
+    if (!(iface_names = peas_plugin_info_get_external_data (info, ENHANCER_INTERFACES))) {
+      g_object_unref (info);
+      continue;
+    }
+    if (!_is_name_listed (iface_name, iface_names)) {
+      g_object_unref (info);
+      continue;
+    }
+    if (!(schemes = peas_plugin_info_get_external_data (info, ENHANCER_SCHEMES))) {
+      g_object_unref (info);
+      continue;
+    }
+
+    tmp_strv = g_strsplit (schemes, ";", 0);
+
+    for (j = 0; tmp_strv[j]; ++j) {
+      const gchar *scheme = tmp_strv[j];
+
+      if (!found_schemes || !g_slist_find_custom (found_schemes,
+          scheme, (GCompareFunc) strcmp)) {
+        found_schemes = g_slist_append (found_schemes, g_strdup (scheme));
+        GST_INFO ("Found supported URI scheme: %s", scheme);
+      }
+    }
+
+    g_strfreev (tmp_strv);
+    g_object_unref (info);
+  }
+
+  n_schemes = g_slist_length (found_schemes);
+  schemes_strv = g_new0 (gchar *, n_schemes + 1);
+
+  fs = found_schemes;
+  for (i = 0; i < n_schemes; ++i) {
+    schemes_strv[i] = fs->data;
+    fs = fs->next;
+  }
+
+  GST_DEBUG ("Total found URI schemes: %u", n_schemes);
+
+  /* Since string pointers were taken,
+   * free list without content */
+  g_slist_free (found_schemes);
+
+  return schemes_strv;
+}
+
+/*
+ * clapper_enhancers_loader_check:
+ * @iface_type: a requested #GType
+ * @scheme: an URI scheme
+ * @host: (nullable): an URI host
+ * @name: (out) (optional) (transfer none): return location for found enhancer name
+ *
+ * Checks if any enhancer can handle @uri without initializing loader
+ * or creating enhancer instance, thus this can be used freely from any thread.
+ *
+ * Returns: whether enhancer for given scheme and host is available.
+ */
+gboolean
+clapper_enhancers_loader_check (GType iface_type,
+    const gchar *scheme, const gchar *host, const gchar **name)
+{
+  PeasPluginInfo *info;
+
+  if ((info = clapper_enhancers_loader_get_info (iface_type, scheme, host))) {
+    if (name)
+      *name = peas_plugin_info_get_name (info);
+
+    g_object_unref (info);
+
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+/*
+ * clapper_enhancers_loader_create_enhancer_for_uri:
+ * @iface_type: a requested #GType
+ * @uri: a #GUri
+ *
+ * Creates a new enhancer object for given URI.
 *
 * Enhancer should only be created and used within single thread.
 *
 * Returns: (transfer full) (nullable): a new enhancer instance.
 */
 GObject *
-clapper_enhancers_loader_create_enhancer (ClapperEnhancerProxy *proxy, GType iface_type)
+clapper_enhancers_loader_create_enhancer_for_uri (GType iface_type, GUri *uri)
 {
  GObject *enhancer = NULL;
-  PeasPluginInfo *info = (PeasPluginInfo *) clapper_enhancer_proxy_get_peas_info (proxy);
+  PeasPluginInfo *info;
+  const gchar *scheme = g_uri_get_scheme (uri);
+  const gchar *host = g_uri_get_host (uri);

-  g_mutex_lock (&load_lock);
+  if ((info = clapper_enhancers_loader_get_info (iface_type, scheme, host))) {
+    g_mutex_lock (&load_lock);

-  if (!peas_plugin_info_is_loaded (info) && !peas_engine_load_plugin (_engine, info)) {
-    GST_ERROR ("Could not load enhancer: %s", peas_plugin_info_get_module_name (info));
-  } else if (!peas_engine_provides_extension (_engine, info, iface_type)) {
-    GST_LOG ("No \"%s\" enhancer in module: %s", g_type_name (iface_type),
-        peas_plugin_info_get_module_name (info));
-  } else {
-    enhancer = peas_engine_create_extension (_engine, info, iface_type, NULL);
+    if (!peas_plugin_info_is_loaded (info) && !peas_engine_load_plugin (_engine, info)) {
+      GST_ERROR ("Could not load enhancer: %s", peas_plugin_info_get_name (info));
+    } else if (!peas_engine_provides_extension (_engine, info, iface_type)) {
+      GST_ERROR ("No \"%s\" enhancer in plugin: %s", ENHANCER_IFACE_NAME_FROM_TYPE (iface_type),
+          peas_plugin_info_get_name (info));
+    } else {
+      enhancer = peas_engine_create_extension (_engine, info, iface_type, NULL);
+    }
+
+    g_mutex_unlock (&load_lock);
+    g_object_unref (info);
  }

-  g_mutex_unlock (&load_lock);
-
  return enhancer;
 }
--- a/src/lib/clapper/clapper-enums.h
+++ b/src/lib/clapper/clapper-enums.h
@@ -127,28 +127,4 @@ typedef enum
  CLAPPER_DISCOVERER_DISCOVERY_NONCURRENT,
 } ClapperDiscovererDiscoveryMode;

-/* NOTE: GStreamer uses param flags 8-16, so start with 17. */
-/**
- * ClapperEnhancerParamFlags:
- * @CLAPPER_ENHANCER_PARAM_GLOBAL: Use this flag for enhancer properties that should have global access scope.
- *   Such are meant for application `USER` to configure.
- * @CLAPPER_ENHANCER_PARAM_LOCAL: Use this flag for enhancer properties that should have local access scope.
- *   Such are meant for `APPLICATION` to configure.
- * @CLAPPER_ENHANCER_PARAM_FILEPATH: Use this flag for enhancer properties that store string with a file path.
- *   Applications can use this as a hint to show file selection instead of a text entry.
- * @CLAPPER_ENHANCER_PARAM_DIRPATH: Use this flag for enhancer properties that store string with a directory path.
- *   Applications can use this as a hint to show directory selection instead of a text entry.
- *
- * Additional [flags@GObject.ParamFlags] to be set in enhancer plugins implementations.
- *
- * Since: 0.10
- */
-typedef enum
-{
-  CLAPPER_ENHANCER_PARAM_GLOBAL = 1 << 17,
-  CLAPPER_ENHANCER_PARAM_LOCAL = 1 << 18,
-  CLAPPER_ENHANCER_PARAM_FILEPATH = 1 << 19,
-  CLAPPER_ENHANCER_PARAM_DIRPATH = 1 << 20,
-} ClapperEnhancerParamFlags;
-
 G_END_DECLS
--- a/src/lib/clapper/clapper-player-private.h
+++ b/src/lib/clapper/clapper-player-private.h
@@ -47,8 +47,6 @@ struct _ClapperPlayer
  ClapperFeaturesManager *features_manager;
  gint have_features; // atomic integer

-  ClapperEnhancerProxyList *enhancer_proxies;
-
  /* This is different from queue current item as it is used/changed only
   * on player thread, so we can always update correct item without lock */
  ClapperMediaItem *played_item;
--- a/src/lib/clapper/clapper-player.c
+++ b/src/lib/clapper/clapper-player.c
@@ -49,7 +49,6 @@
 #include "clapper-video-stream-private.h"
 #include "clapper-audio-stream-private.h"
 #include "clapper-subtitle-stream-private.h"
-#include "clapper-enhancer-proxy-list-private.h"
 #include "clapper-enums-private.h"
 #include "clapper-utils-private.h"
 #include "../shared/clapper-shared-utils-private.h"
@@ -78,7 +77,6 @@ enum
  PROP_VIDEO_STREAMS,
  PROP_AUDIO_STREAMS,
  PROP_SUBTITLE_STREAMS,
-  PROP_ENHANCER_PROXIES,
  PROP_AUTOPLAY,
  PROP_POSITION,
  PROP_SPEED,
@@ -816,11 +814,7 @@ _element_setup_cb (GstElement *playbin, GstElement *element, ClapperPlayer *self
  factory_name = g_intern_static_string (GST_OBJECT_NAME (factory));
  GST_INFO_OBJECT (self, "Element setup: %s", factory_name);

-  if (factory_name == g_intern_static_string ("clapperenhancersrc")) {
-    g_object_set (element,
-        "enhancer-proxies", self->enhancer_proxies,
-        NULL);
-  } else if (factory_name == g_intern_static_string ("downloadbuffer")) {
+  if (factory_name == g_intern_static_string ("downloadbuffer")) {
    gchar *download_template;

    /* Only set props if we have download template */
@@ -1135,24 +1129,6 @@ clapper_player_get_subtitle_streams (ClapperPlayer *self)
  return self->subtitle_streams;
 }

-/**
- * clapper_player_get_enhancer_proxies:
- * @player: a #ClapperPlayer
- *
- * Get a list of available enhancers in the form of [class@Clapper.EnhancerProxy] objects.
- *
- * Returns: (transfer none): a #ClapperEnhancerProxyList of enhancer proxies.
- *
- * Since: 0.10
- */
-ClapperEnhancerProxyList *
-clapper_player_get_enhancer_proxies (ClapperPlayer *self)
-{
-  g_return_val_if_fail (CLAPPER_IS_PLAYER (self), NULL);
-
-  return self->enhancer_proxies;
-}
-
 /**
 * clapper_player_set_autoplay:
 * @player: a #ClapperPlayer
@@ -2211,28 +2187,6 @@ clapper_player_add_feature (ClapperPlayer *self, ClapperFeature *feature)
  clapper_features_manager_add_feature (self->features_manager, feature, GST_OBJECT (self));
 }

-/**
- * clapper_player_make_pipeline_graph:
- * @player: a #ClapperPlayer
- * @details: a #GstDebugGraphDetails level
- *
- * Make current #GStreamer pipeline graph in `graphviz` dot format.
- *
- * Applications can use tools like `graphviz` to display returned
- * data or just save it to a file as-is for the user to do it manually.
- *
- * Returns: (transfer full): current pipeline description in dot format.
- *
- * Since: 0.10
- */
-gchar *
-clapper_player_make_pipeline_graph (ClapperPlayer *self, GstDebugGraphDetails details)
-{
-  g_return_val_if_fail (CLAPPER_IS_PLAYER (self), NULL);
-
-  return gst_debug_bin_to_dot_data (GST_BIN (self->playbin), details);
-}
-
 static void
 clapper_player_thread_start (ClapperThreadedObject *threaded_object)
 {
@@ -2321,11 +2275,6 @@ clapper_player_init (ClapperPlayer *self)
  self->subtitle_streams = clapper_stream_list_new ();
  gst_object_set_parent (GST_OBJECT_CAST (self->subtitle_streams), GST_OBJECT_CAST (self));

-  self->enhancer_proxies = clapper_enhancer_proxy_list_new_named (NULL);
-  gst_object_set_parent (GST_OBJECT_CAST (self->enhancer_proxies), GST_OBJECT_CAST (self));
-
-  clapper_enhancer_proxy_list_fill_from_global_proxies (self->enhancer_proxies);
-
  self->position_query = gst_query_new_position (GST_FORMAT_TIME);

  self->current_state = GST_STATE_NULL;
@@ -2392,9 +2341,6 @@ clapper_player_finalize (GObject *object)
  gst_object_unparent (GST_OBJECT_CAST (self->subtitle_streams));
  gst_object_unref (self->subtitle_streams);

-  gst_object_unparent (GST_OBJECT_CAST (self->enhancer_proxies));
-  gst_object_unref (self->enhancer_proxies);
-
  gst_query_unref (self->position_query);

  gst_clear_object (&self->collection);
@@ -2426,9 +2372,6 @@ clapper_player_get_property (GObject *object, guint prop_id,
    case PROP_SUBTITLE_STREAMS:
      g_value_set_object (value, clapper_player_get_subtitle_streams (self));
      break;
-    case PROP_ENHANCER_PROXIES:
-      g_value_set_object (value, clapper_player_get_enhancer_proxies (self));
-      break;
    case PROP_AUTOPLAY:
      g_value_set_boolean (value, clapper_player_get_autoplay (self));
      break;
@@ -2628,20 +2571,6 @@ clapper_player_class_init (ClapperPlayerClass *klass)
      NULL, NULL, CLAPPER_TYPE_STREAM_LIST,
      G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);

-  /**
-   * ClapperPlayer:enhancer-proxies:
-   *
-   * List of available enhancers in the form of [class@Clapper.EnhancerProxy] objects.
-   *
-   * Use these to inspect available enhancers on the system and configure
-   * their properties on a per player instance basis.
-   *
-   * Since: 0.10
-   */
-  param_specs[PROP_ENHANCER_PROXIES] = g_param_spec_object ("enhancer-proxies",
-      NULL, NULL, CLAPPER_TYPE_ENHANCER_PROXY_LIST,
-      G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
  /**
   * ClapperPlayer:autoplay:
   *
--- a/src/lib/clapper/clapper-player.h
+++ b/src/lib/clapper/clapper-player.h
@@ -31,7 +31,6 @@
 #include <clapper/clapper-threaded-object.h>
 #include <clapper/clapper-queue.h>
 #include <clapper/clapper-stream-list.h>
-#include <clapper/clapper-enhancer-proxy-list.h>
 #include <clapper/clapper-feature.h>
 #include <clapper/clapper-enums.h>

@@ -58,9 +57,6 @@ ClapperStreamList * clapper_player_get_audio_streams (ClapperPlayer *player);
 CLAPPER_API
 ClapperStreamList * clapper_player_get_subtitle_streams (ClapperPlayer *player);

-CLAPPER_API
-ClapperEnhancerProxyList * clapper_player_get_enhancer_proxies (ClapperPlayer *player);
-
 CLAPPER_API
 void clapper_player_set_autoplay (ClapperPlayer *player, gboolean enabled);

@@ -208,7 +204,4 @@ void clapper_player_seek_custom (ClapperPlayer *player, gdouble position, Clappe
 CLAPPER_API
 void clapper_player_add_feature (ClapperPlayer *player, ClapperFeature *feature);

-CLAPPER_API
-gchar * clapper_player_make_pipeline_graph (ClapperPlayer *player, GstDebugGraphDetails details);
-
 G_END_DECLS
--- a/src/lib/clapper/clapper-basic-functions.c
+++ b/src/lib/clapper/clapper-basic-functions.c
@@ -1,5 +1,5 @@
 /* Clapper Playback Library
- * Copyright (C) 2025 Rafał Dzięgiel <rafostar.github@gmail.com>
+ * Copyright (C) 2024 Rafał Dzięgiel <rafostar.github@gmail.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -22,22 +22,17 @@
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>

-#include "clapper-basic-functions.h"
-#include "clapper-cache-private.h"
+#include "clapper.h"
 #include "clapper-utils-private.h"
 #include "clapper-playbin-bus-private.h"
 #include "clapper-app-bus-private.h"
 #include "clapper-features-bus-private.h"
-#include "clapper-enhancer-proxy-list-private.h"
 #include "gst/clapper-plugin-private.h"

-#include "clapper-functionalities-availability.h"
-
 #if CLAPPER_WITH_ENHANCERS_LOADER
 #include "clapper-enhancers-loader-private.h"
 #endif

-static ClapperEnhancerProxyList *_proxies = NULL;
 static gboolean is_initialized = FALSE;
 static GMutex init_lock;

@@ -51,16 +46,13 @@ clapper_init_check_internal (int *argc, char **argv[])

  gst_pb_utils_init ();

-  clapper_cache_initialize ();
  clapper_utils_initialize ();
  clapper_playbin_bus_initialize ();
  clapper_app_bus_initialize ();
  clapper_features_bus_initialize ();

-  _proxies = clapper_enhancer_proxy_list_new_named ("global-proxy-list");
-
 #if CLAPPER_WITH_ENHANCERS_LOADER
-  clapper_enhancers_loader_initialize (_proxies);
+  clapper_enhancers_loader_initialize ();
 #endif

  gst_plugin_register_static (
@@ -157,75 +149,18 @@ clapper_init_check (int *argc, char **argv[])
 * Returns: whether a plausible enhancer was found.
 *
 * Since: 0.8
- *
- * Deprecated: 0.10: Use list of enhancer proxies from [func@Clapper.get_global_enhancer_proxies] or
- *   [property@Clapper.Player:enhancer-proxies] and check if any proxy matches your search criteria.
 */
 gboolean
 clapper_enhancer_check (GType iface_type, const gchar *scheme, const gchar *host, const gchar **name)
 {
-  gboolean is_https;
-  guint i, n_proxies;
+  gboolean success = FALSE;

  g_return_val_if_fail (G_TYPE_IS_INTERFACE (iface_type), FALSE);
  g_return_val_if_fail (scheme != NULL, FALSE);

-  if (host) {
-    /* Strip common subdomains, so plugins do not
-     * have to list all combinations */
-    if (g_str_has_prefix (host, "www."))
-      host += 4;
-    else if (g_str_has_prefix (host, "m."))
-      host += 2;
-  }
+#if CLAPPER_WITH_ENHANCERS_LOADER
+  success = clapper_enhancers_loader_check (iface_type, scheme, host, name);
+#endif

-  /* Whether "http(s)" scheme is used */
-  is_https = (g_str_has_prefix (scheme, "http")
-      && (scheme[4] == '\0' || (scheme[4] == 's' && scheme[5] == '\0')));
-
-  if (!host && is_https)
-    return FALSE;
-
-  n_proxies = clapper_enhancer_proxy_list_get_n_proxies (_proxies);
-  for (i = 0; i < n_proxies; ++i) {
-    ClapperEnhancerProxy *proxy = clapper_enhancer_proxy_list_peek_proxy (_proxies, i);
-
-    if (clapper_enhancer_proxy_target_has_interface (proxy, iface_type)
-        && clapper_enhancer_proxy_extra_data_lists_value (proxy, "X-Schemes", scheme)
-        && (!is_https || clapper_enhancer_proxy_extra_data_lists_value (proxy, "X-Hosts", host))) {
-      if (name)
-        *name = clapper_enhancer_proxy_get_friendly_name (proxy);
-
-      return TRUE;
-    }
-  }
-
-  return FALSE;
-}
-
-/**
- * clapper_get_global_enhancer_proxies:
- *
- * Get a list of available enhancers in the form of [class@Clapper.EnhancerProxy] objects.
- *
- * This returns a global list of enhancer proxy objects. You can use it to inspect
- * available enhancers without creating a new player instance.
- *
- * Remember to initialize Clapper library before using this function.
- *
- * Only enhancer properties with [flags@Clapper.EnhancerParamFlags.GLOBAL] flag can be
- * set on proxies in this list. These are meant to be set ONLY by users, not applications
- * as they carry over to all player instances (possibly including other apps). Applications
- * should instead be changing properties with [flags@Clapper.EnhancerParamFlags.LOCAL] flag
- * set from individual proxy lists from [property@Clapper.Player:enhancer-proxies] which
- * will affect only that single player instance given list belongs to.
- *
- * Returns: (transfer none): a global #ClapperEnhancerProxyList of enhancer proxies.
- *
- * Since: 0.10
- */
-ClapperEnhancerProxyList *
-clapper_get_global_enhancer_proxies (void)
-{
-  return _proxies;
+  return success;
 }
--- a/src/lib/clapper/clapper.h
+++ b/src/lib/clapper/clapper.h
@@ -19,6 +19,9 @@

 #pragma once

+#include <glib.h>
+#include <glib-object.h>
+
 #define __CLAPPER_INSIDE__

 #include <clapper/clapper-visibility.h>
@@ -27,9 +30,6 @@
 #include <clapper/clapper-version.h>

 #include <clapper/clapper-audio-stream.h>
-#include <clapper/clapper-basic-functions.h>
-#include <clapper/clapper-enhancer-proxy.h>
-#include <clapper/clapper-enhancer-proxy-list.h>
 #include <clapper/clapper-feature.h>
 #include <clapper/clapper-harvest.h>
 #include <clapper/clapper-marker.h>
@@ -59,4 +59,17 @@
 #include <clapper/features/server/clapper-server.h>
 #endif

+G_BEGIN_DECLS
+
+CLAPPER_API
+void clapper_init (int *argc, char **argv[]);
+
+CLAPPER_API
+gboolean clapper_init_check (int *argc, char **argv[]);
+
+CLAPPER_API
+gboolean clapper_enhancer_check (GType iface_type, const gchar *scheme, const gchar *host, const gchar **name);
+
+G_END_DECLS
+
 #undef __CLAPPER_INSIDE__
--- a/src/lib/clapper/features/server/clapper-server-mdns.c
+++ b/src/lib/clapper/features/server/clapper-server-mdns.c
@@ -18,6 +18,7 @@
 */

 #include <gst/gst.h>
+#include <sys/socket.h>

 #include "clapper-server-mdns-private.h"

--- a/src/lib/clapper/gst/clapper-enhancer-director-private.h
+++ b/src/lib/clapper/gst/clapper-enhancer-director-private.h
@@ -38,6 +38,6 @@ G_GNUC_INTERNAL
 ClapperEnhancerDirector * clapper_enhancer_director_new (void);

 G_GNUC_INTERNAL
-ClapperHarvest * clapper_enhancer_director_extract (ClapperEnhancerDirector *director, GList *filtered_proxies, GUri *uri, GCancellable *cancellable, GError **error);
+ClapperHarvest * clapper_enhancer_director_extract (ClapperEnhancerDirector *director, GUri *uri, GCancellable *cancellable, GError **error);

 G_END_DECLS
--- a/src/lib/clapper/gst/clapper-enhancer-director.c
+++ b/src/lib/clapper/gst/clapper-enhancer-director.c
@@ -20,17 +20,11 @@
 #include <gst/gst.h>

 #include "clapper-enhancer-director-private.h"
-#include "../clapper-enhancer-proxy-private.h"
+#include "../clapper-enhancers-loader-private.h"
 #include "../clapper-extractable-private.h"
 #include "../clapper-harvest-private.h"
 #include "../../shared/clapper-shared-utils-private.h"

-#include "../clapper-functionalities-availability.h"
-
-#if CLAPPER_WITH_ENHANCERS_LOADER
-#include "../clapper-enhancers-loader-private.h"
-#endif
-
 #define GST_CAT_DEFAULT clapper_enhancer_director_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);

@@ -44,8 +38,6 @@ G_DEFINE_TYPE (ClapperEnhancerDirector, clapper_enhancer_director, CLAPPER_TYPE_

 typedef struct
 {
-  ClapperEnhancerDirector *director;
-  GList *filtered_proxies;
  GUri *uri;
  GCancellable *cancellable;
  GError **error;
@@ -54,61 +46,37 @@ typedef struct
 static gpointer
 clapper_enhancer_director_extract_in_thread (ClapperEnhancerDirectorData *data)
 {
-  ClapperEnhancerDirector *self = data->director;
-  GList *el;
-  ClapperHarvest *harvest = NULL;
+  ClapperExtractable *extractable = NULL;
+  ClapperHarvest *harvest = clapper_harvest_new ();
  gboolean success = FALSE, cached = FALSE;

-  GST_DEBUG_OBJECT (self, "Extraction start");
-
  /* Cancelled during thread switching */
  if (g_cancellable_is_cancelled (data->cancellable))
-    return NULL;
+    goto finish;

  /* TODO: Cache lookup */
  if (cached) {
-    // if ((success = fill harvest from cache))
-    //   return harvest;
+    // success = fill harvest from cache
+    goto finish;
  }

-  GST_DEBUG_OBJECT (self, "Enhancer proxies for URI: %u",
-      g_list_length (data->filtered_proxies));
+  extractable = CLAPPER_EXTRACTABLE_CAST (clapper_enhancers_loader_create_enhancer_for_uri (
+      CLAPPER_TYPE_EXTRACTABLE, data->uri));

-  for (el = data->filtered_proxies; el; el = g_list_next (el)) {
-    ClapperEnhancerProxy *proxy = CLAPPER_ENHANCER_PROXY_CAST (el->data);
-    ClapperExtractable *extractable = NULL;
+  /* Check just before extract */
+  if (g_cancellable_is_cancelled (data->cancellable))
+    goto finish;

-    /* Check just before extract */
-    if (g_cancellable_is_cancelled (data->cancellable))
-      break;
-
-#if CLAPPER_WITH_ENHANCERS_LOADER
-    extractable = CLAPPER_EXTRACTABLE_CAST (
-        clapper_enhancers_loader_create_enhancer (proxy, CLAPPER_TYPE_EXTRACTABLE));
-#endif
-
-    if (G_LIKELY (extractable != NULL)) {
-      clapper_enhancer_proxy_apply_current_config_to_enhancer (proxy, (GObject *) extractable);
-
-      harvest = clapper_harvest_new (); // fresh harvest for each extractable
-
-      success = clapper_extractable_extract (extractable, data->uri,
-          harvest, data->cancellable, data->error);
-      gst_object_unref (extractable);
-
-      /* We are done with extractable, but keep its harvest */
-      if (success)
-        break;
-
-      /* Clear harvest and try again with next enhancer */
-      g_clear_object (&harvest);
-    }
-  }
+  success = clapper_extractable_extract (extractable, data->uri,
+      harvest, data->cancellable, data->error);

  /* Cancelled during extract */
-  if (g_cancellable_is_cancelled (data->cancellable))
+  if (g_cancellable_is_cancelled (data->cancellable)) {
    success = FALSE;
+    goto finish;
+  }

+finish:
  if (success) {
    if (!cached) {
      /* TODO: Store in cache */
@@ -126,7 +94,7 @@ clapper_enhancer_director_extract_in_thread (ClapperEnhancerDirectorData *data)
    }
  }

-  GST_DEBUG_OBJECT (self, "Extraction finish");
+  gst_clear_object (&extractable);

  return harvest;
 }
@@ -148,14 +116,11 @@ clapper_enhancer_director_new (void)
 }

 ClapperHarvest *
-clapper_enhancer_director_extract (ClapperEnhancerDirector *self,
-    GList *filtered_proxies, GUri *uri,
+clapper_enhancer_director_extract (ClapperEnhancerDirector *self, GUri *uri,
    GCancellable *cancellable, GError **error)
 {
  ClapperEnhancerDirectorData *data = g_new (ClapperEnhancerDirectorData, 1);

-  data->director = self;
-  data->filtered_proxies = filtered_proxies;
  data->uri = uri;
  data->cancellable = cancellable;
  data->error = error;
--- a/src/lib/clapper/gst/clapper-enhancer-src-private.h
+++ b/src/lib/clapper/gst/clapper-enhancer-src-private.h
@@ -20,7 +20,6 @@
 #pragma once

 #include <glib.h>
-#include <glib-object.h>
 #include <gst/gst.h>
 #include <gst/base/gstpushsrc.h>

--- a/src/lib/clapper/gst/clapper-enhancer-src.c
+++ b/src/lib/clapper/gst/clapper-enhancer-src.c
@@ -22,18 +22,13 @@
 #include "clapper-enhancer-src-private.h"
 #include "clapper-enhancer-director-private.h"

-#include "../clapper-basic-functions.h"
-#include "../clapper-enhancer-proxy.h"
-#include "../clapper-enhancer-proxy-list.h"
-#include "../clapper-extractable.h"
+#include "../clapper-extractable-private.h"
 #include "../clapper-harvest-private.h"
+#include "../clapper-enhancers-loader-private.h"

 #define GST_CAT_DEFAULT clapper_enhancer_src_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);

-#define CHECK_SCHEME_IS_HTTPS(scheme) (g_str_has_prefix (scheme, "http") \
-    && (scheme[4] == '\0' || (scheme[4] == 's' && scheme[5] == '\0')))
-
 struct _ClapperEnhancerSrc
 {
  GstPushSrc parent;
@@ -45,15 +40,12 @@ struct _ClapperEnhancerSrc

  gchar *uri;
  GUri *guri;
-
-  ClapperEnhancerProxyList *enhancer_proxies;
 };

 enum
 {
  PROP_0,
  PROP_URI,
-  PROP_ENHANCER_PROXIES,
  PROP_LAST
 };

@@ -70,172 +62,10 @@ clapper_enhancer_src_uri_handler_get_type (GType type)
  return GST_URI_SRC;
 }

-/*
- * _make_schemes:
- *
- * Make supported schemes array for a given interface type.
- * The returned array consists of unique strings (no duplicates).
- *
- * Returns: (transfer full): all supported schemes by enhancers of @iface_type.
- */
-static gchar **
-_make_schemes (gpointer user_data G_GNUC_UNUSED)
+static gpointer
+_get_schemes_once (gpointer user_data G_GNUC_UNUSED)
 {
-  ClapperEnhancerProxyList *proxies = clapper_get_global_enhancer_proxies ();
-  GSList *found_schemes = NULL, *fs;
-  gchar **schemes_strv;
-  guint i, n_schemes, n_proxies = clapper_enhancer_proxy_list_get_n_proxies (proxies);
-
-  GST_DEBUG ("Checking for supported URI schemes");
-
-  for (i = 0; i < n_proxies; ++i) {
-    ClapperEnhancerProxy *proxy = clapper_enhancer_proxy_list_peek_proxy (proxies, i);
-    const gchar *schemes;
-
-    if (clapper_enhancer_proxy_target_has_interface (proxy, CLAPPER_TYPE_EXTRACTABLE)
-        && (schemes = clapper_enhancer_proxy_get_extra_data (proxy, "X-Schemes"))) {
-      gchar **tmp_strv;
-      gint j;
-
-      tmp_strv = g_strsplit (schemes, ";", 0);
-
-      for (j = 0; tmp_strv[j]; ++j) {
-        const gchar *scheme = tmp_strv[j];
-
-        if (!found_schemes || !g_slist_find_custom (found_schemes,
-            scheme, (GCompareFunc) strcmp)) {
-          found_schemes = g_slist_append (found_schemes, g_strdup (scheme));
-          GST_INFO ("Found supported URI scheme: \"%s\"", scheme);
-        }
-      }
-
-      g_strfreev (tmp_strv);
-    }
-  }
-
-  n_schemes = g_slist_length (found_schemes);
-  schemes_strv = g_new0 (gchar *, n_schemes + 1);
-
-  fs = found_schemes;
-  for (i = 0; i < n_schemes; ++i) {
-    schemes_strv[i] = fs->data;
-    fs = fs->next;
-  }
-
-  GST_DEBUG ("Total found URI schemes: %u", n_schemes);
-
-  /* Since string pointers were taken,
-   * free list without content */
-  g_slist_free (found_schemes);
-
-  return schemes_strv;
-}
-
-static inline const gchar *
-_host_fixup (const gchar *host)
-{
-  /* Strip common subdomains, so plugins do not
-   * have to list all combinations */
-  if (g_str_has_prefix (host, "www."))
-    host += 4;
-  else if (g_str_has_prefix (host, "m."))
-    host += 2;
-
-  return host;
-}
-
-/*
- * _enhancer_check_for_uri:
- * @self: a #ClapperEnhancerSrc
- * @uri: a #GUri
- *
- * Check whether there is at least one enhancer for @uri in global list.
- * This is used to reject URI early, thus making playbin choose different
- * source element. It uses global list, since at this stage element is not
- * yet placed within pipeline, so it cannot get proxies from player.
- *
- * Returns: whether at least one enhancer advertises support for given URI.
- */
-static gboolean
-_enhancer_check_for_uri (ClapperEnhancerSrc *self, GUri *uri)
-{
-  ClapperEnhancerProxyList *proxies = clapper_get_global_enhancer_proxies ();
-  gboolean is_https;
-  guint i, n_proxies;
-  const gchar *scheme = g_uri_get_scheme (uri);
-  const gchar *host = g_uri_get_host (uri);
-
-  if (host)
-    host = _host_fixup (host);
-
-  GST_INFO_OBJECT (self, "Enhancer check, scheme: \"%s\", host: \"%s\"",
-      scheme, GST_STR_NULL (host));
-
-  /* Whether "http(s)" scheme is used */
-  is_https = CHECK_SCHEME_IS_HTTPS (scheme);
-
-  if (!host && is_https)
-    return FALSE;
-
-  n_proxies = clapper_enhancer_proxy_list_get_n_proxies (proxies);
-  for (i = 0; i < n_proxies; ++i) {
-    ClapperEnhancerProxy *proxy = clapper_enhancer_proxy_list_peek_proxy (proxies, i);
-
-    if (clapper_enhancer_proxy_target_has_interface (proxy, CLAPPER_TYPE_EXTRACTABLE)
-        && clapper_enhancer_proxy_extra_data_lists_value (proxy, "X-Schemes", scheme)
-        && (!is_https || clapper_enhancer_proxy_extra_data_lists_value (proxy, "X-Hosts", host)))
-      return TRUE;
-  }
-
-  return FALSE;
-}
-
-/*
- * _filter_enhancers_for_uri:
- * @self: a #ClapperEnhancerSrc
- * @proxies: a #ClapperEnhancerProxyList
- * @uri: a #GUri
- *
- * Finds all enhancer proxies of target implementing "Extractable"
- * interface, which advertise support for given @uri.
- *
- * Returns: (transfer full): A sublist in the form of #GList with proxies.
- */
-static GList *
-_filter_enhancers_for_uri (ClapperEnhancerSrc *self,
-    ClapperEnhancerProxyList *proxies, GUri *uri)
-{
-  GList *sublist = NULL;
-  guint i, n_proxies;
-  gboolean is_https;
-  const gchar *scheme = g_uri_get_scheme (uri);
-  const gchar *host = g_uri_get_host (uri);
-
-  if (host)
-    host = _host_fixup (host);
-
-  GST_INFO_OBJECT (self, "Enhancer filter, scheme: \"%s\", host: \"%s\"",
-      scheme, GST_STR_NULL (host));
-
-  /* Whether "http(s)" scheme is used */
-  is_https = CHECK_SCHEME_IS_HTTPS (scheme);
-
-  if (!host && is_https)
-    return NULL;
-
-  n_proxies = clapper_enhancer_proxy_list_get_n_proxies (proxies);
-  for (i = 0; i < n_proxies; ++i) {
-    ClapperEnhancerProxy *proxy = clapper_enhancer_proxy_list_peek_proxy (proxies, i);
-
-    if (clapper_enhancer_proxy_target_has_interface (proxy, CLAPPER_TYPE_EXTRACTABLE)
-        && clapper_enhancer_proxy_extra_data_lists_value (proxy, "X-Schemes", scheme)
-        && (!is_https || clapper_enhancer_proxy_extra_data_lists_value (proxy, "X-Hosts", host))) {
-      sublist = g_list_append (sublist, gst_object_ref (proxy));
-      break;
-    }
-  }
-
-  return sublist;
+  return clapper_enhancers_loader_get_schemes (CLAPPER_TYPE_EXTRACTABLE);
 }

 static const gchar *const *
@@ -243,7 +73,7 @@ clapper_enhancer_src_uri_handler_get_protocols (GType type)
 {
  static GOnce schemes_once = G_ONCE_INIT;

-  g_once (&schemes_once, (GThreadFunc) _make_schemes, NULL);
+  g_once (&schemes_once, _get_schemes_once, NULL);
  return (const gchar *const *) schemes_once.retval;
 }

@@ -300,7 +130,8 @@ clapper_enhancer_src_uri_handler_set_uri (GstURIHandler *handler,
    return FALSE;
  }

-  if (!_enhancer_check_for_uri (self, guri)) {
+  if (!clapper_enhancers_loader_check (CLAPPER_TYPE_EXTRACTABLE,
+      g_uri_get_scheme (guri), g_uri_get_host (guri), NULL)) {
    g_set_error (error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI,
        "None of the available enhancers can handle this URI");
    g_uri_unref (guri);
@@ -465,8 +296,6 @@ static GstFlowReturn
 clapper_enhancer_src_create (GstPushSrc *push_src, GstBuffer **outbuf)
 {
  ClapperEnhancerSrc *self = CLAPPER_ENHANCER_SRC_CAST (push_src);
-  ClapperEnhancerProxyList *proxies;
-  GList *filtered_proxies;
  GUri *guri;
  GCancellable *cancellable;
  ClapperHarvest *harvest;
@@ -487,28 +316,12 @@ clapper_enhancer_src_create (GstPushSrc *push_src, GstBuffer **outbuf)
    self->director = clapper_enhancer_director_new ();

  GST_OBJECT_LOCK (self);
-
-  if (G_LIKELY (self->enhancer_proxies != NULL)) {
-    GST_INFO_OBJECT (self, "Using enhancer proxies: %" GST_PTR_FORMAT, self->enhancer_proxies);
-    proxies = gst_object_ref (self->enhancer_proxies);
-  } else {
-    /* Compat for old ClapperDiscoverer feature that does not set this property */
-    GST_WARNING_OBJECT (self, "Falling back to using global enhancer proxy list!");
-    proxies = gst_object_ref (clapper_get_global_enhancer_proxies ());
-  }
-
  guri = g_uri_ref (self->guri);
  cancellable = g_object_ref (self->cancellable);
-
  GST_OBJECT_UNLOCK (self);

-  filtered_proxies = _filter_enhancers_for_uri (self, proxies, guri);
-  gst_object_unref (proxies);
+  harvest = clapper_enhancer_director_extract (self->director, guri, cancellable, &error);

-  harvest = clapper_enhancer_director_extract (self->director,
-      filtered_proxies, guri, cancellable, &error);
-
-  g_clear_list (&filtered_proxies, gst_object_unref);
  g_uri_unref (guri);
  g_object_unref (cancellable);

@@ -572,16 +385,6 @@ clapper_enhancer_src_query (GstBaseSrc *base_src, GstQuery *query)
  return ret;
 }

-static void
-clapper_enhancer_src_set_enhancer_proxies (ClapperEnhancerSrc *self,
-    ClapperEnhancerProxyList *enhancer_proxies)
-{
-  GST_OBJECT_LOCK (self);
-  gst_object_replace ((GstObject **) &self->enhancer_proxies,
-      GST_OBJECT_CAST (enhancer_proxies));
-  GST_OBJECT_UNLOCK (self);
-}
-
 static void
 clapper_enhancer_src_init (ClapperEnhancerSrc *self)
 {
@@ -610,7 +413,6 @@ clapper_enhancer_src_finalize (GObject *object)
  g_clear_object (&self->cancellable);
  g_free (self->uri);
  g_clear_pointer (&self->guri, g_uri_unref);
-  gst_clear_object (&self->enhancer_proxies);

  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -631,9 +433,6 @@ clapper_enhancer_src_set_property (GObject *object, guint prop_id,
      }
      break;
    }
-    case PROP_ENHANCER_PROXIES:
-      clapper_enhancer_src_set_enhancer_proxies (self, g_value_get_object (value));
-      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
@@ -686,10 +485,6 @@ clapper_enhancer_src_class_init (ClapperEnhancerSrcClass *klass)
      "URI", "URI", NULL,
      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);

-  param_specs[PROP_ENHANCER_PROXIES] = g_param_spec_object ("enhancer-proxies",
-      NULL, NULL, CLAPPER_TYPE_ENHANCER_PROXY_LIST,
-      G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS);
-
  g_object_class_install_properties (gobject_class, PROP_LAST, param_specs);

  gst_element_class_add_static_pad_template (gstelement_class, &src_template);
--- a/src/lib/clapper/gst/clapper-plugin.c
+++ b/src/lib/clapper/gst/clapper-plugin.c
@@ -21,53 +21,31 @@

 #include <gst/gst.h>

-#include "../clapper-basic-functions.h"
-#include "../clapper-enhancer-proxy.h"
-#include "../clapper-enhancer-proxy-list.h"
-#include "../clapper-extractable.h"
-
 #include "clapper-plugin-private.h"
+#include "../clapper-functionalities-availability.h"
+
+#if CLAPPER_WITH_ENHANCERS_LOADER
 #include "clapper-enhancer-src-private.h"
+#include "../clapper-extractable-private.h"
+#include "../clapper-enhancers-loader-private.h"
+#endif
+
 #include "clapper-uri-list-demux-private.h"

-/*
- * clapper_gst_plugin_has_enhancers:
- * @iface_type: an interface #GType
- *
- * Check if any enhancer implementing given interface type is available.
- *
- * Returns: whether any enhancer was found.
- */
-static gboolean
-clapper_gst_plugin_has_enhancers (ClapperEnhancerProxyList *proxies, GType iface_type)
-{
-  guint i, n_proxies = clapper_enhancer_proxy_list_get_n_proxies (proxies);
-
-  for (i = 0; i < n_proxies; ++i) {
-    ClapperEnhancerProxy *proxy = clapper_enhancer_proxy_list_peek_proxy (proxies, i);
-
-    if (clapper_enhancer_proxy_target_has_interface (proxy, iface_type))
-      return TRUE;
-  }
-
-  return FALSE;
-}
-
 gboolean
 clapper_gst_plugin_init (GstPlugin *plugin)
 {
  gboolean res = FALSE;
-  ClapperEnhancerProxyList *global_proxies;

+#if CLAPPER_WITH_ENHANCERS_LOADER
  gst_plugin_add_dependency_simple (plugin,
      "CLAPPER_ENHANCERS_PATH", CLAPPER_ENHANCERS_PATH, NULL,
      GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY);

-  global_proxies = clapper_get_global_enhancer_proxies ();
-
  /* Avoid registering an URI handler without schemes */
-  if (clapper_gst_plugin_has_enhancers (global_proxies, CLAPPER_TYPE_EXTRACTABLE))
+  if (clapper_enhancers_loader_has_enhancers (CLAPPER_TYPE_EXTRACTABLE))
    res |= GST_ELEMENT_REGISTER (clapperenhancersrc, plugin);
+#endif

  res |= GST_ELEMENT_REGISTER (clapperurilistdemux, plugin);

--- a/src/lib/clapper/gst/clapper-uri-list-demux-private.h
+++ b/src/lib/clapper/gst/clapper-uri-list-demux-private.h
@@ -20,7 +20,6 @@
 #pragma once

 #include <glib.h>
-#include <glib-object.h>
 #include <gst/gst.h>
 #include <gst/gstbin.h>

--- a/src/lib/clapper/meson.build
+++ b/src/lib/clapper/meson.build
@@ -54,8 +54,6 @@ config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
 config_h.set_quoted('PACKAGE_ORIGIN', 'https://github.com/Rafostar/clapper')
 config_h.set_quoted('PLUGIN_DESC', 'Clapper elements')
 config_h.set_quoted('PLUGIN_LICENSE', 'LGPL')
-config_h.set_quoted('CLAPPER_API_NAME', clapper_api_name)
-config_h.set_quoted('CLAPPER_ENHANCERS_ID', 'com.github.rafostar.Clapper.Enhancers')
 config_h.set_quoted('CLAPPER_ENHANCERS_PATH', clapper_enhancers_dir)

 configure_file(
@@ -111,9 +109,6 @@ clapper_headers = [
  'clapper.h',
  'clapper-enums.h',
  'clapper-audio-stream.h',
-  'clapper-basic-functions.h',
-  'clapper-enhancer-proxy.h',
-  'clapper-enhancer-proxy-list.h',
  'clapper-extractable.h',
  'clapper-feature.h',
  'clapper-harvest.h',
@@ -132,12 +127,9 @@ clapper_headers = [
  clapper_visibility_header,
 ]
 clapper_sources = [
+  'clapper.c',
  'clapper-app-bus.c',
  'clapper-audio-stream.c',
-  'clapper-basic-functions.c',
-  'clapper-cache.c',
-  'clapper-enhancer-proxy.c',
-  'clapper-enhancer-proxy-list.c',
  'clapper-extractable.c',
  'clapper-feature.c',
  'clapper-features-bus.c',
@@ -156,8 +148,6 @@ clapper_sources = [
  'clapper-utils.c',
  'clapper-video-stream.c',
  'gst/clapper-plugin.c',
-  'gst/clapper-enhancer-src.c',
-  'gst/clapper-enhancer-director.c',
  'gst/clapper-uri-list-demux.c',
  '../shared/clapper-shared-utils.c',
 ]
@@ -180,6 +170,8 @@ if clapper_with_enhancers_loader
  clapper_deps += peas_dep
  clapper_sources += [
    'clapper-enhancers-loader.c',
+    'gst/clapper-enhancer-src.c',
+    'gst/clapper-enhancer-director.c',
  ]
  clapper_available_functionalities += 'enhancers-loader'
 endif
Author	SHA1	Message	Date
Rafał Dzięgiel	eb2e760de2	clapper-gtk: video: Fix checks when inhibiting session	2025-04-26 23:12:40 +02:00
Rafał Dzięgiel	d3a169fccd	clapper-gtk: video: Fix sink property type checks Sometimes property might return a subclass type when object is subclassed. This especially happens with custom GdkPaintable implementations. For this reason instead of comparing object type, check if it inherits what we want.	2025-01-22 20:27:02 +01:00
Rafał Dzięgiel	0cee4e90a5	clapper: server: Fix missing include of <sys/socket.h> We need it for "AF_INET" symbols. Otherwise build fails on some systems.	2025-01-21 22:53:47 +01:00