fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2026-04-30 13:30:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

linking: use si_props for 'target.*' properties

Browse source 
This avoids indexing the Lua table every time the properties are accessed.
This commit is contained in:
Julian Bouzas 2023-11-01 09:48:09 -04:00 • committed by George Kiagiadakis
parent 8ac96f4a37
commit f5a29981aa
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/scripts/linking/find-defined-target.lua
View file

@ -35,10 +35,8 @@ SimpleEventHook {
tostring (si_props ["node.name"]), tostring (si_props ["node.id"])))
local metadata = config.move and cutils.get_default_metadata_object ()
local node = si:get_associated_proxy ("node")
local dont_fallback = cutils.parseBool (node.properties ["target.dont-fallback"])
local dont_move = cutils.parseBool (node.properties ["target.dont-move"])
local linger = cutils.parseBool (node.properties ["target.linger"])
local dont_fallback = cutils.parseBool (si_props ["target.dont-fallback"])
local dont_move = cutils.parseBool (si_props ["target.dont-move"])
local target_key
local target_value = nil
local node_defined = false
@ -115,7 +113,9 @@ SimpleEventHook {
event:set_data ("target", target)
elseif target_value and dont_fallback then
-- send error to client and destroy node if linger is not set
local linger = cutils.parseBool (si_props ["target.linger"])
if not linger then
local node = si:get_associated_proxy ("node")
putils.sendClientError (event, node, "defined target not found")
node:request_destroy ()
log:info(si, "... destroyed node as defined target was not found")

12
src/scripts/linking/find-filter-target.lua
View file

@ -11,7 +11,7 @@ cutils = require ("common-utils")
futils = require ("filter-utils")
log = Log.open_topic ("s-linking")
function findFilterTarget (si, om)
function findFilterTarget (si, om, dont_move)
local node = si:get_associated_proxy ("node")
local link_group = node.properties ["node.link-group"]
local target_id = -1
@ -28,7 +28,6 @@ function findFilterTarget (si, om)
end
-- get the filter target
local dont_move = cutils.parseBool (node.properties ["target.dont-move"])
return futils.get_filter_target (direction, link_group, dont_move), true
end
@ -49,16 +48,15 @@ SimpleEventHook {
return
end
local node = si:get_associated_proxy ("node")
local dont_fallback = cutils.parseBool (node.properties ["target.dont-fallback"])
local linger = cutils.parseBool (node.properties ["target.linger"])
local dont_fallback = cutils.parseBool (si_props ["target.dont-fallback"])
local dont_move = cutils.parseBool (si_props ["target.dont-move"])
local target_picked = false
local allow_fallback
log:info (si, string.format ("handling item: %s (%s)",
tostring (si_props ["node.name"]), tostring (si_props ["node.id"])))
target, is_smart_filter = findFilterTarget (si, om)
target, is_smart_filter = findFilterTarget (si, om, dont_move)
local can_passthrough, passthrough_compatible
if target then
@ -79,7 +77,9 @@ SimpleEventHook {
event:set_data ("target", target)
elseif is_smart_filter and dont_fallback then
-- send error to client and destroy node if linger is not set
local linger = cutils.parseBool (si_props ["target.linger"])
if not linger then
local node = si:get_associated_proxy ("node")
putils.sendClientError (event, node, "smart filter defined target not found")
node:request_destroy ()
log:info(si, "... destroyed node as smart filter defined target was not found")

3
src/scripts/node/create-item.lua
View file

@ -29,6 +29,9 @@ function configProperties (node)
["priority.session"] = np ["priority.session"],
["device.id"] = np ["device.id"],
["card.profile.device"] = np ["card.profile.device"],
["target.dont-fallback"] = np ["target.dont-fallback"],
["target.dont-move"] = np ["target.dont-move"],
["target.linger"] = np ["target.linger"],
}
for k, v in pairs (np) do