From ff69454eb426fa5a2b1a492e099c8519b26ada53 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 10 Jan 2023 16:05:55 +0100 Subject: [PATCH] pulse-server: use TARGET_OBJECT The pulse API uses either the node.name or object.serials so pass this along in the TARGET_OBJECT instead of the NODE_TARGET now that wireplumber handles this. --- src/modules/module-protocol-pulse/collect.c | 10 ---------- src/modules/module-protocol-pulse/collect.h | 1 - .../modules/module-combine-sink.c | 2 +- .../modules/module-echo-cancel.c | 6 +++--- .../modules/module-ladspa-sink.c | 2 +- .../modules/module-ladspa-source.c | 2 +- .../modules/module-loopback.c | 6 +++--- .../modules/module-remap-sink.c | 2 +- .../modules/module-remap-source.c | 2 +- .../modules/module-rtp-recv.c | 2 +- .../modules/module-rtp-send.c | 5 ++--- .../modules/module-tunnel-sink.c | 2 +- .../modules/module-tunnel-source.c | 2 +- src/modules/module-protocol-pulse/pulse-server.c | 16 ---------------- 14 files changed, 16 insertions(+), 44 deletions(-) diff --git a/src/modules/module-protocol-pulse/collect.c b/src/modules/module-protocol-pulse/collect.c index 1c30987d0..ac6fd6e6d 100644 --- a/src/modules/module-protocol-pulse/collect.c +++ b/src/modules/module-protocol-pulse/collect.c @@ -82,16 +82,6 @@ uint32_t id_to_index(struct pw_manager *m, uint32_t id) return SPA_ID_INVALID; } -uint32_t index_to_id(struct pw_manager *m, uint32_t index) -{ - struct pw_manager_object *o; - spa_list_for_each(o, &m->object_list, link) { - if (o->index == index) - return o->id; - } - return SPA_ID_INVALID; -} - bool collect_is_linked(struct pw_manager *m, uint32_t id, enum pw_direction direction) { struct pw_manager_object *o; diff --git a/src/modules/module-protocol-pulse/collect.h b/src/modules/module-protocol-pulse/collect.h index 1155d6193..d4b85abea 100644 --- a/src/modules/module-protocol-pulse/collect.h +++ b/src/modules/module-protocol-pulse/collect.h @@ -54,7 +54,6 @@ struct selector { struct pw_manager_object *select_object(struct pw_manager *m, struct selector *s); uint32_t id_to_index(struct pw_manager *m, uint32_t id); -uint32_t index_to_id(struct pw_manager *m, uint32_t index); void select_best(struct selector *s, struct pw_manager_object *o); /* ========================================================================== */ diff --git a/src/modules/module-protocol-pulse/modules/module-combine-sink.c b/src/modules/module-protocol-pulse/modules/module-combine-sink.c index 93f6be69d..1dcbc2a44 100644 --- a/src/modules/module-protocol-pulse/modules/module-combine-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-combine-sink.c @@ -312,7 +312,7 @@ static void manager_added(void *d, struct pw_manager_object *o) pw_properties_setf(props, PW_KEY_NODE_NAME, "combine_output.sink-%u.%s", data->module->index, sink_name); pw_properties_set(props, PW_KEY_NODE_DESCRIPTION, data->sink_name); - pw_properties_set(props, PW_KEY_NODE_TARGET, sink_name); + pw_properties_set(props, PW_KEY_TARGET_OBJECT, sink_name); pw_properties_setf(props, PW_KEY_NODE_GROUP, "combine_sink-%u", data->module->index); pw_properties_setf(props, PW_KEY_NODE_LINK_GROUP, "combine_sink-%u", data->module->index); pw_properties_set(props, PW_KEY_NODE_DONT_RECONNECT, "true"); diff --git a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c b/src/modules/module-protocol-pulse/modules/module-echo-cancel.c index 600137a89..05509ed87 100644 --- a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c +++ b/src/modules/module-protocol-pulse/modules/module-echo-cancel.c @@ -208,18 +208,18 @@ static int module_echo_cancel_prepare(struct module * const module) if ((str = pw_properties_get(props, "source_master")) != NULL) { if (spa_strendswith(str, ".monitor")) { - pw_properties_setf(capture_props, PW_KEY_NODE_TARGET, + pw_properties_setf(capture_props, PW_KEY_TARGET_OBJECT, "%.*s", (int)strlen(str)-8, str); pw_properties_set(capture_props, PW_KEY_STREAM_CAPTURE_SINK, "true"); } else { - pw_properties_set(capture_props, PW_KEY_NODE_TARGET, str); + pw_properties_set(capture_props, PW_KEY_TARGET_OBJECT, str); } pw_properties_set(props, "source_master", NULL); } if ((str = pw_properties_get(props, "sink_master")) != NULL) { - pw_properties_set(playback_props, PW_KEY_NODE_TARGET, str); + pw_properties_set(playback_props, PW_KEY_TARGET_OBJECT, str); pw_properties_set(props, "sink_master", NULL); } diff --git a/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c b/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c index 051926ffa..ab60f8524 100644 --- a/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c @@ -219,7 +219,7 @@ static int module_ladspa_sink_prepare(struct module * const module) if ((str = pw_properties_get(props, "master")) != NULL || (str = pw_properties_get(props, "sink_master")) != NULL) { - pw_properties_set(playback_props, PW_KEY_NODE_TARGET, str); + pw_properties_set(playback_props, PW_KEY_TARGET_OBJECT, str); pw_properties_set(props, "master", NULL); } diff --git a/src/modules/module-protocol-pulse/modules/module-ladspa-source.c b/src/modules/module-protocol-pulse/modules/module-ladspa-source.c index 4d65a26c0..c1d66fc2f 100644 --- a/src/modules/module-protocol-pulse/modules/module-ladspa-source.c +++ b/src/modules/module-protocol-pulse/modules/module-ladspa-source.c @@ -219,7 +219,7 @@ static int module_ladspa_source_prepare(struct module * const module) if ((str = pw_properties_get(props, "master")) != NULL || (str = pw_properties_get(props, "source_master")) != NULL) { - pw_properties_set(capture_props, PW_KEY_NODE_TARGET, str); + pw_properties_set(capture_props, PW_KEY_TARGET_OBJECT, str); pw_properties_set(props, "master", NULL); } diff --git a/src/modules/module-protocol-pulse/modules/module-loopback.c b/src/modules/module-protocol-pulse/modules/module-loopback.c index 93e17bc1a..f8eb81779 100644 --- a/src/modules/module-protocol-pulse/modules/module-loopback.c +++ b/src/modules/module-protocol-pulse/modules/module-loopback.c @@ -173,18 +173,18 @@ static int module_loopback_prepare(struct module * const module) if ((str = pw_properties_get(props, "source")) != NULL) { if (spa_strendswith(str, ".monitor")) { - pw_properties_setf(capture_props, PW_KEY_NODE_TARGET, + pw_properties_setf(capture_props, PW_KEY_TARGET_OBJECT, "%.*s", (int)strlen(str)-8, str); pw_properties_set(capture_props, PW_KEY_STREAM_CAPTURE_SINK, "true"); } else { - pw_properties_set(capture_props, PW_KEY_NODE_TARGET, str); + pw_properties_set(capture_props, PW_KEY_TARGET_OBJECT, str); } pw_properties_set(props, "source", NULL); } if ((str = pw_properties_get(props, "sink")) != NULL) { - pw_properties_set(playback_props, PW_KEY_NODE_TARGET, str); + pw_properties_set(playback_props, PW_KEY_TARGET_OBJECT, str); pw_properties_set(props, "sink", NULL); } diff --git a/src/modules/module-protocol-pulse/modules/module-remap-sink.c b/src/modules/module-protocol-pulse/modules/module-remap-sink.c index ffce605e1..eea7a9220 100644 --- a/src/modules/module-protocol-pulse/modules/module-remap-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-remap-sink.c @@ -197,7 +197,7 @@ static int module_remap_sink_prepare(struct module * const module) } } if ((str = pw_properties_get(props, "master")) != NULL) { - pw_properties_set(playback_props, PW_KEY_NODE_TARGET, str); + pw_properties_set(playback_props, PW_KEY_TARGET_OBJECT, str); pw_properties_set(props, "master", NULL); } diff --git a/src/modules/module-protocol-pulse/modules/module-remap-source.c b/src/modules/module-protocol-pulse/modules/module-remap-source.c index 1f6d5a7bf..655694152 100644 --- a/src/modules/module-protocol-pulse/modules/module-remap-source.c +++ b/src/modules/module-protocol-pulse/modules/module-remap-source.c @@ -197,7 +197,7 @@ static int module_remap_source_prepare(struct module * const module) } } if ((str = pw_properties_get(props, "master")) != NULL) { - pw_properties_set(capture_props, PW_KEY_NODE_TARGET, str); + pw_properties_set(capture_props, PW_KEY_TARGET_OBJECT, str); pw_properties_set(props, "master", NULL); } diff --git a/src/modules/module-protocol-pulse/modules/module-rtp-recv.c b/src/modules/module-protocol-pulse/modules/module-rtp-recv.c index 59f6fa36f..6dd25aecf 100644 --- a/src/modules/module-protocol-pulse/modules/module-rtp-recv.c +++ b/src/modules/module-protocol-pulse/modules/module-rtp-recv.c @@ -135,7 +135,7 @@ static int module_rtp_recv_prepare(struct module * const module) goto out; } if ((str = pw_properties_get(props, "sink")) != NULL) - pw_properties_set(stream_props, PW_KEY_NODE_TARGET, str); + pw_properties_set(stream_props, PW_KEY_TARGET_OBJECT, str); if ((str = pw_properties_get(props, "sap_address")) != NULL) pw_properties_set(global_props, "sap.ip", str); diff --git a/src/modules/module-protocol-pulse/modules/module-rtp-send.c b/src/modules/module-protocol-pulse/modules/module-rtp-send.c index 743faaae6..730675fd8 100644 --- a/src/modules/module-protocol-pulse/modules/module-rtp-send.c +++ b/src/modules/module-protocol-pulse/modules/module-rtp-send.c @@ -163,14 +163,13 @@ static int module_rtp_send_prepare(struct module * const module) } if ((str = pw_properties_get(props, "source")) != NULL) { - pw_properties_set(stream_props, PW_KEY_NODE_TARGET, str); if (spa_strendswith(str, ".monitor")) { - pw_properties_setf(stream_props, PW_KEY_NODE_TARGET, + pw_properties_setf(stream_props, PW_KEY_TARGET_OBJECT, "%.*s", (int)strlen(str)-8, str); pw_properties_set(stream_props, PW_KEY_STREAM_CAPTURE_SINK, "true"); } else { - pw_properties_set(stream_props, PW_KEY_NODE_TARGET, str); + pw_properties_set(stream_props, PW_KEY_TARGET_OBJECT, str); } } if (module_args_to_audioinfo(module->impl, props, &info) < 0) { diff --git a/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c b/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c index 5089285e8..d78d5d289 100644 --- a/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c @@ -168,7 +168,7 @@ static int module_tunnel_sink_prepare(struct module * const module) remote_sink_name = pw_properties_get(props, "sink"); if (remote_sink_name) - pw_properties_set(props, PW_KEY_NODE_TARGET, remote_sink_name); + pw_properties_set(props, PW_KEY_TARGET_OBJECT, remote_sink_name); if ((server = pw_properties_get(props, "server")) == NULL) { pw_log_error("no server given"); diff --git a/src/modules/module-protocol-pulse/modules/module-tunnel-source.c b/src/modules/module-protocol-pulse/modules/module-tunnel-source.c index e344754e7..07742dc62 100644 --- a/src/modules/module-protocol-pulse/modules/module-tunnel-source.c +++ b/src/modules/module-protocol-pulse/modules/module-tunnel-source.c @@ -168,7 +168,7 @@ static int module_tunnel_source_prepare(struct module * const module) remote_source_name = pw_properties_get(props, "source"); if (remote_source_name) - pw_properties_set(props, PW_KEY_NODE_TARGET, remote_source_name); + pw_properties_set(props, PW_KEY_TARGET_OBJECT, remote_source_name); if ((server = pw_properties_get(props, "server")) == NULL) { pw_log_error("no server given"); diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c index 97d247d26..986918d97 100644 --- a/src/modules/module-protocol-pulse/pulse-server.c +++ b/src/modules/module-protocol-pulse/pulse-server.c @@ -1569,7 +1569,6 @@ static void log_format_info(struct impl *impl, enum spa_log_level level, struct static int do_create_playback_stream(struct client *client, uint32_t command, uint32_t tag, struct message *m) { struct impl *impl = client->impl; - struct pw_manager *manager = client->manager; const char *name = NULL; int res; struct sample_spec ss; @@ -1780,14 +1779,9 @@ static int do_create_playback_stream(struct client *client, uint32_t command, ui flags |= PW_STREAM_FLAG_DONT_RECONNECT; if (sink_name != NULL) { - pw_properties_set(props, - PW_KEY_NODE_TARGET, sink_name); pw_properties_set(props, PW_KEY_TARGET_OBJECT, sink_name); } else if (sink_index != SPA_ID_INVALID && sink_index != 0) { - pw_properties_setf(props, - PW_KEY_NODE_TARGET, "%u", - index_to_id(manager, sink_index)); pw_properties_setf(props, PW_KEY_TARGET_OBJECT, "%u", sink_index); } @@ -1837,7 +1831,6 @@ error: static int do_create_record_stream(struct client *client, uint32_t command, uint32_t tag, struct message *m) { struct impl *impl = client->impl; - struct pw_manager *manager = client->manager; const char *name = NULL; int res; struct sample_spec ss; @@ -2051,24 +2044,16 @@ static int do_create_record_stream(struct client *client, uint32_t command, uint source_index = id; } if (source_index != SPA_ID_INVALID && source_index != 0) { - pw_properties_setf(props, - PW_KEY_NODE_TARGET, "%u", - index_to_id(manager, source_index)); pw_properties_setf(props, PW_KEY_TARGET_OBJECT, "%u", source_index); } else if (source_name != NULL) { if (spa_strendswith(source_name, ".monitor")) { - pw_properties_setf(props, - PW_KEY_NODE_TARGET, - "%.*s", (int)strlen(source_name)-8, source_name); pw_properties_setf(props, PW_KEY_TARGET_OBJECT, "%.*s", (int)strlen(source_name)-8, source_name); pw_properties_set(props, PW_KEY_STREAM_CAPTURE_SINK, "true"); } else { - pw_properties_set(props, - PW_KEY_NODE_TARGET, source_name); pw_properties_set(props, PW_KEY_TARGET_OBJECT, source_name); } @@ -2628,7 +2613,6 @@ static int do_play_sample(struct client *client, uint32_t command, uint32_t tag, if (sample == NULL) goto error_noent; - pw_properties_setf(props, PW_KEY_NODE_TARGET, "%u", o->id); pw_properties_setf(props, PW_KEY_TARGET_OBJECT, "%"PRIu64, o->serial); play = sample_play_new(client->core, sample, props, sizeof(struct pending_sample));