wireplumber: update to master as of Nov 19th 2019

[AGL/meta-agl-devel.git] / meta-pipewire / recipes-multimedia / wireplumber / wireplumber-board-config-agl / wireplumber.conf.in

diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in
index 76a5741..857c933 100644 (file)
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in
@@ -1,21 +1,22 @@
+# Register well-known SPA factories
+# These do not need to exist on the system to be registered
+add-spa-lib audio.convert* audioconvert/libspa-audioconvert
+add-spa-lib api.alsa.* alsa/libspa-alsa
+add-spa-lib api.v4l2.* v4l2/libspa-v4l2
+add-spa-lib api.bluez5.* bluez5/libspa-bluez5
+
+# the client-device pipewire module is needed for libwireplumber-module-monitor
+load-pipewire-module libpipewire-module-client-device
+
 # Basic pipewire integration - do not remove
 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,
-# except for "Master", which is treated specially.
-load-module C libwireplumber-module-mixer {
-  "streams": <["Master", "Multimedia", "Speech-Low", "Custom-Low",
-                "Navigation", "Speech-High", "Custom-High",
-                "Communication", "Emergency"]>
+load-module C libwireplumber-module-monitor {
+  "factory": <"api.alsa.enum.udev">,
+  "flags": <["use-adapter", "activate-devices"]>
 }
 
 # Monitors the ALSA devices that are discovered via udev