mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-19 08:57:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: move rule matching to config

Browse source 
And remove duplicated code. This is generally useful and sufficiently
generic API to include.
This commit is contained in:
Wim Taymans 2022-02-04 10:43:31 +01:00
parent cc73053512
commit 877dc77645
6 changed files with 166 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pipewire-jack/src/pipewire-jack.c
View file

@ -3087,7 +3087,8 @@ static void varargs_parse (struct client *c, jack_options_t options, va_list ap)
}
static int execute_match(void *data, const char *action, const char *val, int len)
static int execute_match(void *data, const char *location, const char *action,
const char *val, size_t len)
{
struct client *client = data;
if (spa_streq(action, "update-props"))
@ -3095,19 +3096,6 @@ static int execute_match(void *data, const char *action, const char *val, int le
return 1;
}
static int apply_jack_rules(void *data, const char *location, const char *section,
const char *str, size_t len)
{
struct client *client = data;
const struct pw_properties *p =
pw_context_get_properties(client->context.context);
if (p != NULL)
pw_jack_match_rules(str, len, &p->dict, execute_match, client);
return 0;
}
SPA_EXPORT
jack_client_t * jack_client_open (const char *client_name,
jack_options_t options,
@ -3171,9 +3159,8 @@ jack_client_t * jack_client_open (const char *client_name,
if ((str = getenv("PIPEWIRE_PROPS")) != NULL)
pw_properties_update_string(client->props, str, strlen(str));
pw_context_conf_section_for_each(client->context.context, "jack.rules",
apply_jack_rules, client);
pw_context_conf_section_match_rules(client->context.context, "jack.rules",
&client->props->dict, execute_match, client);
client->show_monitor = pw_properties_get_bool(client->props, "jack.show-monitor", true);
client->merge_monitor = pw_properties_get_bool(client->props, "jack.merge-monitor", false);