wireplumber.conf: improve the v4l2 and libcamera monitors components definitions

This was needlessly complicated and some of the requires did not make sense
This commit is contained in:
George Kiagiadakis 2024-09-02 13:55:41 +03:00
parent 89ab5616c0
commit 32be79ee56

View file

@ -314,12 +314,10 @@ wireplumber.components = [
provides = monitor.alsa-midi
wants = [ monitor.alsa-midi.monitoring ]
}
## v4l2 monitor hooks
## v4l2 monitor
{
name = monitors/v4l2/name-device.lua, type = script/lua
provides = hooks.monitor.v4l2-name-device
requires = [ support.export-core,
support.standard-event-source ]
}
{
name = monitors/v4l2/create-device.lua, type = script/lua
@ -331,43 +329,26 @@ wireplumber.components = [
{
name = monitors/v4l2/name-node.lua, type = script/lua
provides = hooks.monitor.v4l2-name-node
requires = [ support.export-core,
support.standard-event-source ]
}
{
name = monitors/v4l2/create-node.lua, type = script/lua
provides = hooks.monitor.v4l2-create-node
requires = [ support.export-core,
support.standard-event-source ]
}
{
type = virtual, provides = monitor.v4l2.hooks
wants = [ hooks.monitor.v4l2-name-device,
hooks.monitor.v4l2-create-device,
hooks.monitor.v4l2-name-node,
hooks.monitor.v4l2-create-node ]
}
# enumerate-device.lua needs rest of the monitor hooks to be loaded first.
{
name = monitors/v4l2/enumerate-device.lua, type = script/lua
provides = hooks.monitor.v4l2-enumerate-device
provides = monitor.v4l2
requires = [ support.export-core,
pw.client-device,
support.standard-event-source,
monitor.v4l2.hooks ]
hooks.monitor.v4l2-create-device,
hooks.monitor.v4l2-create-node ]
wants = [ hooks.monitor.v4l2-name-device,
hooks.monitor.v4l2-name-node ]
}
{
type = virtual, provides = monitor.v4l2
wants = [ hooks.monitor.v4l2-enumerate-device,
monitor.v4l2.hooks ]
}
## libcamera monitor hooks
## libcamera monitor
{
name = monitors/libcamera/name-device.lua, type = script/lua
provides = hooks.monitor.libcamera-name-device
requires = [ support.export-core,
support.standard-event-source ]
}
{
name = monitors/libcamera/create-device.lua, type = script/lua
@ -379,35 +360,21 @@ wireplumber.components = [
{
name = monitors/libcamera/name-node.lua, type = script/lua
provides = hooks.monitor.libcamera-name-node
requires = [ support.export-core,
support.standard-event-source ]
}
{
name = monitors/libcamera/create-node.lua, type = script/lua
provides = hooks.monitor.libcamera-create-node
requires = [ support.export-core,
support.standard-event-source ]
}
{
type = virtual, provides = monitor.libcamera.hooks
wants = [ hooks.monitor.libcamera-name-device,
hooks.monitor.libcamera-create-device,
hooks.monitor.libcamera-name-node,
hooks.monitor.libcamera-create-node ]
}
# enumerate-device.lua needs rest of the monitor hooks to be loaded first.
{
name = monitors/libcamera/enumerate-device.lua, type = script/lua
provides = hooks.monitor.libcamera-enumerate-device
provides = monitor.libcamera
requires = [ support.export-core,
pw.client-device,
support.standard-event-source,
monitor.libcamera.hooks ]
}
{
type = virtual, provides = monitor.libcamera
wants = [ hooks.monitor.libcamera-enumerate-device,
monitor.libcamera.hooks ]
hooks.monitor.libcamera-create-device,
hooks.monitor.libcamera-create-node ]
wants = [ hooks.monitor.libcamera-name-device,
hooks.monitor.libcamera-name-node ]
}
## Client access configuration hooks