From 7cabffa84c0a6c1bf8bf67d0bf3a22268563fcdb Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 8 Jul 2024 23:34:41 -0700 Subject: [PATCH] chore: Switch to be closer to Aru's config, give high priority to ensure it's defaulted --- ...lter-chain-sink.conf => filter-chain.conf} | 35 ++++++++----------- .../pipewire.conf.d/virtual-sink.conf | 22 ------------ .../wireplumber.conf.d/alsa-legion.conf | 15 ++++++++ 3 files changed, 29 insertions(+), 43 deletions(-) rename system_files/deck/shared/usr/share/pipewire/hardware-profiles/lenovo-83e1/pipewire.conf.d/{filter-chain-sink.conf => filter-chain.conf} (58%) delete mode 100644 system_files/deck/shared/usr/share/pipewire/hardware-profiles/lenovo-83e1/pipewire.conf.d/virtual-sink.conf create mode 100644 system_files/deck/shared/usr/share/wireplumber/hardware-profiles/lenovo-83e1/wireplumber.conf.d/alsa-legion.conf diff --git a/system_files/deck/shared/usr/share/pipewire/hardware-profiles/lenovo-83e1/pipewire.conf.d/filter-chain-sink.conf b/system_files/deck/shared/usr/share/pipewire/hardware-profiles/lenovo-83e1/pipewire.conf.d/filter-chain.conf similarity index 58% rename from system_files/deck/shared/usr/share/pipewire/hardware-profiles/lenovo-83e1/pipewire.conf.d/filter-chain-sink.conf rename to system_files/deck/shared/usr/share/pipewire/hardware-profiles/lenovo-83e1/pipewire.conf.d/filter-chain.conf index dc24bcda..7a598d2d 100644 --- a/system_files/deck/shared/usr/share/pipewire/hardware-profiles/lenovo-83e1/pipewire.conf.d/filter-chain-sink.conf +++ b/system_files/deck/shared/usr/share/pipewire/hardware-profiles/lenovo-83e1/pipewire.conf.d/filter-chain.conf @@ -1,14 +1,13 @@ -context.spa-libs = { - audio.convert.* = audioconvert/libspa-audioconvert - support.* = support/libspa-support -} +# Convolver Configuration for Pipewire +# +# This configuration applies separate left and right convolver effects using the corresponding impulse response files +# to the entire system audio output. context.modules = [ - { name = libpipewire-module-filter-chain + { name = libpipewire-module-filter-chain args = { - node.name = "filter-chain-sink" - node.description = "Filter Chain Sink" - media.name = "Filter Chain Sink" + node.description = "Legion GO" + media.name = "Legion GO" filter.graph = { nodes = [ { @@ -30,28 +29,22 @@ context.modules = [ } } ] - links = [ - - ] - + inputs = [ "convFL:In" "convFR:In" ] + outputs = [ "convFL:Out" "convFR:Out" ] } capture.props = { - node.name = "filter-chain-sink" - media.class = Audio/Sink + node.name = "Legion GO" + media.class = "Audio/Sink" audio.channels = 2 audio.position = [ FL FR ] - filter.smart = true - filter.smart.name = filter-chain-sink - filter.smart.target = { media.class = Audio/Sink, alsa.card_name = "HD-Audio Generic", device.profile.description = "Analog Stereo" } - filter.smart.after = [ virtual-sink ] } playback.props = { - node.name = "filter-chain-playback" - node.passive = true + node.name = "Legion GO corrected" + node.passive = true audio.channels = 2 audio.position = [ FL FR ] + node.target = "alsa_output.pci-0000_c2_00.6.analog-stereo" } } } ] - diff --git a/system_files/deck/shared/usr/share/pipewire/hardware-profiles/lenovo-83e1/pipewire.conf.d/virtual-sink.conf b/system_files/deck/shared/usr/share/pipewire/hardware-profiles/lenovo-83e1/pipewire.conf.d/virtual-sink.conf deleted file mode 100644 index 0e61c36e..00000000 --- a/system_files/deck/shared/usr/share/pipewire/hardware-profiles/lenovo-83e1/pipewire.conf.d/virtual-sink.conf +++ /dev/null @@ -1,22 +0,0 @@ -context.modules = [ - { name = libpipewire-module-loopback - args = { - node.name = virtual-sink - node.description = "Virtual Sink" - capture.props = { - audio.position = [ FL FR ] - media.class = Audio/Sink - filter.smart = true - filter.smart.name = virtual-sink - filter.smart.before = [ filter-chain-sink ] - } - playback.props = { - audio.position = [ FL FR ] - node.passive = true - stream.dont-remix = true - - } - } - } -] - diff --git a/system_files/deck/shared/usr/share/wireplumber/hardware-profiles/lenovo-83e1/wireplumber.conf.d/alsa-legion.conf b/system_files/deck/shared/usr/share/wireplumber/hardware-profiles/lenovo-83e1/wireplumber.conf.d/alsa-legion.conf new file mode 100644 index 00000000..3c0fa8af --- /dev/null +++ b/system_files/deck/shared/usr/share/wireplumber/hardware-profiles/lenovo-83e1/wireplumber.conf.d/alsa-legion.conf @@ -0,0 +1,15 @@ +monitor.alsa.rules = [ + { + matches = [ + { + node.name = "Legion GO" + } + ] + actions = { + update-props = { + priority.driver = 1000 + priority.session = 1000 + } + } + } +]