mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: set also metadata target.object when moving streams

Browse source 
Set also metadata target.object when moving streams, in case the session
manager supports that.
This commit is contained in:
Pauli Virtanen 2022-02-28 19:35:13 +02:00 • committed by Wim Taymans
parent daf85f1cd6
commit fb04074335
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/modules/module-protocol-pulse/defs.h
View file

@ -260,5 +260,6 @@ static inline uint32_t port_type_value(const char *port_type)
#define METADATA_CONFIG_DEFAULT_SINK "default.configured.audio.sink" #define METADATA_CONFIG_DEFAULT_SINK "default.configured.audio.sink"
#define METADATA_CONFIG_DEFAULT_SOURCE "default.configured.audio.source" #define METADATA_CONFIG_DEFAULT_SOURCE "default.configured.audio.source"
#define METADATA_TARGET_NODE "target.node" #define METADATA_TARGET_NODE "target.node"
#define METADATA_TARGET_OBJECT "target.object"
#endif /* PULSE_SERVER_DEFS_H */ #endif /* PULSE_SERVER_DEFS_H */

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

@ -4628,6 +4628,7 @@ static int do_move_stream(struct client *client, uint32_t command, uint32_t tag,
struct pw_manager_object *o, *dev, *dev_default; struct pw_manager_object *o, *dev, *dev_default;
uint32_t index, index_device; uint32_t index, index_device;
int target_id; int target_id;
int64_t target_serial;
const char *name_device; const char *name_device;
struct pw_node_info *info; struct pw_node_info *info;
struct selector sel; struct selector sel;
@ -4673,8 +4674,10 @@ static int do_move_stream(struct client *client, uint32_t command, uint32_t tag,
* forgetting target.node. Follow that behavior here. * forgetting target.node. Follow that behavior here.
*/ */
target_id = -1; target_id = -1;
target_serial = -1;
} else { } else {
target_id = dev->id; target_id = dev->id;
target_serial = dev->serial;
} }
if ((res = pw_manager_set_metadata(manager, client->metadata_default, if ((res = pw_manager_set_metadata(manager, client->metadata_default,
@ -4683,6 +4686,12 @@ static int do_move_stream(struct client *client, uint32_t command, uint32_t tag,
SPA_TYPE_INFO_BASE"Id", "%d", target_id)) < 0) SPA_TYPE_INFO_BASE"Id", "%d", target_id)) < 0)
return res; return res;
if ((res = pw_manager_set_metadata(manager, client->metadata_default,
o->id,
METADATA_TARGET_OBJECT,
SPA_TYPE_INFO_BASE"Id", "%"PRIi64, target_serial)) < 0)
return res;
return reply_simple_ack(client, tag); return reply_simple_ack(client, tag);
} }