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

jack: add option to merge monitors

Browse source 
Make a different name for the monitor port prefix so that they
appear as different clients.
Add an option to restore the previous behaviour.

See #736
This commit is contained in:
Wim Taymans 2021-02-16 13:23:47 +01:00
parent d1f21a939a
commit af686653a9
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -350,6 +350,7 @@ struct client {
unsigned int warn_mlock:1; unsigned int warn_mlock:1;
unsigned int timeowner_pending:1; unsigned int timeowner_pending:1;
unsigned int timeowner_conditional:1; unsigned int timeowner_conditional:1;
unsigned int merge_monitor:1;
jack_position_t jack_position; jack_position_t jack_position;
jack_transport_state_t jack_state; jack_transport_state_t jack_state;
@ -2201,6 +2202,8 @@ static void registry_event_global(void *data, uint32_t id,
if (ot->node.is_bridge && strchr(str, ':') != NULL) if (ot->node.is_bridge && strchr(str, ':') != NULL)
snprintf(o->port.name, sizeof(o->port.name), "%s", str); snprintf(o->port.name, sizeof(o->port.name), "%s", str);
else if (is_monitor && !c->merge_monitor)
snprintf(o->port.name, sizeof(o->port.name), "%s Monitor:%s", ot->node.name, str);
else else
snprintf(o->port.name, sizeof(o->port.name), "%s:%s", ot->node.name, str); snprintf(o->port.name, sizeof(o->port.name), "%s:%s", ot->node.name, str);
@ -2438,6 +2441,13 @@ jack_client_t * jack_client_open (const char *client_name,
client->allow_mlock = client->context.context->defaults.mem_allow_mlock; client->allow_mlock = client->context.context->defaults.mem_allow_mlock;
client->warn_mlock = client->context.context->defaults.mem_warn_mlock; client->warn_mlock = client->context.context->defaults.mem_warn_mlock;
if ((str = pw_context_get_conf_section(client->context.context,
"jack.properties")) != NULL)
pw_properties_update_string(client->props, str, strlen(str));
if ((str = pw_properties_get(client->props, "jack.merge-monitor")) != NULL)
client->merge_monitor = pw_properties_parse_bool(str);
spa_list_init(&client->context.free_objects); spa_list_init(&client->context.free_objects);
pthread_mutex_init(&client->context.lock, NULL); pthread_mutex_init(&client->context.lock, NULL);
spa_list_init(&client->context.nodes); spa_list_init(&client->context.nodes);

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

@ -52,3 +52,7 @@ context.modules = {
# a factory for Metadata objects. # a factory for Metadata objects.
libpipewire-module-metadata = null libpipewire-module-metadata = null
} }
jack.properties = {
#jack.merge-monitor = false
}