mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules: improve node names of combine-stream

Browse source 
use the "output" and "input" prefixes for output and input streams
respectively instead of always "output"
This commit is contained in:
Wim Taymans 2024-08-26 15:58:18 +02:00
parent 01558bb9e9
commit b46673b475
1 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/modules/module-combine-stream.c
View file

@ -769,7 +769,7 @@ static int create_stream(struct stream_info *info)
int res; int res;
uint32_t n_params, i, j; uint32_t n_params, i, j;
const struct spa_pod *params[1]; const struct spa_pod *params[1];
const char *str, *node_name; const char *str, *node_name, *dir_name;
uint8_t buffer[1024]; uint8_t buffer[1024];
struct spa_pod_builder b; struct spa_pod_builder b;
struct spa_audio_info_raw remap_info, tmp_info; struct spa_audio_info_raw remap_info, tmp_info;
@ -796,6 +796,22 @@ static int create_stream(struct stream_info *info)
s->id = info->id; s->id = info->id;
s->impl = impl; s->impl = impl;
s->stream_events = stream_events;
flags = PW_STREAM_FLAG_AUTOCONNECT |
PW_STREAM_FLAG_MAP_BUFFERS |
PW_STREAM_FLAG_RT_PROCESS |
PW_STREAM_FLAG_ASYNC;
if (impl->mode == MODE_SINK || impl->mode == MODE_CAPTURE) {
direction = PW_DIRECTION_OUTPUT;
flags = PW_STREAM_FLAG_TRIGGER;
dir_name = "output";
} else {
direction = PW_DIRECTION_INPUT;
s->stream_events.process = stream_input_process;
dir_name = "input";
}
s->info = impl->info; s->info = impl->info;
if ((str = pw_properties_get(info->stream_props, SPA_KEY_AUDIO_POSITION)) != NULL) if ((str = pw_properties_get(info->stream_props, SPA_KEY_AUDIO_POSITION)) != NULL)
@ -829,10 +845,10 @@ static int create_stream(struct stream_info *info)
if (pw_properties_get(info->stream_props, PW_KEY_MEDIA_NAME) == NULL) if (pw_properties_get(info->stream_props, PW_KEY_MEDIA_NAME) == NULL)
pw_properties_setf(info->stream_props, PW_KEY_MEDIA_NAME, pw_properties_setf(info->stream_props, PW_KEY_MEDIA_NAME,
"%s output", str); "%s %s", str, dir_name);
if (pw_properties_get(info->stream_props, PW_KEY_NODE_DESCRIPTION) == NULL) if (pw_properties_get(info->stream_props, PW_KEY_NODE_DESCRIPTION) == NULL)
pw_properties_setf(info->stream_props, PW_KEY_NODE_DESCRIPTION, pw_properties_setf(info->stream_props, PW_KEY_NODE_DESCRIPTION,
"%s output", str); "%s %s", str, dir_name);
str = pw_properties_get(impl->props, PW_KEY_NODE_NAME); str = pw_properties_get(impl->props, PW_KEY_NODE_NAME);
if (str == NULL) if (str == NULL)
@ -840,7 +856,7 @@ static int create_stream(struct stream_info *info)
if (pw_properties_get(info->stream_props, PW_KEY_NODE_NAME) == NULL) if (pw_properties_get(info->stream_props, PW_KEY_NODE_NAME) == NULL)
pw_properties_setf(info->stream_props, PW_KEY_NODE_NAME, pw_properties_setf(info->stream_props, PW_KEY_NODE_NAME,
"output.%s_%s", str, node_name); "%s.%s_%s", dir_name, str, node_name);
if (info->on_demand_id) { if (info->on_demand_id) {
s->on_demand_id = strdup(info->on_demand_id); s->on_demand_id = strdup(info->on_demand_id);
@ -855,21 +871,6 @@ static int create_stream(struct stream_info *info)
if (s->stream == NULL) if (s->stream == NULL)
goto error_errno; goto error_errno;
s->stream_events = stream_events;
flags = PW_STREAM_FLAG_AUTOCONNECT |
PW_STREAM_FLAG_MAP_BUFFERS |
PW_STREAM_FLAG_RT_PROCESS |
PW_STREAM_FLAG_ASYNC;
if (impl->mode == MODE_SINK || impl->mode == MODE_CAPTURE) {
direction = PW_DIRECTION_OUTPUT;
flags |= PW_STREAM_FLAG_TRIGGER;
} else {
direction = PW_DIRECTION_INPUT;
s->stream_events.process = stream_input_process;
}
pw_stream_add_listener(s->stream, pw_stream_add_listener(s->stream,
&s->stream_listener, &s->stream_listener,
&s->stream_events, s); &s->stream_events, s);