mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-22 08:56:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

audio-dsp: Allow merger.monitor to be set with property

Browse source 
Only set the factory.mode when not already set.
This commit is contained in:
Wim Taymans 2019-07-12 15:03:00 +02:00
parent ea6ff81d4f
commit 4aa1ef9bf1
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/module-audio-dsp/audio-dsp.c
View file

@ -263,7 +263,7 @@ struct pw_node *pw_audio_dsp_new(struct pw_core *core,
{ {
struct pw_node *node; struct pw_node *node;
struct node *n; struct node *n;
const char *api, *alias, *str, *mode; const char *api, *alias, *str;
char node_name[128]; char node_name[128];
enum pw_direction direction; enum pw_direction direction;
uint32_t max_buffer_size; uint32_t max_buffer_size;
@ -290,8 +290,6 @@ struct pw_node *pw_audio_dsp_new(struct pw_core *core,
goto error; goto error;
} }
mode = pw_properties_get(props, "audio-dsp.mode");
snprintf(node_name, sizeof(node_name), "system_%s", alias); snprintf(node_name, sizeof(node_name), "system_%s", alias);
for (i = 0; node_name[i]; i++) { for (i = 0; node_name[i]; i++) {
if (node_name[i] == ':' || node_name[i] == ',') if (node_name[i] == ':' || node_name[i] == ',')
@ -308,16 +306,16 @@ struct pw_node *pw_audio_dsp_new(struct pw_core *core,
if ((str = pw_properties_get(props, PW_KEY_NODE_ID)) != NULL) if ((str = pw_properties_get(props, PW_KEY_NODE_ID)) != NULL)
pw_properties_set(props, PW_KEY_NODE_SESSION, str); pw_properties_set(props, PW_KEY_NODE_SESSION, str);
if (!mode) { if ((str = pw_properties_get(props, "audio-dsp.mode")) == NULL) {
if (direction == PW_DIRECTION_OUTPUT) { if (direction == PW_DIRECTION_OUTPUT) {
pw_properties_set(props, "merger.monitor", "1"); if (pw_properties_get(props, "merger.monitor") == NULL)
mode = "merge"; pw_properties_set(props, "merger.monitor", "1");
str = "merge";
} else { } else {
mode = "split"; str = "split";
} }
} }
pw_properties_set(props, "factory.mode", str);
pw_properties_set(props, "factory.mode", mode);
pw_properties_set(props, SPA_KEY_LIBRARY_NAME, "audioconvert/libspa-audioconvert"); pw_properties_set(props, SPA_KEY_LIBRARY_NAME, "audioconvert/libspa-audioconvert");
node = pw_spa_node_load(core, NULL, NULL, node = pw_spa_node_load(core, NULL, NULL,