colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: monitors: log warning if spa devices were not created successfully

Browse Source 
Can happen if the user does not have the specific spa pluging installed.
This commit is contained in:
Julian Bouzas
2022-01-11 11:27:33 -05:00
committed by George Kiagiadakis
parent 07a0a5b404
commit 40b16974cf
4 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/scripts/monitors/alsa.lua
View File

@@ -177,9 +177,13 @@ end
function createDevice(parent, id, factory, properties) function createDevice(parent, id, factory, properties)
local device = SpaDevice(factory, properties) local device = SpaDevice(factory, properties)
device:connect("create-object", createNode) if device then
device:activate(Feature.SpaDevice.ENABLED | Feature.Proxy.BOUND) device:connect("create-object", createNode)
parent:store_managed_object(id, device) device:activate(Feature.SpaDevice.ENABLED | Feature.Proxy.BOUND)
parent:store_managed_object(id, device)
else
Log.warning ("Failed to create '" .. factory .. "' device")
end
end end
function prepareDevice(parent, id, type, factory, properties) function prepareDevice(parent, id, type, factory, properties)

9
src/scripts/monitors/bluez.lua
View File

@@ -109,8 +109,13 @@ function createDevice(parent, id, type, factory, properties)
-- create the device -- create the device
device = SpaDevice(factory, properties) device = SpaDevice(factory, properties)
device:connect("create-object", createNode) if device then
parent:store_managed_object(id, device) device:connect("create-object", createNode)
parent:store_managed_object(id, device)
else
Log.warning ("Failed to create '" .. factory .. "' device")
return
end
end end
Log.info(parent, string.format("%d, %s (%s): %s", Log.info(parent, string.format("%d, %s (%s): %s",

10
src/scripts/monitors/libcamera.lua
View File

@@ -125,9 +125,13 @@ function createDevice(parent, id, type, factory, properties)
-- create the device -- create the device
local device = SpaDevice(factory, properties) local device = SpaDevice(factory, properties)
device:connect("create-object", createNode) if device then
device:activate(Feature.SpaDevice.ENABLED | Feature.Proxy.BOUND) device:connect("create-object", createNode)
parent:store_managed_object(id, device) device:activate(Feature.SpaDevice.ENABLED | Feature.Proxy.BOUND)
parent:store_managed_object(id, device)
else
Log.warning ("Failed to create '" .. factory .. "' device")
end
end end
monitor = SpaDevice("api.libcamera.enum.manager", config.properties or {}) monitor = SpaDevice("api.libcamera.enum.manager", config.properties or {})

10
src/scripts/monitors/v4l2.lua
View File

@@ -125,9 +125,13 @@ function createDevice(parent, id, type, factory, properties)
-- create the device -- create the device
local device = SpaDevice(factory, properties) local device = SpaDevice(factory, properties)
device:connect("create-object", createNode) if device then
device:activate(Feature.SpaDevice.ENABLED | Feature.Proxy.BOUND) device:connect("create-object", createNode)
parent:store_managed_object(id, device) device:activate(Feature.SpaDevice.ENABLED | Feature.Proxy.BOUND)
parent:store_managed_object(id, device)
else
Log.warning ("Failed to create '" .. factory .. "' device")
end
end end
monitor = SpaDevice("api.v4l2.enum.udev", config.properties or {}) monitor = SpaDevice("api.v4l2.enum.udev", config.properties or {})