modules: move softdsp-endpoint inside module-pipewire

modules/meson.build

@@ -41,6 +41,10 @@ shared_library(
   [
     'module-pipewire.c',
     'module-pipewire/simple-endpoint-link.c',
+    'module-pipewire/audio-softdsp-endpoint.c',
+    'module-pipewire/audio-softdsp-endpoint/stream.c',
+    'module-pipewire/audio-softdsp-endpoint/adapter.c',
+    'module-pipewire/audio-softdsp-endpoint/convert.c',
   ],
   c_args : [common_c_args, '-DG_LOG_DOMAIN="m-pipewire"'],
   install : true,
@@ -82,20 +86,6 @@ shared_library(
   dependencies : [wp_dep, pipewire_dep],
 )
 
-shared_library(
-  'wireplumber-module-pw-audio-softdsp-endpoint',
-  [
-    'module-pw-audio-softdsp-endpoint.c',
-    'module-pw-audio-softdsp-endpoint/stream.c',
-    'module-pw-audio-softdsp-endpoint/adapter.c',
-    'module-pw-audio-softdsp-endpoint/convert.c',
- ],
-  c_args : [common_c_args, '-DG_LOG_DOMAIN="m-pw-audio-softdsp-endpoint"'],
-  install : true,
-  install_dir : wireplumber_module_dir,
-  dependencies : [gio_dep, wp_dep, pipewire_dep],
-)
-
 shared_library(
   'wireplumber-module-simple-policy',
   [

modules/module-pipewire.c

@@ -17,6 +17,9 @@
 
 void simple_endpoint_link_factory (WpFactory * factory, GType type,
     GVariant * properties, GAsyncReadyCallback ready, gpointer user_data);
+void
+audio_softdsp_endpoint_factory (WpFactory * factory, GType type,
+    GVariant * properties, GAsyncReadyCallback ready, gpointer user_data);
 
 void
 wireplumber__module_init (WpModule * module, WpCore * core, GVariant * args)
@@ -26,7 +29,9 @@ wireplumber__module_init (WpModule * module, WpCore * core, GVariant * args)
   pw_module_load (pw_core, "libpipewire-module-client-device", NULL, NULL);
   pw_module_load (pw_core, "libpipewire-module-adapter", NULL, NULL);
 
-  /* Register simple-endpoint-link */
+  /* Register simple-endpoint-link and audio-softdsp-endpoint */
   wp_factory_new (core, "pipewire-simple-endpoint-link",
       simple_endpoint_link_factory);
+  wp_factory_new (core, "pw-audio-softdsp-endpoint",
+      audio_softdsp_endpoint_factory);
 }

modules/module-pw-audio-softdsp-endpoint.c → modules/module-pipewire/audio-softdsp-endpoint.c

@@ -19,9 +19,9 @@
 #include <spa/pod/builder.h>
 #include <spa/param/props.h>
 
-#include "module-pw-audio-softdsp-endpoint/stream.h"
-#include "module-pw-audio-softdsp-endpoint/adapter.h"
-#include "module-pw-audio-softdsp-endpoint/convert.h"
+#include "audio-softdsp-endpoint/stream.h"
+#include "audio-softdsp-endpoint/adapter.h"
+#include "audio-softdsp-endpoint/convert.h"
 
 #define MIN_QUANTUM_SIZE  64
 #define MAX_QUANTUM_SIZE  1024
@@ -404,7 +404,7 @@ endpoint_class_init (WpPwAudioSoftdspEndpointClass * klass)
 }
 
 void
-endpoint_factory (WpFactory * factory, GType type, GVariant * properties,
+audio_softdsp_endpoint_factory (WpFactory * factory, GType type, GVariant * properties,
   GAsyncReadyCallback ready, gpointer user_data)
 {
   g_autoptr (WpCore) core = NULL;
@@ -443,10 +443,3 @@ endpoint_factory (WpFactory * factory, GType type, GVariant * properties,
       "streams", streams,
       NULL);
 }
-
-void
-wireplumber__module_init (WpModule * module, WpCore * core, GVariant * args)
-{
-  /* Register the softdsp endpoint */
-  wp_factory_new (core, "pw-audio-softdsp-endpoint", endpoint_factory);
-}

src/wireplumber.conf

@@ -15,10 +15,6 @@ load-module C libwireplumber-module-pipewire
 # Grants access to security confined clients
 load-module C libwireplumber-module-client-permissions
 
-# Endpoint implementation for standard audio devices
-# using software conversions, mixing and volume controls
-load-module C libwireplumber-module-pw-audio-softdsp-endpoint
-
 # Endpoint that provides high-level volume controls for the AGL mixer
 # The streams specified here are the ones that will appear in the mixer.
 # They must match the stream names in the alsa-udev module,