mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

filter-chain: move node.name to the streams

Browse source 
The global node.name is not used anymore because the streams need unique
names.
This commit is contained in:
Wim Taymans 2022-02-22 15:48:43 +01:00
parent 2cd3427786
commit d06e13210d
8 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/daemon/filter-chain/demonic.conf
View file

@ -46,8 +46,7 @@ context.modules = [
#audio.format = F32 #audio.format = F32
#audio.rate = 48000 #audio.rate = 48000
audio.channels = 2 audio.channels = 2
#audio.position = [ FL FR ] audio.position = [ FL FR ]
node.name = "filter-chain-demonic"
node.description = "Demonic example" node.description = "Demonic example"
media.name = "Demonic example" media.name = "Demonic example"
filter.graph = { filter.graph = {
@ -89,9 +88,11 @@ context.modules = [
outputs = [ "rev2:Out L" ] outputs = [ "rev2:Out L" ]
} }
capture.props = { capture.props = {
node.name = "effect_input.filter-chain-demonic"
#media.class = Audio/Sink #media.class = Audio/Sink
} }
playback.props = { playback.props = {
node.name = "effect_output.filter-chain-demonic"
#media.class = Audio/Source #media.class = Audio/Source
} }
} }

3
src/daemon/filter-chain/duplicate-FL.conf
View file

