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

stream: put target string in node.target

Browse source
This commit is contained in:
Wim Taymans 2020-07-20 16:27:50 +02:00
parent ee2c1f3882
commit 2909786eb2
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pipewire-pulseaudio/src/stream.c
View file

@ -925,9 +925,9 @@ static int create_stream(pa_stream_direction_t direction,
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
uint32_t sample_rate = 0, stride = 0, latency_num; uint32_t sample_rate = 0, stride = 0, latency_num;
const char *str; const char *str;
uint32_t devid; uint32_t devid, n_items;
struct global *g; struct global *g;
struct spa_dict_item items[5]; struct spa_dict_item items[6];
char latency[64]; char latency[64];
bool monitor; bool monitor;
const char *name; const char *name;
@ -1060,6 +1060,8 @@ static int create_stream(pa_stream_direction_t direction,
if ((g = pa_context_find_global_by_name(s->context, mask, dev)) != NULL) if ((g = pa_context_find_global_by_name(s->context, mask, dev)) != NULL)
devid = g->id; devid = g->id;
else if ((devid = atoi(dev)) == 0)
devid = PW_ID_ANY;
} }
if ((str = pa_proplist_gets(s->proplist, PA_PROP_MEDIA_ROLE)) == NULL) if ((str = pa_proplist_gets(s->proplist, PA_PROP_MEDIA_ROLE)) == NULL)
@ -1087,15 +1089,17 @@ static int create_stream(pa_stream_direction_t direction,
latency_num = s->buffer_attr.minreq / stride; latency_num = s->buffer_attr.minreq / stride;
sprintf(latency, "%u/%u", SPA_MAX(latency_num, 1u), sample_rate); sprintf(latency, "%u/%u", SPA_MAX(latency_num, 1u), sample_rate);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_NODE_LATENCY, latency); n_items = 0;
items[1] = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_TYPE, "Audio"); items[n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_NODE_LATENCY, latency);
items[2] = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_CATEGORY, items[n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_TYPE, "Audio");
items[n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_CATEGORY,
direction == PA_STREAM_PLAYBACK ? direction == PA_STREAM_PLAYBACK ?
"Playback" : "Capture"); "Playback" : "Capture");
items[3] = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_ROLE, str); items[n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_ROLE, str);
items[4] = SPA_DICT_ITEM_INIT(PW_KEY_STREAM_MONITOR, monitor ? "true" : "false"); items[n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_STREAM_MONITOR, monitor ? "true" : "false");
if (devid == PW_ID_ANY && dev != NULL)
pw_stream_update_properties(s->stream, &SPA_DICT_INIT(items, 5)); items[n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_NODE_TARGET, dev);
pw_stream_update_properties(s->stream, &SPA_DICT_INIT(items, n_items));
res = pw_stream_connect(s->stream, res = pw_stream_connect(s->stream,
direction == PA_STREAM_PLAYBACK ? direction == PA_STREAM_PLAYBACK ?

2
src/pipewire/keys.h
View file

@ -128,7 +128,7 @@ extern "C" {
#define PW_KEY_NODE_EXCLUSIVE "node.exclusive" /**< node wants exclusive access to resources */ #define PW_KEY_NODE_EXCLUSIVE "node.exclusive" /**< node wants exclusive access to resources */
#define PW_KEY_NODE_AUTOCONNECT "node.autoconnect" /**< node wants to be automatically connected #define PW_KEY_NODE_AUTOCONNECT "node.autoconnect" /**< node wants to be automatically connected
* to a compatible node */ * to a compatible node */
#define PW_KEY_NODE_TARGET "node.target" /**< node want to be connected to the target #define PW_KEY_NODE_TARGET "node.target" /**< node wants to be connected to the target
* node/session */ * node/session */
#define PW_KEY_NODE_LATENCY "node.latency" /**< the requested latency of the node as #define PW_KEY_NODE_LATENCY "node.latency" /**< the requested latency of the node as
* a fraction. Ex: 128/48000 */ * a fraction. Ex: 128/48000 */