From 1c376612b85d85da0fd284c9e2f03cddd8c3ac2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Thu, 26 Jun 2025 19:05:53 +0200 Subject: [PATCH] clapper: Do not skip on loading ported enhancers With some workarounds, we can make enhancers that were ported from features still be loaded and used within single process without requirement for building Clapper with their old implementations disabled. Since MPRIS enhancer already has workarounds in place, lets just remove all code that was skipping its loading. --- src/lib/clapper/clapper-enhancers-loader.c | 32 ---------------------- 1 file changed, 32 deletions(-) diff --git a/src/lib/clapper/clapper-enhancers-loader.c b/src/lib/clapper/clapper-enhancers-loader.c index 0ef148e6..1418642a 100644 --- a/src/lib/clapper/clapper-enhancers-loader.c +++ b/src/lib/clapper/clapper-enhancers-loader.c @@ -34,8 +34,6 @@ static HMODULE _enhancers_dll_handle = NULL; #include "clapper-extractable.h" #include "clapper-reactable.h" -#include - #define GST_CAT_DEFAULT clapper_enhancers_loader_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); @@ -134,36 +132,6 @@ clapper_enhancers_loader_initialize (ClapperEnhancerProxyList *proxies) ClapperEnhancerProxy *proxy; gboolean filled; - /* FIXME: 1.0: Remove together with features code and manager. - * These would clash with each other, so avoid loading these - * as enhancers when also compiled as part of the library. */ -#if (CLAPPER_HAVE_MPRIS || CLAPPER_HAVE_DISCOVERER || CLAPPER_HAVE_SERVER) - guint f_index; - const gchar *module_name = peas_plugin_info_get_module_name (info); - const gchar *ported_features[] = { -#if CLAPPER_HAVE_MPRIS - "clapper-mpris", -#endif -#if CLAPPER_HAVE_DISCOVERER - "clapper-discoverer", -#endif -#if CLAPPER_HAVE_SERVER - "clapper-server", -#endif - }; - - for (f_index = 0; f_index < G_N_ELEMENTS (ported_features); ++f_index) { - if (strcmp (module_name, ported_features[f_index]) == 0) { - GST_INFO ("Skipped \"%s\" enhancer module, since its" - " loaded from deprecated feature object", module_name); - g_clear_object (&info); - } - } - - if (!info) // cleared when exists as feature - continue; -#endif - /* 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);