jack: make jack.merge-monitor default true
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:
parent
3e6f62875d
commit
03cb7f3549
|
@ -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 = ' ';
|
||||
|
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue