From 18ef422f3f36d8ab52690fd821cda31c61db8f21 Mon Sep 17 00:00:00 2001 From: Haochen Tong Date: Tue, 15 Jun 2021 20:11:33 +0800 Subject: [PATCH] filter-chain: reformat configuration --- src/daemon/filter-chain/demonic.conf | 90 ++++++++--------- .../filter-chain/sink-dolby-surround.conf | 36 +++---- src/daemon/filter-chain/sink-eq6.conf | 24 ++--- .../filter-chain/sink-matrix-spatialiser.conf | 96 +++++++++---------- src/daemon/filter-chain/source-rnnoise.conf | 18 ++-- 5 files changed, 132 insertions(+), 132 deletions(-) diff --git a/src/daemon/filter-chain/demonic.conf b/src/daemon/filter-chain/demonic.conf index ffe3ea83a..74909a919 100644 --- a/src/daemon/filter-chain/demonic.conf +++ b/src/daemon/filter-chain/demonic.conf @@ -44,57 +44,57 @@ context.modules = [ { name = libpipewire-module-filter-chain args = { - #audio.format = F32 - #audio.rate = 48000 - audio.channels = 2 - #audio.position = [ FL FR ] - node.name = "filter-chain-demonic" - node.description = "Demonic example" - media.name = "Demonic example" - filter.graph = { - nodes = [ - { - name = rev - type = ladspa - plugin = revdelay_1605 - label = revdelay - control = { - "Delay Time (s)" = 2.0 + #audio.format = F32 + #audio.rate = 48000 + audio.channels = 2 + #audio.position = [ FL FR ] + node.name = "filter-chain-demonic" + node.description = "Demonic example" + media.name = "Demonic example" + filter.graph = { + nodes = [ + { + name = rev + type = ladspa + plugin = revdelay_1605 + label = revdelay + control = { + "Delay Time (s)" = 2.0 } - } - { - name = pitch - type = ladspa - plugin = am_pitchshift_1433 - label = amPitchshift - control = { - "Pitch shift" = 0.6 + } + { + name = pitch + type = ladspa + plugin = am_pitchshift_1433 + label = amPitchshift + control = { + "Pitch shift" = 0.6 } - } - { - name = rev2 - type = ladspa - plugin = g2reverb - label = G2reverb - control = { + } + { + name = rev2 + type = ladspa + plugin = g2reverb + label = G2reverb + control = { "Reverb tail" = 0.5 "Damping" = 0.9 } - } - ] - links = [ - { output = "rev:Output" input = "pitch:Input" } - { output = "pitch:Output" input = "rev2:In L" } - ] - inputs = [ "rev:Input" ] - outputs = [ "rev2:Out L" ] - } - capture.props = { + } + ] + links = [ + { output = "rev:Output" input = "pitch:Input" } + { output = "pitch:Output" input = "rev2:In L" } + ] + inputs = [ "rev:Input" ] + outputs = [ "rev2:Out L" ] + } + capture.props = { #media.class = Audio/Sink - } - playback.props = { + } + playback.props = { #media.class = Audio/Source - } - } + } + } } ] diff --git a/src/daemon/filter-chain/sink-dolby-surround.conf b/src/daemon/filter-chain/sink-dolby-surround.conf index 943959266..11b27f622 100644 --- a/src/daemon/filter-chain/sink-dolby-surround.conf +++ b/src/daemon/filter-chain/sink-dolby-surround.conf @@ -27,9 +27,9 @@ context.modules = [ { name = libpipewire-module-filter-chain args = { - node.name = "effect_output.dolby_surround" - node.description = "Dolby Surround Sink" - media.name = "Dolby Surround Sink" + node.name = "effect_output.dolby_surround" + node.description = "Dolby Surround Sink" + media.name = "Dolby Surround Sink" filter.graph = { nodes = [ { @@ -41,26 +41,26 @@ context.modules = [ { type = ladspa name = enc - plugin = surround_encoder_1401 + plugin = surround_encoder_1401 label = surroundEncoder } ] - links = [ - { output = "mixer:Out" input = "enc:S" } - ] - inputs = [ "enc:L" "enc:R" "enc:C" null "mixer:In 1" "mixer:In 2" ] - outputs = [ "enc:Lt" "enc:Rt" ] + links = [ + { output = "mixer:Out" input = "enc:S" } + ] + inputs = [ "enc:L" "enc:R" "enc:C" null "mixer:In 1" "mixer:In 2" ] + outputs = [ "enc:Lt" "enc:Rt" ] } capture.props = { - media.class = Audio/Sink - audio.channels = 6 - audio.position = [ FL FR FC LFE SL SR ] - } + media.class = Audio/Sink + audio.channels = 6 + audio.position = [ FL FR FC LFE SL SR ] + } playback.props = { - node.passive = true - audio.channels = 2 - audio.position = [ FL FR ] - } - } + node.passive = true + audio.channels = 2 + audio.position = [ FL FR ] + } + } } ] diff --git a/src/daemon/filter-chain/sink-eq6.conf b/src/daemon/filter-chain/sink-eq6.conf index 212c375bc..5d7455309 100644 --- a/src/daemon/filter-chain/sink-eq6.conf +++ b/src/daemon/filter-chain/sink-eq6.conf @@ -69,20 +69,20 @@ context.modules = [ control = { "Freq" = 5000.0 "Q" = 1.0 "Gain" = 0.0 } } ] - links = [ - { output = "eq_band_1:Out" input = "eq_band_2:In" } - { output = "eq_band_2:Out" input = "eq_band_3:In" } - { output = "eq_band_3:Out" input = "eq_band_4:In" } - { output = "eq_band_4:Out" input = "eq_band_5:In" } - { output = "eq_band_5:Out" input = "eq_band_6:In" } - ] + links = [ + { output = "eq_band_1:Out" input = "eq_band_2:In" } + { output = "eq_band_2:Out" input = "eq_band_3:In" } + { output = "eq_band_3:Out" input = "eq_band_4:In" } + { output = "eq_band_4:Out" input = "eq_band_5:In" } + { output = "eq_band_5:Out" input = "eq_band_6:In" } + ] } capture.props = { - media.class = Audio/Sink - } + media.class = Audio/Sink + } playback.props = { - node.passive = true - } - } + node.passive = true + } + } } ] diff --git a/src/daemon/filter-chain/sink-matrix-spatialiser.conf b/src/daemon/filter-chain/sink-matrix-spatialiser.conf index 53e3b571f..87d728c11 100644 --- a/src/daemon/filter-chain/sink-matrix-spatialiser.conf +++ b/src/daemon/filter-chain/sink-matrix-spatialiser.conf @@ -4,59 +4,59 @@ # ( Jean-Philippe Guillemin ) context.properties = { - log.level = 0 + log.level = 0 } context.spa-libs = { - audio.convert.* = audioconvert/libspa-audioconvert - support.* = support/libspa-support + audio.convert.* = audioconvert/libspa-audioconvert + support.* = support/libspa-support } context.modules = [ - { name = libpipewire-module-rtkit - args = { - #nice.level = -11 - #rt.prio = 88 - #rt.time.soft = 200000 - #rt.time.hard = 200000 - } - flags = [ ifexists nofail ] - } - { name = libpipewire-module-protocol-native } - { name = libpipewire-module-client-node } - { name = libpipewire-module-adapter } + { name = libpipewire-module-rtkit + args = { + #nice.level = -11 + #rt.prio = 88 + #rt.time.soft = 200000 + #rt.time.hard = 200000 + } + flags = [ ifexists nofail ] + } + { name = libpipewire-module-protocol-native } + { name = libpipewire-module-client-node } + { name = libpipewire-module-adapter } - { name = libpipewire-module-filter-chain - args = { - node.name = "effect_output.matrix_spatialiser" - node.description = "Matrix Spatialiser" - media.name = "Matrix Spatialiser" - filter.graph = { - nodes = [ - { - type = ladspa - name = matrix - plugin = matrix_spatialiser_1422 - label = matrixSpatialiser - control = { - "Width" = 80 - } - } - ] - inputs = [ "matrix:Input L" "matrix:Input R" ] - outputs = [ "matrix:Output L" "matrix:Output R" ] - } - capture.props = { - media.class = Audio/Sink - audio.channels = 2 - audio.position = [ FL FR ] - } - playback.props = { - # media.class = Audio/Source - # node.passive = true - audio.channels = 2 - audio.position = [ FL FR ] - } - } - } + { name = libpipewire-module-filter-chain + args = { + node.name = "effect_output.matrix_spatialiser" + node.description = "Matrix Spatialiser" + media.name = "Matrix Spatialiser" + filter.graph = { + nodes = [ + { + type = ladspa + name = matrix + plugin = matrix_spatialiser_1422 + label = matrixSpatialiser + control = { + "Width" = 80 + } + } + ] + inputs = [ "matrix:Input L" "matrix:Input R" ] + outputs = [ "matrix:Output L" "matrix:Output R" ] + } + capture.props = { + media.class = Audio/Sink + audio.channels = 2 + audio.position = [ FL FR ] + } + playback.props = { + # media.class = Audio/Source + # node.passive = true + audio.channels = 2 + audio.position = [ FL FR ] + } + } + } ] diff --git a/src/daemon/filter-chain/source-rnnoise.conf b/src/daemon/filter-chain/source-rnnoise.conf index 9f4f864ba..936294eb0 100644 --- a/src/daemon/filter-chain/source-rnnoise.conf +++ b/src/daemon/filter-chain/source-rnnoise.conf @@ -27,9 +27,9 @@ context.modules = [ { name = libpipewire-module-filter-chain args = { - node.name = "effect_input.rnnoise" - node.description = "Noise Canceling source" - media.name = "Noise Canceling source" + node.name = "effect_input.rnnoise" + node.description = "Noise Canceling source" + media.name = "Noise Canceling source" filter.graph = { nodes = [ { @@ -38,17 +38,17 @@ context.modules = [ plugin = librnnoise_ladspa label = noise_suppressor_stereo control = { - "VAD Threshold (%)" 50.0 + "VAD Threshold (%)" 50.0 } } ] } capture.props = { - node.passive = true - } + node.passive = true + } playback.props = { - media.class = Audio/Source - } - } + media.class = Audio/Source + } + } } ]