mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-12 13:30:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "context: add loader.rules"

Browse source 
This reverts commit cfeb937443.

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.
This commit is contained in:
Wim Taymans 2024-06-10 10:34:01 +02:00
parent 9856500a13
commit 0d9a959ab6
1 changed files with 1 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/pipewire/context.c
View file

@ -1930,25 +1930,6 @@ const char *pw_context_find_spa_lib(struct pw_context *context, const char *fact
return NULL; 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 SPA_EXPORT
struct spa_handle *pw_context_load_spa_handle(struct pw_context *context, struct spa_handle *pw_context_load_spa_handle(struct pw_context *context,
const char *factory_name, 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; const struct spa_support *support;
uint32_t n_support; uint32_t n_support;
struct spa_handle *handle; struct spa_handle *handle;
struct match match;
pw_log_debug("%p: load factory %s", context, factory_name); 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; 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); support = context_get_support(context, &n_support, info);
handle = pw_load_spa_handle(lib, factory_name, handle = pw_load_spa_handle(lib, factory_name,
info, n_support, support); info, n_support, support);
pw_properties_free(match.props);
return handle; return handle;
} }