From a88dc814a66833d0ed3c127d84a1a2ea8ead901d Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 31 Aug 2020 19:27:59 +0200 Subject: [PATCH] MycroftOS: Combine all sinks into one and make it the default. This will make the sound being outputted to all sinks, so it should not matter what you connect. Sound is directed to all available sinks HDMI and Headphones (and/or usbcards/HATs) both output the same sound. --- .../rootfs-overlay/etc/pulse/seeed-voicecard-2mic-default.pa | 2 ++ .../rootfs-overlay/etc/pulse/seeed-voicecard-4mic-default.pa | 2 ++ .../rootfs-overlay/etc/pulse/seeed-voicecard-8mic-default.pa | 2 ++ .../rootfs-overlay/etc/pulse/pulseaudio-default.pa | 2 ++ .../rootfs-overlay/etc/pulse/pulseaudio-system.pa | 2 ++ 5 files changed, 10 insertions(+) diff --git a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pulse/seeed-voicecard-2mic-default.pa b/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pulse/seeed-voicecard-2mic-default.pa index f570dae2..e1288deb 100644 --- a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pulse/seeed-voicecard-2mic-default.pa +++ b/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pulse/seeed-voicecard-2mic-default.pa @@ -146,6 +146,8 @@ load-module module-filter-apply unload-module module-suspend-on-idle unload-module module-role-cork load-module module-role-ducking +load-module module-combine-sink sink_name=MycroftOS_ALL +set-default-sink MycroftOS_ALL ### Enable Echo/Noise-Cancellation #load-module module-echo-cancel aec_method=webrtc source_name=echoCancel_source sink_name=echoCancel_sink diff --git a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pulse/seeed-voicecard-4mic-default.pa b/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pulse/seeed-voicecard-4mic-default.pa index f570dae2..e1288deb 100644 --- a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pulse/seeed-voicecard-4mic-default.pa +++ b/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pulse/seeed-voicecard-4mic-default.pa @@ -146,6 +146,8 @@ load-module module-filter-apply unload-module module-suspend-on-idle unload-module module-role-cork load-module module-role-ducking +load-module module-combine-sink sink_name=MycroftOS_ALL +set-default-sink MycroftOS_ALL ### Enable Echo/Noise-Cancellation #load-module module-echo-cancel aec_method=webrtc source_name=echoCancel_source sink_name=echoCancel_sink diff --git a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pulse/seeed-voicecard-8mic-default.pa b/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pulse/seeed-voicecard-8mic-default.pa index 73bd00b1..ba4b4156 100644 --- a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pulse/seeed-voicecard-8mic-default.pa +++ b/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pulse/seeed-voicecard-8mic-default.pa @@ -146,6 +146,8 @@ load-module module-filter-apply unload-module module-suspend-on-idle unload-module module-role-cork load-module module-role-ducking +load-module module-combine-sink sink_name=MycroftOS_ALL +set-default-sink MycroftOS_ALL ### Enable Echo/Noise-Cancellation #load-module module-echo-cancel aec_method=webrtc source_name=echoCancel_source sink_name=echoCancel_sink diff --git a/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-default.pa b/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-default.pa index d9db0f57..d4cd71f7 100644 --- a/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-default.pa +++ b/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-default.pa @@ -143,6 +143,8 @@ load-module module-filter-apply ### MycroftOS Audio Settings unload-module module-suspend-on-idle load-module module-role-ducking +load-module module-combine-sink sink_name=MycroftOS_ALL +set-default-sink MycroftOS_ALL ### Enable Echo/Noise-Cancellation #load-module module-echo-cancel aec_method=webrtc source_name=echoCancel_source sink_name=echoCancel_sink diff --git a/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-system.pa b/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-system.pa index 51d4eebe..93aada22 100644 --- a/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-system.pa +++ b/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-system.pa @@ -65,6 +65,8 @@ load-module module-position-event-sounds ### MycroftOS Audio Settings unload-module module-suspend-on-idle load-module module-role-ducking +load-module module-combine-sink sink_name=MycroftOS_ALL +set-default-sink MycroftOS_ALL ### Enable Echo/Noise-Cancellation #load-module module-echo-cancel aec_method=webrtc source_name=echoCancel_source sink_name=echoCancel_sink