@ -6,7 +6,6 @@
context.modules = [ context.modules = [
{ name = libpipewire-module-filter-chain { name = libpipewire-module-filter-chain
args = { args = {
node.name = "remap-FL-to-FL-FR"
node.description = "Remap example" node.description = "Remap example"
media.name = "Remap example" media.name = "Remap example"
filter.graph = { filter.graph = {
@ -37,10 +36,12 @@ context.modules = [
outputs = [ "copyOL:Out" "copyOR:Out" ] outputs = [ "copyOL:Out" "copyOR:Out" ]
} }
capture.props = { capture.props = {
node.name = "remap_input.remap-FL-to-FL-FR"
audio.position = [ FL ] audio.position = [ FL ]
stream.dont-remix = true stream.dont-remix = true
} }
playback.props = { playback.props = {
node.name = "remap_output.remap-FL-to-FL-FR"
audio.position = [ FL FR ] audio.position = [ FL FR ]
} }
} }

3
src/daemon/filter-chain/sink-dolby-surround.conf
View file

@ -26,7 +26,6 @@ context.modules = [
{ name = libpipewire-module-filter-chain { name = libpipewire-module-filter-chain
args = { args = {
node.name = "effect_output.dolby_surround"
node.description = "Dolby Surround Sink" node.description = "Dolby Surround Sink"
media.name = "Dolby Surround Sink" media.name = "Dolby Surround Sink"
filter.graph = { filter.graph = {
@ -51,11 +50,13 @@ context.modules = [
outputs = [ "enc:Lt" "enc:Rt" ] outputs = [ "enc:Lt" "enc:Rt" ]
} }
capture.props = { capture.props = {
node.name = "effect_input.dolby_surround"
media.class = Audio/Sink media.class = Audio/Sink
audio.channels = 6 audio.channels = 6
audio.position = [ FL FR FC LFE SL SR ] audio.position = [ FL FR FC LFE SL SR ]
} }
playback.props = { playback.props = {
node.name = "effect_output.dolby_surround"
node.passive = true node.passive = true
audio.channels = 2 audio.channels = 2
audio.position = [ FL FR ] audio.position = [ FL FR ]

3
src/daemon/filter-chain/sink-eq6.conf
View file

@ -26,7 +26,6 @@ context.modules = [
{ name = libpipewire-module-filter-chain { name = libpipewire-module-filter-chain
args = { args = {
node.name = "effect_output.eq6"
node.description = "Equalizer Sink" node.description = "Equalizer Sink"
media.name = "Equalizer Sink" media.name = "Equalizer Sink"
filter.graph = { filter.graph = {
@ -77,9 +76,11 @@ context.modules = [
] ]
} }
capture.props = { capture.props = {
node.name = "effect_input.eq6"
media.class = Audio/Sink media.class = Audio/Sink
} }
playback.props = { playback.props = {
node.name = "effect_output.eq6"
node.passive = true node.passive = true
} }
} }

12
src/daemon/filter-chain/sink-matrix-spatialiser.conf
View file

@ -27,7 +27,6 @@ context.modules = [
{ name = libpipewire-module-filter-chain { name = libpipewire-module-filter-chain
args = { args = {
node.name = "effect_output.matrix_spatialiser"
node.description = "Matrix Spatialiser" node.description = "Matrix Spatialiser"
media.name = "Matrix Spatialiser" media.name = "Matrix Spatialiser"
filter.graph = { filter.graph = {
@ -45,16 +44,15 @@ context.modules = [
inputs = [ "matrix:Input L" "matrix:Input R" ] inputs = [ "matrix:Input L" "matrix:Input R" ]
outputs = [ "matrix:Output L" "matrix:Output R" ] outputs = [ "matrix:Output L" "matrix:Output R" ]
} }
audio.channels = 2
audio.position = [ FL FR ]
capture.props = { capture.props = {
node.name = "effect_input.matrix_spatialiser"
media.class = Audio/Sink media.class = Audio/Sink
audio.channels = 2
audio.position = [ FL FR ]
} }
playback.props = { playback.props = {
#media.class = Audio/Source node.name = "effect_output.matrix_spatialiser"
#node.passive = true node.passive = true
audio.channels = 2
audio.position = [ FL FR ]
} }
} }
} }

3
src/daemon/filter-chain/sink-virtual-surround-5.1-kemar.conf
View file

@ -26,7 +26,6 @@ context.modules = [
{ name = libpipewire-module-filter-chain { name = libpipewire-module-filter-chain
args = { args = {
node.name = "effect_output.virtual-surround-5.1-kemar"
node.description = "Virtual Surround Sink" node.description = "Virtual Surround Sink"
media.name = "Virtual Surround Sink" media.name = "Virtual Surround Sink"
filter.graph = { filter.graph = {
@ -182,11 +181,13 @@ context.modules = [
} }
capture.props = { capture.props = {
node.name = "effect_input.virtual-surround-5.1-kemar"
media.class = Audio/Sink media.class = Audio/Sink
audio.channels = 6 audio.channels = 6
audio.position = [ FL FR FC LFE SL SR] audio.position = [ FL FR FC LFE SL SR]
} }
playback.props = { playback.props = {
node.name = "effect_output.virtual-surround-5.1-kemar"
node.passive = true node.passive = true
audio.channels = 2 audio.channels = 2
audio.position = [ FL FR ] audio.position = [ FL FR ]

3
src/daemon/filter-chain/sink-virtual-surround-7.1-hesuvi.conf
View file

@ -26,7 +26,6 @@ context.modules = [
{ name = libpipewire-module-filter-chain { name = libpipewire-module-filter-chain
args = { args = {
node.name = "effect_output.virtual-surround-7.1-hesuvi"
node.description = "Virtual Surround Sink" node.description = "Virtual Surround Sink"
media.name = "Virtual Surround Sink" media.name = "Virtual Surround Sink"
filter.graph = { filter.graph = {
@ -106,11 +105,13 @@ context.modules = [
outputs = [ "mixL:Out" "mixR:Out" ] outputs = [ "mixL:Out" "mixR:Out" ]
} }
capture.props = { capture.props = {
node.name = "effect_input.virtual-surround-7.1-hesuvi"
media.class = Audio/Sink media.class = Audio/Sink
audio.channels = 8 audio.channels = 8
audio.position = [ FL FR FC LFE RL RR SL SR ] audio.position = [ FL FR FC LFE RL RR SL SR ]
} }
playback.props = { playback.props = {
node.name = "effect_output.virtual-surround-7.1-hesuvi"
node.passive = true node.passive = true
audio.channels = 2 audio.channels = 2
audio.position = [ FL FR ] audio.position = [ FL FR ]

4
src/daemon/filter-chain/source-rnnoise.conf
View file

@ -26,7 +26,6 @@ context.modules = [
{ name = libpipewire-module-filter-chain { name = libpipewire-module-filter-chain
args = { args = {
node.name = "effect_input.rnnoise"
node.description = "Noise Canceling source" node.description = "Noise Canceling source"
media.name = "Noise Canceling source" media.name = "Noise Canceling source"
filter.graph = { filter.graph = {
@ -42,10 +41,13 @@ context.modules = [
} }
] ]
} }
audio.position = [ FL FR ]
capture.props = { capture.props = {
node.name = "effect_input.rnnoise"
node.passive = true node.passive = true
} }
playback.props = { playback.props = {
node.name = "effect_output.rnnoise"
media.class = Audio/Source media.class = Audio/Source
} }
} }