diff options
| author | Wim Taymans <wtaymans@redhat.com> | 2019-05-10 11:15:48 +0200 |
|---|---|---|
| committer | Wim Taymans <wtaymans@redhat.com> | 2019-05-10 11:15:48 +0200 |
| commit | 1a7fcaf9c6b13e31405a023ba0be9ad78678af06 (patch) | |
| tree | 1cc2e5e75fa043260abcd32382d9afd8bef9fe96 | |
| parent | 41ab051b68369804e692c8afa1f4cf4b6fdcef51 (diff) | |
Fix cleanup
| -rw-r--r-- | spa/plugins/audioconvert/channelmix.c | 3 | ||||
| -rw-r--r-- | spa/plugins/audioconvert/fmtconvert.c | 2 | ||||
| -rw-r--r-- | src/modules/module-client-node/remote-node.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/spa/plugins/audioconvert/channelmix.c b/spa/plugins/audioconvert/channelmix.c index 5f7bd9ac..825482fe 100644 --- a/spa/plugins/audioconvert/channelmix.c +++ b/spa/plugins/audioconvert/channelmix.c @@ -633,8 +633,9 @@ static int port_set_format(struct spa_node *node, if (port->have_format) { port->have_format = false; clear_buffers(this, port); + if (this->mix.process) + channelmix_free(&this->mix); } - channelmix_free(&this->mix); } else { struct spa_audio_info info = { 0 }; diff --git a/spa/plugins/audioconvert/fmtconvert.c b/spa/plugins/audioconvert/fmtconvert.c index de87d369..9fbe64b6 100644 --- a/spa/plugins/audioconvert/fmtconvert.c +++ b/spa/plugins/audioconvert/fmtconvert.c @@ -553,7 +553,7 @@ static int port_set_format(struct spa_node *node, if (port->have_format) { port->have_format = false; clear_buffers(this, port); - if (this->conv.free) + if (this->conv.process) convert_free(&this->conv); } } else { diff --git a/src/modules/module-client-node/remote-node.c b/src/modules/module-client-node/remote-node.c index f69a6f36..63834f8d 100644 --- a/src/modules/module-client-node/remote-node.c +++ b/src/modules/module-client-node/remote-node.c @@ -653,7 +653,8 @@ client_node_port_set_param(void *object, port = pw_node_find_port(data->node, direction, port_id); if (port == NULL) { res = -EINVAL; - pw_proxy_error(proxy, res, "unknown port"); + pw_proxy_error(proxy, res, "unknown %s port %d", + direction == SPA_DIRECTION_INPUT ? "input" : "output", port_id); goto done; } |