modules: remove alsa-udev and audio-client modules

modules/module-pw-alsa-udev.c

-/* WirePlumber
- *
- * Copyright © 2019 Collabora Ltd.
- *    @author George Kiagiadakis <george.kiagiadakis@collabora.com>
- *
- * SPDX-License-Identifier: MIT
- */
-
-/**
- * module-pw-alsa-udev provides alsa device detection through pipewire
- * and automatically creates endpoints for all alsa device nodes that appear
- */
-
-#include <spa/utils/keys.h>
-#include <spa/utils/names.h>
-#include <pipewire/pipewire.h>
-#include <wp/wp.h>
-
-struct impl
-{
-  WpModule *module;
-  WpObjectManager *om;
-  GHashTable *registered_endpoints;
-  GVariant *streams;
-};
-
-static void
-on_endpoint_created(GObject *initable, GAsyncResult *res, gpointer d)
-{
-  struct impl *impl = d;
-  g_autoptr (WpBaseEndpoint) endpoint = NULL;
-  g_autoptr (WpProxy) proxy = NULL;
-  guint global_id = 0;
-  GError *error = NULL;
-
-  /* Get the endpoint */
-  endpoint = wp_base_endpoint_new_finish(initable, res, &error);
-  if (error) {
-    g_warning ("Failed to create alsa endpoint: %s", error->message);
-    return;
-  }
-
-  /* Get the endpoint global id */
-  g_object_get (endpoint, "proxy-node", &proxy, NULL);
-  global_id = wp_proxy_get_global_id (proxy);
-
-  g_debug ("Created alsa endpoint for global id %d", global_id);
-
-  /* Register the endpoint and add it to the table */
-  wp_base_endpoint_register (endpoint);
-  g_hash_table_insert (impl->registered_endpoints, GUINT_TO_POINTER(global_id),
-      g_steal_pointer (&endpoint));
-}
-
-static gboolean
-parse_alsa_properties (WpProperties *props, const gchar **name,
-    const gchar **media_class, enum pw_direction *direction)
-{
-  /* Get the name */
-  *name = wp_properties_get (props, PW_KEY_NODE_NAME);
-  if (!*name)
-    return FALSE;
-
-  /* Get the media class */
-  *media_class = wp_properties_get (props, PW_KEY_MEDIA_CLASS);
-  if (!*media_class)
-    return FALSE;
-
-  /* Get the direction */
-  if (g_str_has_prefix (*media_class, "Audio/Sink"))
-    *direction = PW_DIRECTION_INPUT;
-  else if (g_str_has_prefix (*media_class, "Audio/Source"))
-    *direction = PW_DIRECTION_OUTPUT;
-  else
-    return FALSE;
-
-  return TRUE;
-}
-
-static inline gboolean
-is_alsa_node (WpProperties * props)
-{
-  const gchar *name = wp_properties_get (props, PW_KEY_NODE_NAME);
-  return g_str_has_prefix (name, "api.alsa");
-}
-
-static void
-on_node_added (WpObjectManager *om, WpProxy *proxy, struct impl *impl)
-{
-  const gchar *media_class, *name;
-  enum pw_direction direction;
-  GVariantBuilder b;
-  g_autoptr (WpProperties) props = NULL;
-  g_autoptr (GVariant) endpoint_props = NULL;
-  g_autoptr (WpCore) core = NULL;
-
-  props = wp_proxy_get_global_properties (proxy);
-  g_return_if_fail(props);
-
-  /* Only handle alsa nodes */
-  if (!is_alsa_node (props))
-    return;
-
-  /* Parse the alsa properties */
-  if (!parse_alsa_properties (props, &name, &media_class, &direction)) {
-    g_critical ("failed to parse alsa properties");
-    return;
-  }
-
-  /* Set the properties */
-  g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);
-  g_variant_builder_add (&b, "{sv}",
-      "name", g_variant_new_take_string (g_strdup_printf ("%s", name)));
-  g_variant_builder_add (&b, "{sv}",
-      "media-class", g_variant_new_string (media_class));
-  g_variant_builder_add (&b, "{sv}",
-      "direction", g_variant_new_uint32 (direction));
-  g_variant_builder_add (&b, "{sv}",
-      "proxy-node", g_variant_new_uint64 ((guint64) proxy));
-  g_variant_builder_add (&b, "{sv}",
-      "streams", impl->streams);
-  endpoint_props = g_variant_builder_end (&b);
-
-  /* Create the endpoint async */
-  g_object_get (om, "core", &core, NULL);
-  wp_factory_make (core, "pw-audio-softdsp-endpoint", WP_TYPE_BASE_ENDPOINT,
-      endpoint_props, on_endpoint_created, impl);
-}
-
-static void
-on_node_removed (WpObjectManager *om, WpProxy *proxy, struct impl *impl)
-{
-  WpBaseEndpoint *endpoint = NULL;
-  guint32 id = wp_proxy_get_global_id (proxy);
-
-  /* Get the endpoint */
-  endpoint = g_hash_table_lookup (impl->registered_endpoints,
-      GUINT_TO_POINTER(id));
-  if (!endpoint)
-    return;
-
-  /* Unregister the endpoint and remove it from the table */
-  wp_base_endpoint_unregister (endpoint);
-  g_hash_table_remove (impl->registered_endpoints, GUINT_TO_POINTER(id));
-}
-
-static void
-module_destroy (gpointer data)
-{
-  struct impl *impl = data;
-
-  /* Set to NULL as we don't own the reference */
-  impl->module = NULL;
-
-  g_clear_object (&impl->om);
-
-  /* Destroy the registered endpoints table */
-  g_hash_table_unref(impl->registered_endpoints);
-  impl->registered_endpoints = NULL;
-
-  g_clear_pointer (&impl->streams, g_variant_unref);
-
-  /* Clean up */
-  g_slice_free (struct impl, impl);
-}
-
-void
-wireplumber__module_init (WpModule * module, WpCore * core, GVariant * args)
-{
-  struct impl *impl;
-
-  /* Create the module data */
-  impl = g_slice_new0(struct impl);
-  impl->module = module;
-  impl->om = wp_object_manager_new ();
-  impl->registered_endpoints = g_hash_table_new_full (g_direct_hash,
-      g_direct_equal, NULL, (GDestroyNotify)g_object_unref);
-  impl->streams = g_variant_lookup_value (args, "streams",
-      G_VARIANT_TYPE ("as"));
-
-  /* Set destroy callback for impl */
-  wp_module_set_destroy_callback (module, module_destroy, impl);
-
-  /* Register the global addded/removed callbacks */
-  g_signal_connect(impl->om, "object-added",
-      (GCallback) on_node_added, impl);
-  g_signal_connect(impl->om, "object-removed",
-      (GCallback) on_node_removed, impl);
-
-  //TODO add constraints & features
-  wp_object_manager_add_proxy_interest (impl->om, PW_TYPE_INTERFACE_Node, NULL,
-      0);
-  wp_core_install_object_manager (core, impl->om);
-}

