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

pulse-server: list NETWORK flag on devices

Browse source 
Mark network sinks and sources with node.network.
This commit is contained in:
Wim Taymans 2021-10-14 13:45:58 +02:00
parent d6c1479ba0
commit 8c346ab3a7
6 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3493,6 +3493,8 @@ static int fill_sink_info(struct client *client, struct message *m,
flags = SINK_LATENCY | SINK_DYNAMIC_LATENCY | SINK_DECIBEL_VOLUME; flags = SINK_LATENCY | SINK_DYNAMIC_LATENCY | SINK_DECIBEL_VOLUME;
if ((str = spa_dict_lookup(info->props, PW_KEY_DEVICE_API)) != NULL) if ((str = spa_dict_lookup(info->props, PW_KEY_DEVICE_API)) != NULL)
flags |= SINK_HARDWARE; flags |= SINK_HARDWARE;
if ((str = spa_dict_lookup(info->props, PW_KEY_NODE_NETWORK)) != NULL)
flags |= SINK_NETWORK;
if (SPA_FLAG_IS_SET(dev_info.volume_info.flags, VOLUME_HW_VOLUME)) if (SPA_FLAG_IS_SET(dev_info.volume_info.flags, VOLUME_HW_VOLUME))
flags |= SINK_HW_VOLUME_CTRL; flags |= SINK_HW_VOLUME_CTRL;
if (SPA_FLAG_IS_SET(dev_info.volume_info.flags, VOLUME_HW_MUTE)) if (SPA_FLAG_IS_SET(dev_info.volume_info.flags, VOLUME_HW_MUTE))
@ -3675,6 +3677,8 @@ static int fill_source_info(struct client *client, struct message *m,
flags = SOURCE_LATENCY | SOURCE_DYNAMIC_LATENCY | SOURCE_DECIBEL_VOLUME; flags = SOURCE_LATENCY | SOURCE_DYNAMIC_LATENCY | SOURCE_DECIBEL_VOLUME;
if ((str = spa_dict_lookup(info->props, PW_KEY_DEVICE_API)) != NULL) if ((str = spa_dict_lookup(info->props, PW_KEY_DEVICE_API)) != NULL)
flags |= SOURCE_HARDWARE; flags |= SOURCE_HARDWARE;
if ((str = spa_dict_lookup(info->props, PW_KEY_NODE_NETWORK)) != NULL)
flags |= SOURCE_NETWORK;
if (SPA_FLAG_IS_SET(dev_info.volume_info.flags, VOLUME_HW_VOLUME)) if (SPA_FLAG_IS_SET(dev_info.volume_info.flags, VOLUME_HW_VOLUME))
flags |= SOURCE_HW_VOLUME_CTRL; flags |= SOURCE_HW_VOLUME_CTRL;
if (SPA_FLAG_IS_SET(dev_info.volume_info.flags, VOLUME_HW_MUTE)) if (SPA_FLAG_IS_SET(dev_info.volume_info.flags, VOLUME_HW_MUTE))

2
src/modules/module-protocol-simple.c
View file

@ -388,6 +388,7 @@ static int create_streams(struct impl *impl, struct client *client)
PW_KEY_NODE_GROUP, "pipewire.dummy", PW_KEY_NODE_GROUP, "pipewire.dummy",
PW_KEY_NODE_LATENCY, DEFAULT_LATENCY, PW_KEY_NODE_LATENCY, DEFAULT_LATENCY,
PW_KEY_NODE_TARGET, pw_properties_get(impl->props, "capture.node"), PW_KEY_NODE_TARGET, pw_properties_get(impl->props, "capture.node"),
PW_KEY_NODE_NETWORK, "true",
NULL); NULL);
if (props == NULL) if (props == NULL)
return -errno; return -errno;
@ -408,6 +409,7 @@ static int create_streams(struct impl *impl, struct client *client)
PW_KEY_NODE_GROUP, "pipewire.dummy", PW_KEY_NODE_GROUP, "pipewire.dummy",
PW_KEY_NODE_LATENCY, DEFAULT_LATENCY, PW_KEY_NODE_LATENCY, DEFAULT_LATENCY,
PW_KEY_NODE_TARGET, pw_properties_get(impl->props, "playback.node"), PW_KEY_NODE_TARGET, pw_properties_get(impl->props, "playback.node"),
PW_KEY_NODE_NETWORK, "true",
NULL); NULL);
if (props == NULL) if (props == NULL)
return -errno; return -errno;

2
src/modules/module-pulse-tunnel.c
View file

