From 0d9a959ab6a5b503f41c2d36a0908df744594ef7 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 10 Jun 2024 10:34:01 +0200 Subject: [PATCH] Revert "context: add loader.rules" This reverts commit cfeb937443c92d61727246e27b508c7c4e7fe273. Let's remove this for now, the node.rules and device.rules are mostly used for this. We can add this later when there is a need for it. --- src/pipewire/context.c | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/src/pipewire/context.c b/src/pipewire/context.c index db732d2aa..686dd5eee 100644 --- a/src/pipewire/context.c +++ b/src/pipewire/context.c @@ -1930,25 +1930,6 @@ const char *pw_context_find_spa_lib(struct pw_context *context, const char *fact return NULL; } -struct match { - const struct spa_dict *info; - struct pw_properties *props; - int count; -}; -#define MATCH_INIT(i) ((struct match){ .info = (i) }) - -static int execute_match(void *data, const char *location, const char *action, - const char *val, size_t len) -{ - struct match *match = data; - if (spa_streq(action, "update-props")) { - if (match->props == NULL) - match->props = pw_properties_new_dict(match->info); - match->count += pw_properties_update_string(match->props, val, len); - } - return 1; -} - SPA_EXPORT struct spa_handle *pw_context_load_spa_handle(struct pw_context *context, const char *factory_name, @@ -1958,7 +1939,6 @@ struct spa_handle *pw_context_load_spa_handle(struct pw_context *context, const struct spa_support *support; uint32_t n_support; struct spa_handle *handle; - struct match match; pw_log_debug("%p: load factory %s", context, factory_name); @@ -1972,20 +1952,11 @@ struct spa_handle *pw_context_load_spa_handle(struct pw_context *context, return NULL; } - match = MATCH_INIT(info); - if (info) { - pw_context_conf_section_match_rules(context, "loader.rules", - info, execute_match, &match); - - if (match.props) - info = &match.props->dict; - } support = context_get_support(context, &n_support, info); + handle = pw_load_spa_handle(lib, factory_name, info, n_support, support); - pw_properties_free(match.props); - return handle; }