modules/module-pw-audio-client.c

-/* WirePlumber
- *
- * Copyright © 2019 Collabora Ltd.
- *    @author Julian Bouzas <julian.bouzas@collabora.com>
- *
- * SPDX-License-Identifier: MIT
- */
-
-/**
- * module-pw-audio-client provides a WpBaseEndpoint implementation
- * that wraps an audio client node in pipewire into an endpoint
- */
-
-#include <wp/wp.h>
-#include <pipewire/pipewire.h>
-
-struct module_data
-{
-  WpObjectManager *om;
-  GHashTable *registered_endpoints;
-};
-
-static void
-on_endpoint_created(GObject *initable, GAsyncResult *res, gpointer d)
-{
-  struct module_data *data = d;
-  g_autoptr (WpBaseEndpoint) endpoint = NULL;
-  g_autoptr (WpProxy) proxy = NULL;
-  guint global_id = 0;
-  GError *error = NULL;
-
-  /* Get the endpoint */
-  endpoint = wp_base_endpoint_new_finish(initable, res, &error);
-  if (error) {
-    g_warning ("Failed to create client endpoint: %s", error->message);
-    return;
-  }
-
-  /* Get the endpoint global id */
-  g_object_get (endpoint, "proxy-node", &proxy, NULL);
-  global_id = wp_proxy_get_global_id (proxy);
-
-  g_debug ("Created client endpoint for global id %d", global_id);
-
-  /* Register the endpoint and add it to the table */
-  wp_base_endpoint_register (endpoint);
-  g_hash_table_insert (data->registered_endpoints, GUINT_TO_POINTER(global_id),
-      g_steal_pointer (&endpoint));
-}
-
-static void
-on_node_added (WpObjectManager *om, WpProxy *proxy, gpointer d)
-{
-  struct module_data *data = d;
-  const gchar *name, *media_class;
-  enum pw_direction direction;
-  GVariantBuilder b;
-  g_autoptr (GVariant) endpoint_props = NULL;
-  g_autoptr (WpProperties) props = wp_proxy_get_global_properties (proxy);
-  g_autoptr (WpCore) core = NULL;
-
-  /* Get the media_class */
-  media_class = wp_properties_get (props, PW_KEY_MEDIA_CLASS);
-
-  /* Only handle client Stream nodes */
-  if (!g_str_has_prefix (media_class, "Stream/"))
-    return;
-
-  /* Get the direction */
-  if (g_str_has_prefix (media_class, "Stream/Input")) {
-    direction = PW_DIRECTION_INPUT;
-  } else if (g_str_has_prefix (media_class, "Stream/Output")) {
-    direction = PW_DIRECTION_OUTPUT;
-  } else {
-    g_critical ("failed to parse direction");
-    return;
-  }
-
-  /* Get the name */
-  name = wp_properties_get (props, PW_KEY_MEDIA_NAME);
-  if (!name)
-    name = wp_properties_get (props, PW_KEY_NODE_NAME);
-
-  /* Set the properties */
-  g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);
-  g_variant_builder_add (&b, "{sv}",
-      "name", g_variant_new_take_string (g_strdup_printf ("%s", name)));
-  g_variant_builder_add (&b, "{sv}",
-      "media-class", g_variant_new_string (media_class));
-  g_variant_builder_add (&b, "{sv}",
-      "direction", g_variant_new_uint32 (direction));
-  g_variant_builder_add (&b, "{sv}",
-      "proxy-node", g_variant_new_uint64 ((guint64) proxy));
-  endpoint_props = g_variant_builder_end (&b);
-
-  /* Create the endpoint async */
-  g_object_get (om, "core", &core, NULL);
-  wp_factory_make (core, "pw-audio-softdsp-endpoint", WP_TYPE_BASE_ENDPOINT,
-      endpoint_props, on_endpoint_created, data);
-}
-
-static void
-on_node_removed (WpObjectManager *om, WpProxy *proxy, gpointer d)
-{
-  struct module_data *data = d;
-  WpBaseEndpoint *endpoint = NULL;
-  guint32 id = wp_proxy_get_global_id (proxy);
-
-  /* Get the endpoint */
-  endpoint = g_hash_table_lookup (data->registered_endpoints,
-      GUINT_TO_POINTER(id));
-  if (!endpoint)
-    return;
-
-  /* Unregister the endpoint and remove it from the table */
-  wp_base_endpoint_unregister (endpoint);
-  g_hash_table_remove (data->registered_endpoints, GUINT_TO_POINTER(id));
-}
-
-static void
-module_destroy (gpointer d)
-{
-  struct module_data *data = d;
-
-  g_clear_object (&data->om);
-
-  /* Destroy the registered endpoints table */
-  g_clear_pointer (&data->registered_endpoints, g_hash_table_unref);
-
-  /* Clean up */
-  g_slice_free (struct module_data, data);
-}
-
-void
-wireplumber__module_init (WpModule * module, WpCore * core, GVariant * args)
-{
-  struct module_data *data;
-
-  /* Create the module data */
-  data = g_slice_new0 (struct module_data);
-  data->om = wp_object_manager_new ();
-  data->registered_endpoints = g_hash_table_new_full (g_direct_hash,
-      g_direct_equal, NULL, (GDestroyNotify) g_object_unref);
-
-  /* Set the module destroy callback */
-  wp_module_set_destroy_callback (module, module_destroy, data);
-
-  /* Register the global added/removed callbacks */
-  g_signal_connect(data->om, "object-added",
-      (GCallback) on_node_added, data);
-  g_signal_connect(data->om, "object-removed",
-      (GCallback) on_node_removed, data);
-
-  //TODO add constraints & features
-  wp_object_manager_add_proxy_interest (data->om, PW_TYPE_INTERFACE_Node, NULL,
-      0);
-  wp_core_install_object_manager (core, data->om);
-}

src/wireplumber.conf

@@ -31,17 +31,5 @@ load-module C libwireplumber-module-monitor {
   "factory": <"api.v4l2.enum.udev">
 }
 
-# Monitors the ALSA devices that are discovered via udev
-# and creates softdsp-endopints for each one of them
-# The streams specified here are the ones that will be available for linking
-# clients. Currently, they are matched against the client's role string.
-load-module C libwireplumber-module-pw-alsa-udev {
-  "streams": <["Multimedia", "Navigation", "Communication", "Emergency"]>
-}
-
-# Monitors the Audio clients that are discovered via pipewire
-# and creates simple-endpoints for each one of them
-load-module C libwireplumber-module-pw-audio-client
-
 # Implements linking clients to devices based on TOML configuration files
 load-module C libwireplumber-module-config-policy