@ -807,6 +807,8 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
pw_properties_set(props, PW_KEY_NODE_GROUP, "pipewire.dummy"); pw_properties_set(props, PW_KEY_NODE_GROUP, "pipewire.dummy");
if (pw_properties_get(props, PW_KEY_NODE_VIRTUAL) == NULL) if (pw_properties_get(props, PW_KEY_NODE_VIRTUAL) == NULL)
pw_properties_set(props, PW_KEY_NODE_VIRTUAL, "true"); pw_properties_set(props, PW_KEY_NODE_VIRTUAL, "true");
if (pw_properties_get(props, PW_KEY_NODE_NETWORK) == NULL)
pw_properties_set(props, PW_KEY_NODE_NETWORK, "true");
if (pw_properties_get(props, PW_KEY_MEDIA_CLASS) == NULL) if (pw_properties_get(props, PW_KEY_MEDIA_CLASS) == NULL)
pw_properties_set(props, PW_KEY_MEDIA_CLASS, pw_properties_set(props, PW_KEY_MEDIA_CLASS,

2
src/modules/module-roc-sink.c
View file

@ -439,6 +439,8 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
pw_properties_set(capture_props, PW_KEY_NODE_GROUP, "pipewire.dummy"); pw_properties_set(capture_props, PW_KEY_NODE_GROUP, "pipewire.dummy");
if (pw_properties_get(capture_props, PW_KEY_NODE_VIRTUAL) == NULL) if (pw_properties_get(capture_props, PW_KEY_NODE_VIRTUAL) == NULL)
pw_properties_set(capture_props, PW_KEY_NODE_VIRTUAL, "true"); pw_properties_set(capture_props, PW_KEY_NODE_VIRTUAL, "true");
if (pw_properties_get(capture_props, PW_KEY_NODE_NETWORK) == NULL)
pw_properties_set(capture_props, PW_KEY_NODE_NETWORK, "true");
if (pw_properties_get(capture_props, PW_KEY_NODE_PASSIVE) == NULL) if (pw_properties_get(capture_props, PW_KEY_NODE_PASSIVE) == NULL)
pw_properties_set(capture_props, PW_KEY_NODE_PASSIVE, "true"); pw_properties_set(capture_props, PW_KEY_NODE_PASSIVE, "true");
if ((str = pw_properties_get(capture_props, PW_KEY_MEDIA_CLASS)) == NULL) if ((str = pw_properties_get(capture_props, PW_KEY_MEDIA_CLASS)) == NULL)

2
src/modules/module-roc-source.c
View file

@ -484,6 +484,8 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
pw_properties_set(playback_props, PW_KEY_NODE_GROUP, "pipewire.dummy"); pw_properties_set(playback_props, PW_KEY_NODE_GROUP, "pipewire.dummy");
if (pw_properties_get(playback_props, PW_KEY_NODE_VIRTUAL) == NULL) if (pw_properties_get(playback_props, PW_KEY_NODE_VIRTUAL) == NULL)
pw_properties_set(playback_props, PW_KEY_NODE_VIRTUAL, "true"); pw_properties_set(playback_props, PW_KEY_NODE_VIRTUAL, "true");
if (pw_properties_get(playback_props, PW_KEY_NODE_NETWORK) == NULL)
pw_properties_set(playback_props, PW_KEY_NODE_NETWORK, "true");
if (pw_properties_get(playback_props, PW_KEY_NODE_PASSIVE) == NULL) if (pw_properties_get(playback_props, PW_KEY_NODE_PASSIVE) == NULL)
pw_properties_set(playback_props, PW_KEY_NODE_PASSIVE, "true"); pw_properties_set(playback_props, PW_KEY_NODE_PASSIVE, "true");
if ((str = pw_properties_get(playback_props, PW_KEY_MEDIA_CLASS)) == NULL) if ((str = pw_properties_get(playback_props, PW_KEY_MEDIA_CLASS)) == NULL)

1
src/pipewire/keys.h
View file

@ -178,6 +178,7 @@ extern "C" {
* "out"/"in"/"true" respectively */ * "out"/"in"/"true" respectively */
#define PW_KEY_NODE_LINK_GROUP "node.link-group" /**< the node is internally linked to #define PW_KEY_NODE_LINK_GROUP "node.link-group" /**< the node is internally linked to
* nodes with the same link-group */ * nodes with the same link-group */
#define PW_KEY_NODE_NETWORK "node.network" /**< the node is on a network */
/** Port keys */ /** Port keys */
#define PW_KEY_PORT_ID "port.id" /**< port id */ #define PW_KEY_PORT_ID "port.id" /**< port id */