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: fill in source-output/sink-input peers

Browse source
This commit is contained in:
Wim Taymans 2020-10-26 16:59:46 +01:00
parent 11ee5ca54c
commit c49771150c
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2821,6 +2821,7 @@ static int fill_sink_input_info(struct client *client, struct message *m,
struct sample_spec ss; struct sample_spec ss;
struct volume volume; struct volume volume;
struct channel_map map; struct channel_map map;
struct pw_manager_object *peer;
if (o == NULL || info == NULL || info->props == NULL || !is_sink_input(o)) if (o == NULL || info == NULL || info->props == NULL || !is_sink_input(o))
return ERR_NOENTITY; return ERR_NOENTITY;
@ -2838,12 +2839,14 @@ static int fill_sink_input_info(struct client *client, struct message *m,
.map[0] = 1, .map[0] = 1,
.map[1] = 2, }; .map[1] = 2, };
peer = find_linked(client, o->id, PW_DIRECTION_OUTPUT);
message_put(m, message_put(m,
TAG_U32, o->id, /* sink_input index */ TAG_U32, o->id, /* sink_input index */
TAG_STRING, spa_dict_lookup(info->props, PW_KEY_MEDIA_NAME), TAG_STRING, spa_dict_lookup(info->props, PW_KEY_MEDIA_NAME),
TAG_U32, SPA_ID_INVALID, /* module index */ TAG_U32, SPA_ID_INVALID, /* module index */
TAG_U32, SPA_ID_INVALID, /* client index */ TAG_U32, SPA_ID_INVALID, /* client index */
TAG_U32, SPA_ID_INVALID, /* sink index */ TAG_U32, peer ? peer->id : SPA_ID_INVALID, /* sink index */
TAG_SAMPLE_SPEC, &ss, TAG_SAMPLE_SPEC, &ss,
TAG_CHANNEL_MAP, &map, TAG_CHANNEL_MAP, &map,
TAG_CVOLUME, &volume, TAG_CVOLUME, &volume,
@ -2887,6 +2890,7 @@ static int fill_source_output_info(struct client *client, struct message *m,
struct sample_spec ss; struct sample_spec ss;
struct volume volume; struct volume volume;
struct channel_map map; struct channel_map map;
struct pw_manager_object *peer;
if (o == NULL || info == NULL || info->props == NULL || !is_source_output(o)) if (o == NULL || info == NULL || info->props == NULL || !is_source_output(o))
return ERR_NOENTITY; return ERR_NOENTITY;
@ -2904,12 +2908,14 @@ static int fill_source_output_info(struct client *client, struct message *m,
.map[0] = 1, .map[0] = 1,
.map[1] = 2, }; .map[1] = 2, };
peer = find_linked(client, o->id, PW_DIRECTION_OUTPUT);
message_put(m, message_put(m,
TAG_U32, o->id, /* source_output index */ TAG_U32, o->id, /* source_output index */
TAG_STRING, spa_dict_lookup(info->props, PW_KEY_MEDIA_NAME), TAG_STRING, spa_dict_lookup(info->props, PW_KEY_MEDIA_NAME),
TAG_U32, SPA_ID_INVALID, /* module index */ TAG_U32, SPA_ID_INVALID, /* module index */
TAG_U32, SPA_ID_INVALID, /* client index */ TAG_U32, SPA_ID_INVALID, /* client index */
TAG_U32, SPA_ID_INVALID, /* source index */ TAG_U32, peer ? peer->id : SPA_ID_INVALID, /* source index */
TAG_SAMPLE_SPEC, &ss, TAG_SAMPLE_SPEC, &ss,
TAG_CHANNEL_MAP, &map, TAG_CHANNEL_MAP, &map,
TAG_USEC, 0LL, /* latency */ TAG_USEC, 0LL, /* latency */