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

small cleanups

Browse source
This commit is contained in:
Wim Taymans 2018-04-11 10:54:47 +02:00
parent d88b88444d
commit 008df86c8f
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/audioconvert/audioconvert.c
View file

@ -226,9 +226,6 @@ static int negotiate_link_format(struct impl *this, struct link *link)
else
filter = NULL;
if (filter)
spa_debug_pod(filter, SPA_DEBUG_FLAG_FORMAT);
if (link->out_node != NULL) {
state = 0;
if ((res = spa_node_port_enum_params(link->out_node,
@ -239,8 +236,6 @@ static int negotiate_link_format(struct impl *this, struct link *link)
filter = format;
}
if (filter)
spa_debug_pod(filter, SPA_DEBUG_FLAG_FORMAT);
if (link->in_node != NULL) {
state = 0;
if ((res = spa_node_port_enum_params(link->in_node,
@ -253,7 +248,6 @@ static int negotiate_link_format(struct impl *this, struct link *link)
}
spa_pod_fixate(filter);
spa_debug_pod(filter, SPA_DEBUG_FLAG_FORMAT);
if (link->out_node != NULL) {
if ((res = spa_node_port_set_param(link->out_node,

2
src/modules/module-client-node/client-node.c
View file

@ -811,7 +811,7 @@ impl_node_port_use_buffers(struct spa_node *node,
size += d->maxsize;
} else {
b->buffer.datas[j].type = SPA_ID_INVALID;
b->buffer.datas[j].data = 0;
b->buffer.datas[j].data = NULL;
spa_log_error(this->log, "invalid memory type %d", d->type);
}
}

12
src/pipewire/stream.c
View file

@ -353,8 +353,16 @@ static int impl_get_port_ids(struct spa_node *node,
uint32_t *output_ids,
uint32_t n_output_ids)
{
if (n_output_ids > 0)
output_ids[0] = 0;
struct stream *impl = SPA_CONTAINER_OF(node, struct stream, impl_node);
if (impl->direction == SPA_DIRECTION_INPUT) {
if (n_input_ids > 0)
input_ids[0] = 0;
}
else {
if (n_output_ids > 0)
output_ids[0] = 0;
}
return 0;
}