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 61e9d5d..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
@@ -14,24 +14,9 @@ load-module C libwireplumber-module-pipewire
 # Grants access to security confined clients
 load-module C libwireplumber-module-client-permissions
 
-# 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.monitor">,
-  "flags": <["use-adapter"]>
-}
-
-load-module C libwireplumber-module-monitor {
-  "factory": <"api.bluez5.monitor">,
-  "flags": <["local-nodes", "use-adapter"]>
+  "factory": <"api.alsa.enum.udev">,
+  "flags": <["use-adapter", "activate-devices"]>
 }
 
 # Monitors the ALSA devices that are discovered via udev
@@ -48,10 +33,6 @@ load-module C libwireplumber-module-pw-alsa-udev {
 # and creates simple-endpoints for each one of them
 load-module C libwireplumber-module-pw-audio-client
 
-# Monitors the Bluetooth devices that are discovered via pipewire
-# and creates simple-endpoints for each one of them
-load-module C libwireplumber-module-pw-bluez
-
 # Implements linking clients to devices and maintains
 # information about the devices to be used.
 # Notes: