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

adapter: support control ports in PortConfig

Browse source
This commit is contained in:
Wim Taymans 2022-06-17 12:49:33 +02:00
parent 16a7c27498
commit 83588daf60
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/daemon/minimal.conf.in
View file

@ -220,6 +220,7 @@ context.objects = [
adapter.auto-port-config = { adapter.auto-port-config = {
mode = dsp mode = dsp
monitor = false monitor = false
control = false
position = unknown # aux, preserve position = unknown # aux, preserve
} }
#node.param.PortConfig = { #node.param.PortConfig = {
@ -280,6 +281,7 @@ context.objects = [
adapter.auto-port-config = { adapter.auto-port-config = {
mode = dsp mode = dsp
monitor = false monitor = false
control = false
position = unknown # aux, preserve position = unknown # aux, preserve
} }
#node.param.PortConfig = { #node.param.PortConfig = {

5
src/modules/module-adapter/adapter.c
View file

@ -240,7 +240,7 @@ static int do_auto_port_config(struct node *n, const char *str)
int res, position = POSITION_PRESERVE; int res, position = POSITION_PRESERVE;
struct spa_pod *param; struct spa_pod *param;
uint32_t media_type, media_subtype; uint32_t media_type, media_subtype;
bool have_format = false, monitor = false; bool have_format = false, monitor = false, control = false;
struct spa_audio_info format = { 0, }; struct spa_audio_info format = { 0, };
enum spa_param_port_config_mode mode = SPA_PARAM_PORT_CONFIG_MODE_none; enum spa_param_port_config_mode mode = SPA_PARAM_PORT_CONFIG_MODE_none;
struct spa_json it[2]; struct spa_json it[2];
@ -260,6 +260,8 @@ static int do_auto_port_config(struct node *n, const char *str)
mode = SPA_PARAM_PORT_CONFIG_MODE_none; mode = SPA_PARAM_PORT_CONFIG_MODE_none;
} else if (spa_streq(key, "monitor")) { } else if (spa_streq(key, "monitor")) {
monitor = spa_atob(val); monitor = spa_atob(val);
} else if (spa_streq(key, "control")) {
control = spa_atob(val);
} else if (spa_streq(key, "position")) { } else if (spa_streq(key, "position")) {
if (spa_streq(val, "unknown")) if (spa_streq(val, "unknown"))
position = POSITION_UNKNOWN; position = POSITION_UNKNOWN;
@ -331,6 +333,7 @@ static int do_auto_port_config(struct node *n, const char *str)
SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(n->direction), SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(n->direction),
SPA_PARAM_PORT_CONFIG_mode, SPA_POD_Id(mode), SPA_PARAM_PORT_CONFIG_mode, SPA_POD_Id(mode),
SPA_PARAM_PORT_CONFIG_monitor, SPA_POD_Bool(monitor), SPA_PARAM_PORT_CONFIG_monitor, SPA_POD_Bool(monitor),
SPA_PARAM_PORT_CONFIG_control, SPA_POD_Bool(control),
SPA_PARAM_PORT_CONFIG_format, SPA_POD_Pod(param)); SPA_PARAM_PORT_CONFIG_format, SPA_POD_Pod(param));
pw_impl_node_set_param(n->node, SPA_PARAM_PortConfig, 0, param); pw_impl_node_set_param(n->node, SPA_PARAM_PortConfig, 0, param);