From 34a1a988ba31f446b6aed77a7fe5adb510776db0 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 21 Oct 2019 16:39:08 +0200 Subject: [PATCH] session: make a jack device Add a jack device and activate it when we release the device (for JACK presumably). We need to work around some issues, jack does not allow us to connect yet when it asks to release the device so we need to wait a little and then connect. --- src/daemon/pipewire.conf.in | 1 + src/examples/media-session/alsa-monitor.c | 87 +++++++++++++++++++++- src/examples/media-session/media-session.c | 4 + 3 files changed, 88 insertions(+), 4 deletions(-) diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in index 8e86d7cee..cc9bc0913 100644 --- a/src/daemon/pipewire.conf.in +++ b/src/daemon/pipewire.conf.in @@ -16,6 +16,7 @@ add-spa-lib api.jack.* jack/libspa-jack #load-module libpipewire-module-spa-node api.alsa.seq.bridge node.name=MIDI-Bridge load-module libpipewire-module-rtkit load-module libpipewire-module-protocol-native +load-module libpipewire-module-spa-device-factory load-module libpipewire-module-spa-node-factory #load-module libpipewire-module-spa-node api.vulkan.compute.source node.name=my-compute-source #load-module libpipewire-module-spa-node videotestsrc/libspa-videotestsrc videotestsrc videotestsrc Spa:POD:Object:Props:patternType=Spa:POD:Object:Props:patternType:snow diff --git a/src/examples/media-session/alsa-monitor.c b/src/examples/media-session/alsa-monitor.c index e9602981e..2d36cda32 100644 --- a/src/examples/media-session/alsa-monitor.c +++ b/src/examples/media-session/alsa-monitor.c @@ -43,6 +43,8 @@ #include "reserve.c" +#define DEFAULT_JACK_SECONDS 1 + struct alsa_object; struct alsa_node { @@ -349,6 +351,21 @@ static int update_device_props(struct alsa_object *obj) return 1; } +static void set_jack_profile(struct impl *impl, int index) +{ + char buf[1024]; + struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buf, sizeof(buf)); + + if (impl->jack_device == NULL) + return; + + pw_device_proxy_set_param((struct pw_device_proxy*)impl->jack_device, + SPA_PARAM_Profile, 0, + spa_pod_builder_add_object(&b, + SPA_TYPE_OBJECT_ParamProfile, 0, + SPA_PARAM_PROFILE_index, SPA_POD_Int(index))); +} + static void set_profile(struct alsa_object *obj, int index) { char buf[1024]; @@ -360,18 +377,53 @@ static void set_profile(struct alsa_object *obj, int index) SPA_PARAM_PROFILE_index, SPA_POD_Int(index))); } +static void remove_jack_timeout(struct impl *impl) +{ + struct pw_loop *main_loop = pw_core_get_main_loop(impl->core); + + if (impl->jack_timeout) { + pw_loop_destroy_source(main_loop, impl->jack_timeout); + impl->jack_timeout = NULL; + } +} + +static void jack_timeout(void *data, uint64_t expirations) +{ + struct impl *impl = data; + remove_jack_timeout(impl); + set_jack_profile(impl, 1); +} + +static void add_jack_timeout(struct impl *impl) +{ + struct timespec value; + struct pw_loop *main_loop = pw_core_get_main_loop(impl->core); + + if (impl->jack_timeout == NULL) + impl->jack_timeout = pw_loop_add_timer(main_loop, jack_timeout, impl); + + value.tv_sec = DEFAULT_JACK_SECONDS; + value.tv_nsec = 0; + pw_loop_update_timer(main_loop, impl->jack_timeout, &value, NULL, false); +} static void reserve_acquired(void *data, struct rd_device *d) { struct alsa_object *obj = data; + struct monitor *monitor = obj->monitor; + struct impl *impl = monitor->impl; pw_log_debug("%p: reserve acquired", obj); + remove_jack_timeout(impl); + set_jack_profile(impl, 0); set_profile(obj, 1); } static void sync_complete_done(void *data, int seq) { struct alsa_object *obj = data; + struct monitor *monitor = obj->monitor; + struct impl *impl = monitor->impl; if (seq != obj->seq) return; @@ -380,6 +432,8 @@ static void sync_complete_done(void *data, int seq) obj->seq = 0; rd_device_complete_release(obj->reserve, true); + + add_jack_timeout(impl); } static const struct pw_proxy_events sync_complete_release = { @@ -390,9 +444,12 @@ static const struct pw_proxy_events sync_complete_release = { static void reserve_release(void *data, struct rd_device *d, int forced) { struct alsa_object *obj = data; + struct monitor *monitor = obj->monitor; + struct impl *impl = monitor->impl; pw_log_debug("%p: reserve release", obj); + remove_jack_timeout(impl); set_profile(obj, 0); if (obj->seq == 0) @@ -467,7 +524,7 @@ static struct alsa_object *alsa_create_object(struct monitor *monitor, uint32_t reserve = pw_properties_get(obj->props, "api.dbus.ReserveDevice1"); obj->reserve = rd_device_new(impl->conn, reserve, - "PipeWire", 0, + "PipeWire", 10, &reserve_callbacks, obj); if (obj->reserve == NULL) { @@ -559,11 +616,10 @@ static int alsa_start_midi_bridge(struct impl *impl) &props->dict, 0); - if (impl->midi_bridge == NULL) { + if (impl->midi_bridge == NULL) res = -errno; - } - return res; + return res; } static int alsa_start_monitor(struct impl *impl, struct monitor *monitor) @@ -598,3 +654,26 @@ static int alsa_start_monitor(struct impl *impl, struct monitor *monitor) out: return res; } + +static int alsa_start_jack_device(struct impl *impl) +{ + struct pw_properties *props; + int res = 0; + + props = pw_properties_new( + SPA_KEY_FACTORY_NAME, SPA_NAME_API_JACK_DEVICE, + SPA_KEY_NODE_NAME, "JACK-Device", + NULL); + + impl->jack_device = pw_core_proxy_create_object(impl->core_proxy, + "spa-device-factory", + PW_TYPE_INTERFACE_Device, + PW_VERSION_DEVICE_PROXY, + &props->dict, + 0); + + if (impl->jack_device == NULL) + res = -errno; + + return res; +} diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c index 5d54f1d80..56598fa80 100644 --- a/src/examples/media-session/media-session.c +++ b/src/examples/media-session/media-session.c @@ -95,6 +95,9 @@ struct impl { DBusConnection *conn; struct pw_proxy *midi_bridge; + + struct spa_source *jack_timeout; + struct pw_proxy *jack_device; }; struct object { @@ -1245,6 +1248,7 @@ static void start_services(struct impl *impl) bluez5_start_monitor(impl, &impl->bluez5_monitor); alsa_start_monitor(impl, &impl->alsa_monitor); alsa_start_midi_bridge(impl); + alsa_start_jack_device(impl); v4l2_start_monitor(impl, &impl->v4l2_monitor); }