fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2025-12-20 01:50:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

linking/rescan.lua: Clean a bit the code using the new properties API

Browse source
This commit is contained in:
Julian Bouzas 2025-10-28 13:49:37 -04:00 • committed by George Kiagiadakis
parent 5071a85997
commit f196d10e87
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/scripts/linking/rescan.lua
View file

@ -26,7 +26,7 @@ function checkFilter (si, om, handle_nonstreams)
-- always return true if this is not a filter
local node = si:get_associated_proxy ("node")
local link_group = node.properties["node.link-group"]
local link_group = node:get_property ("node.link-group")
if link_group == nil then
return true
end
@ -43,36 +43,34 @@ function checkFilter (si, om, handle_nonstreams)
end
function checkLinkable (si, om, handle_nonstreams)
local si_props = si.properties
-- For the rest of them, only handle stream session items
if not si_props or (si_props ["item.node.type"] ~= "stream"
and not handle_nonstreams) then
return false, si_props
if si:get_property ("item.node.type") ~= "stream" and
not handle_nonstreams then
return false
end
-- check filters
if not checkFilter (si, om, handle_nonstreams) then
return false, si_props
return false
end
return true, si_props
return true
end
function unhandleLinkable (si, om)
local si_id = si.id
local valid, si_props = checkLinkable (si, om, true)
if not valid then
if not checkLinkable (si, om, true) then
return
end
local si_id = si.id
log:info (si, string.format ("unhandling item %d", si_id))
-- iterate over all the links in the graph and
-- remove any links associated with this item
for silink in om:iterate { type = "SiLink" } do
local out_id = tonumber (silink.properties ["out.item.id"])
local in_id = tonumber (silink.properties ["in.item.id"])
local silink_props = silink.properties
local out_id = silink_props:get_int ("out.item.id")
local in_id = silink_props:get_int ("in.item.id")
if out_id == si_id or in_id == si_id then
local in_flags = lutils:get_flags (in_id)
@ -84,7 +82,7 @@ function unhandleLinkable (si, om)
out_flags.peer_id = nil
end
if cutils.parseBool (silink.properties["is.role.policy.link"]) then
if silink_props:get_boolean ("is.role.policy.link") then
lutils.clearPriorityMediaRoleLink(silink)
end
@ -117,13 +115,15 @@ function handleLinkables (source)
local om = source:call ("get-object-manager", "session-item")
for si in om:iterate { type = "SiLinkable" } do
local valid, si_props = checkLinkable (si, om)
if not valid then
if not checkLinkable (si, om) then
goto skip_linkable
end
-- Get properties
local si_props = si.properties
-- check if we need to link this node at all
local autoconnect = cutils.parseBool (si_props ["node.autoconnect"])
local autoconnect = si_props:get_boolean ("node.autoconnect")
if not autoconnect then
log:debug (si, tostring (si_props ["node.name"]) .. " does not need to be autoconnected")
goto skip_linkable
@ -155,7 +155,7 @@ SimpleEventHook {
Constraint { "node.link-group", "+" },
} do
local node = si:get_associated_proxy ("node")
local link_group = node.properties["node.link-group"]
local link_group = node:get_property ("node.link-group")
local direction = cutils.getTargetDirection (si.properties)
if futils.is_filter_smart (direction, link_group) and
futils.is_filter_disabled (direction, link_group) then
@ -235,7 +235,6 @@ SimpleEventHook {
},
execute = function (event)
local si = event:get_subject ()
local si_props = si.properties
local source = event:get_source ()
-- clear timeout source, if any