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: make jack.merge-monitor default true

Browse source 
Make jack.merge-monitor true by default because this is what JACK also
does.

Add an exception for Mixxx because that makes it easier to select the
capture/monitor ports.

Fixes #1760
This commit is contained in:
Wim Taymans 2023-01-25 09:48:28 +01:00
parent 3e6f62875d
commit 03cb7f3549
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3480,7 +3480,7 @@ jack_client_t * jack_client_open (const char *client_name,
client->info.change_mask = 0;
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);
client->merge_monitor = pw_properties_get_bool(client->props, "jack.merge-monitor", true);
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 = ' ';

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

@ -70,7 +70,7 @@ jack.properties = {
#node.lock-quantum = true
#node.force-quantum = 0
#jack.show-monitor = true
#jack.merge-monitor = false
#jack.merge-monitor = true
#jack.short-name = false
#jack.filter-name = false
#jack.filter-char = " "
@ -89,8 +89,7 @@ jack.properties = {
# client specific properties
jack.rules = [
{
matches = [
{ matches = [
{
# all keys must match the value. ~ starts regex.
#client.name = "Carla"
@ -104,18 +103,14 @@ jack.rules = [
}
}
}
{ matches = [
{ application.process.binary = "jack_bufsize" }
]
{ matches = [ { application.process.binary = "jack_bufsize" } ]
actions = {
update-props = {
jack.global-buffer-size = true # quantum set globally using metadata
}
}
}
{ matches = [
{ application.process.binary = "qsynth" }
]
{ matches = [ { application.process.binary = "qsynth" } ]
actions = {
update-props = {
node.pause-on-idle = false # makes audio fade out when idle
@ -123,4 +118,11 @@ jack.rules = [
}
}
}
{ matches = [ { client.name = "Mixxx" } ]
actions = {
update-props = {
jack.merge-monitor = false
}
}
}
]