From d06e13210d0c2fbe383d9546a960cb0c16ac221b Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 22 Feb 2022 15:48:43 +0100 Subject: [PATCH] filter-chain: move node.name to the streams The global node.name is not used anymore because the streams need unique names. --- src/daemon/filter-chain/demonic.conf | 5 +++-- src/daemon/filter-chain/duplicate-FL.conf | 3 ++- src/daemon/filter-chain/sink-dolby-surround.conf | 3 ++- src/daemon/filter-chain/sink-eq6.conf | 3 ++- src/daemon/filter-chain/sink-matrix-spatialiser.conf | 12 +++++------- .../sink-virtual-surround-5.1-kemar.conf | 3 ++- .../sink-virtual-surround-7.1-hesuvi.conf | 3 ++- src/daemon/filter-chain/source-rnnoise.conf | 4 +++- 8 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/daemon/filter-chain/demonic.conf b/src/daemon/filter-chain/demonic.conf index e6aab2e8b..b2953dc81 100644 --- a/src/daemon/filter-chain/demonic.conf +++ b/src/daemon/filter-chain/demonic.conf @@ -46,8 +46,7 @@ context.modules = [ #audio.format = F32 #audio.rate = 48000 audio.channels = 2 - #audio.position = [ FL FR ] - node.name = "filter-chain-demonic" + audio.position = [ FL FR ] node.description = "Demonic example" media.name = "Demonic example" filter.graph = { @@ -89,9 +88,11 @@ context.modules = [ outputs = [ "rev2:Out L" ] } capture.props = { + node.name = "effect_input.filter-chain-demonic" #media.class = Audio/Sink } playback.props = { + node.name = "effect_output.filter-chain-demonic" #media.class = Audio/Source } } diff --git a/src/daemon/filter-chain/duplicate-FL.conf b/src/daemon/filter-chain/duplicate-FL.conf index 79c4f98e9..077f3bfac 100644 --- a/src/daemon/filter-chain/duplicate-FL.conf +++ b/src/daemon/filter-chain/duplicate-FL.conf @@ -6,7 +6,6 @@ context.modules = [ { name = libpipewire-module-filter-chain args = { - node.name = "remap-FL-to-FL-FR" node.description = "Remap example" media.name = "Remap example" filter.graph = { @@ -37,10 +36,12 @@ context.modules = [ outputs = [ "copyOL:Out" "copyOR:Out" ] } capture.props = { + node.name = "remap_input.remap-FL-to-FL-FR" audio.position = [ FL ] stream.dont-remix = true } playback.props = { + node.name = "remap_output.remap-FL-to-FL-FR" audio.position = [ FL FR ] } } diff --git a/src/daemon/filter-chain/sink-dolby-surround.conf b/src/daemon/filter-chain/sink-dolby-surround.conf index 415c81924..78dd15722 100644 --- a/src/daemon/filter-chain/sink-dolby-surround.conf +++ b/src/daemon/filter-chain/sink-dolby-surround.conf @@ -26,7 +26,6 @@ context.modules = [ { name = libpipewire-module-filter-chain args = { - node.name = "effect_output.dolby_surround" node.description = "Dolby Surround Sink" media.name = "Dolby Surround Sink" filter.graph = { @@ -51,11 +50,13 @@ context.modules = [ outputs = [ "enc:Lt" "enc:Rt" ] } capture.props = { + node.name = "effect_input.dolby_surround" media.class = Audio/Sink audio.channels = 6 audio.position = [ FL FR FC LFE SL SR ] } playback.props = { + node.name = "effect_output.dolby_surround" 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 35a18476e..c23a17555 100644 --- a/src/daemon/filter-chain/sink-eq6.conf +++ b/src/daemon/filter-chain/sink-eq6.conf @@ -26,7 +26,6 @@ context.modules = [ { name = libpipewire-module-filter-chain args = { - node.name = "effect_output.eq6" node.description = "Equalizer Sink" media.name = "Equalizer Sink" filter.graph = { @@ -77,9 +76,11 @@ context.modules = [ ] } capture.props = { + node.name = "effect_input.eq6" media.class = Audio/Sink } playback.props = { + node.name = "effect_output.eq6" node.passive = true } } diff --git a/src/daemon/filter-chain/sink-matrix-spatialiser.conf b/src/daemon/filter-chain/sink-matrix-spatialiser.conf index 6d95e2041..5519d3a67 100644 --- a/src/daemon/filter-chain/sink-matrix-spatialiser.conf +++ b/src/daemon/filter-chain/sink-matrix-spatialiser.conf @@ -27,7 +27,6 @@ context.modules = [ { name = libpipewire-module-filter-chain args = { - node.name = "effect_output.matrix_spatialiser" node.description = "Matrix Spatialiser" media.name = "Matrix Spatialiser" filter.graph = { @@ -45,16 +44,15 @@ context.modules = [ inputs = [ "matrix:Input L" "matrix:Input R" ] outputs = [ "matrix:Output L" "matrix:Output R" ] } + audio.channels = 2 + audio.position = [ FL FR ] capture.props = { + node.name = "effect_input.matrix_spatialiser" 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 ] + node.name = "effect_output.matrix_spatialiser" + node.passive = true } } } diff --git a/src/daemon/filter-chain/sink-virtual-surround-5.1-kemar.conf b/src/daemon/filter-chain/sink-virtual-surround-5.1-kemar.conf index 6b87c0852..fa12ca4a5 100644 --- a/src/daemon/filter-chain/sink-virtual-surround-5.1-kemar.conf +++ b/src/daemon/filter-chain/sink-virtual-surround-5.1-kemar.conf @@ -26,7 +26,6 @@ context.modules = [ { name = libpipewire-module-filter-chain args = { - node.name = "effect_output.virtual-surround-5.1-kemar" node.description = "Virtual Surround Sink" media.name = "Virtual Surround Sink" filter.graph = { @@ -182,11 +181,13 @@ context.modules = [ } capture.props = { + node.name = "effect_input.virtual-surround-5.1-kemar" media.class = Audio/Sink audio.channels = 6 audio.position = [ FL FR FC LFE SL SR] } playback.props = { + node.name = "effect_output.virtual-surround-5.1-kemar" node.passive = true audio.channels = 2 audio.position = [ FL FR ] diff --git a/src/daemon/filter-chain/sink-virtual-surround-7.1-hesuvi.conf b/src/daemon/filter-chain/sink-virtual-surround-7.1-hesuvi.conf index aa23099ed..ee596a530 100644 --- a/src/daemon/filter-chain/sink-virtual-surround-7.1-hesuvi.conf +++ b/src/daemon/filter-chain/sink-virtual-surround-7.1-hesuvi.conf @@ -26,7 +26,6 @@ context.modules = [ { name = libpipewire-module-filter-chain args = { - node.name = "effect_output.virtual-surround-7.1-hesuvi" node.description = "Virtual Surround Sink" media.name = "Virtual Surround Sink" filter.graph = { @@ -106,11 +105,13 @@ context.modules = [ outputs = [ "mixL:Out" "mixR:Out" ] } capture.props = { + node.name = "effect_input.virtual-surround-7.1-hesuvi" media.class = Audio/Sink audio.channels = 8 audio.position = [ FL FR FC LFE RL RR SL SR ] } playback.props = { + node.name = "effect_output.virtual-surround-7.1-hesuvi" 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 36f11608a..fba5e2964 100644 --- a/src/daemon/filter-chain/source-rnnoise.conf +++ b/src/daemon/filter-chain/source-rnnoise.conf @@ -26,7 +26,6 @@ context.modules = [ { name = libpipewire-module-filter-chain args = { - node.name = "effect_input.rnnoise" node.description = "Noise Canceling source" media.name = "Noise Canceling source" filter.graph = { @@ -42,10 +41,13 @@ context.modules = [ } ] } + audio.position = [ FL FR ] capture.props = { + node.name = "effect_input.rnnoise" node.passive = true } playback.props = { + node.name = "effect_output.rnnoise" media.class = Audio/Source } }