mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: use TARGET_OBJECT with the target serial

Browse source 
Use a new TARGET_OBJECT property to ask to be linked to a target by name
or serial. This should deprecate NODE_TARGET later.
This commit is contained in:
Wim Taymans 2022-01-19 17:09:55 +01:00
parent dec2b1b9a2
commit 9935f921c5
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -1581,13 +1581,18 @@ static int do_create_playback_stream(struct client *client, uint32_t command, ui
if (no_move) if (no_move)
flags |= PW_STREAM_FLAG_DONT_RECONNECT; flags |= PW_STREAM_FLAG_DONT_RECONNECT;
if (sink_name != NULL) if (sink_name != NULL) {
pw_properties_set(props, pw_properties_set(props,
PW_KEY_NODE_TARGET, sink_name); PW_KEY_NODE_TARGET, sink_name);
else if (sink_index != SPA_ID_INVALID && sink_index != 0) 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_properties_setf(props,
PW_KEY_NODE_TARGET, "%u", PW_KEY_NODE_TARGET, "%u",
index_to_id(manager, sink_index)); index_to_id(manager, sink_index));
pw_properties_setf(props,
PW_KEY_TARGET_OBJECT, "%u", sink_index);
}
stream->stream = pw_stream_new(client->core, name, props); stream->stream = pw_stream_new(client->core, name, props);
props = NULL; props = NULL;
@ -1846,16 +1851,23 @@ static int do_create_record_stream(struct client *client, uint32_t command, uint
pw_properties_setf(props, pw_properties_setf(props,
PW_KEY_NODE_TARGET, "%u", PW_KEY_NODE_TARGET, "%u",
index_to_id(manager, source_index)); index_to_id(manager, source_index));
pw_properties_setf(props,
PW_KEY_TARGET_OBJECT, "%u", source_index);
} else if (source_name != NULL) { } else if (source_name != NULL) {
if (spa_strendswith(source_name, ".monitor")) { if (spa_strendswith(source_name, ".monitor")) {
pw_properties_setf(props, pw_properties_setf(props,
PW_KEY_NODE_TARGET, PW_KEY_NODE_TARGET,
"%.*s", (int)strlen(source_name)-8, source_name); "%.*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_properties_set(props,
PW_KEY_STREAM_CAPTURE_SINK, "true"); PW_KEY_STREAM_CAPTURE_SINK, "true");
} else { } else {
pw_properties_set(props, pw_properties_set(props,
PW_KEY_NODE_TARGET, source_name); PW_KEY_NODE_TARGET, source_name);
pw_properties_set(props,
PW_KEY_TARGET_OBJECT, source_name);
} }
} }
@ -2392,6 +2404,7 @@ static int do_play_sample(struct client *client, uint32_t command, uint32_t tag,
goto error_noent; goto error_noent;
pw_properties_setf(props, PW_KEY_NODE_TARGET, "%u", o->id); 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)); play = sample_play_new(client->core, sample, props, sizeof(struct pending_sample));
props = NULL; props = NULL;

2
src/pipewire/keys.h
View file

@ -328,6 +328,8 @@ extern "C" {
#define PW_KEY_PRIORITY_MASTER "priority.master" /**< deprecated */ #define PW_KEY_PRIORITY_MASTER "priority.master" /**< deprecated */
#endif /* PW_ENABLE_DEPRECATED */ #endif /* PW_ENABLE_DEPRECATED */
#define PW_KEY_TARGET_OBJECT "target.object" /**< a target object to link to */
/** \} /** \}
*/ */