mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: add jack.filter-char to specify the filter character

Browse source
This commit is contained in:
Wim Taymans 2022-11-10 17:40:25 +01:00
parent b720da771e
commit 518ccdf624
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -404,6 +404,7 @@ struct client {
int rt_max;
unsigned int fix_midi_events:1;
unsigned int global_buffer_size:1;
char filter_char;
jack_position_t jack_position;
jack_transport_state_t jack_state;
@ -2793,12 +2794,12 @@ static const struct pw_port_events port_events = {
#define FILTER_NAME " ()[].:*$"
#define FILTER_PORT " ()[].*$"
static void filter_name(char *str, const char *filter)
static void filter_name(char *str, const char *filter, char filter_char)
{
char *p;
for (p = str; *p; p++) {
if (strchr(filter, *p) != NULL)
*p = ' ';
*p = filter_char;
}
}
@ -2863,7 +2864,7 @@ static void registry_event_global(void *data, uint32_t id,
snprintf(tmp, sizeof(tmp), "%s", str);
if (c->filter_name)
filter_name(tmp, FILTER_NAME);
filter_name(tmp, FILTER_NAME, c->filter_char);
ot = find_node(c, tmp);
if (ot != NULL && o->node.client_id != ot->node.client_id) {
@ -2980,7 +2981,7 @@ static void registry_event_global(void *data, uint32_t id,
snprintf(tmp, sizeof(tmp), "%s:%s", ot->node.name, str);
if (c->filter_name)
filter_name(tmp, FILTER_PORT);
filter_name(tmp, FILTER_PORT, c->filter_char);
op = find_port_by_name(c, tmp);
if (op != NULL)
@ -3444,6 +3445,9 @@ jack_client_t * jack_client_open (const char *client_name,
client->merge_monitor = pw_properties_get_bool(client->props, "jack.merge-monitor", false);
client->short_name = pw_properties_get_bool(client->props, "jack.short-name", false);
client->filter_name = pw_properties_get_bool(client->props, "jack.filter-name", false);
client->filter_char = ' ';
if ((str = pw_properties_get(client->props, "jack.filter-char")) != NULL && str[0] != '\0')
client->filter_char = str[0];
client->locked_process = pw_properties_get_bool(client->props, "jack.locked-process", true);
client->default_as_system = pw_properties_get_bool(client->props, "jack.default-as-system", false);
client->fix_midi_events = pw_properties_get_bool(client->props, "jack.fix-midi-events", true);

1
src/daemon/jack.conf.in
View file

@ -73,6 +73,7 @@ jack.properties = {
#jack.merge-monitor = false
#jack.short-name = false
#jack.filter-name = false
#jack.filter-char = " "
#
# allow: Don't restrict self connect requests
# fail-external: Fail self connect requests to external ports only