From 739f3b9f7f6e7689b0122f558c1e7d883f4fa9e0 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 9 Feb 2021 17:37:08 +0100 Subject: [PATCH] media-session: disable JACK device by default It is most likely to fail right now. --- src/daemon/media-session.d/alsa-monitor.conf | 7 +++++-- src/examples/media-session/alsa-monitor.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/daemon/media-session.d/alsa-monitor.conf b/src/daemon/media-session.d/alsa-monitor.conf index f34c396fe..cb260a70e 100644 --- a/src/daemon/media-session.d/alsa-monitor.conf +++ b/src/daemon/media-session.d/alsa-monitor.conf @@ -1,8 +1,11 @@ # ALSA monitor config file # properties = { - # Create a JACK device. - #alsa.jack-device = true + # Create a JACK device. This is not enabled by default because + # it requires that the PipeWire JACK replacement libraries are + # not used by the session manager, in order to be able to + # connect to the real JACK server. + #alsa.jack-device = false } rules = [ diff --git a/src/examples/media-session/alsa-monitor.c b/src/examples/media-session/alsa-monitor.c index fe85a8979..24e39f885 100644 --- a/src/examples/media-session/alsa-monitor.c +++ b/src/examples/media-session/alsa-monitor.c @@ -1047,7 +1047,7 @@ int sm_alsa_monitor_start(struct sm_media_session *session) spa_list_init(&impl->device_list); spa_device_add_listener(impl->monitor, &impl->listener, &alsa_udev_events, impl); - if ((str = pw_properties_get(impl->props, "alsa.jack-device")) == NULL || + if ((str = pw_properties_get(impl->props, "alsa.jack-device")) != NULL && pw_properties_parse_bool(str)) { if ((res = alsa_start_jack_device(impl)) < 0) goto out_free;