diff options
| author | David Robillard <d@drobilla.net> | 2024-09-29 19:42:24 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2024-10-12 14:07:10 -0400 |
| commit | 76056507e733a4dbdc3828a679c7c1c8a0c170fa (patch) | |
| tree | 74cf4621b431d497865c66647dc2c84aafa11865 | |
| parent | 6ae46ac55746f54e05a1eb8f8fc3fe807e70a945 (diff) | |
| download | jalv-76056507e733a4dbdc3828a679c7c1c8a0c170fa.tar.gz jalv-76056507e733a4dbdc3828a679c7c1c8a0c170fa.tar.bz2 jalv-76056507e733a4dbdc3828a679c7c1c8a0c170fa.zip | |
Merge duplicate branches
| -rw-r--r-- | .clang-tidy | 1 | ||||
| -rw-r--r-- | src/jack.c | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/.clang-tidy b/.clang-tidy index fc100c0..95b15ba 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -7,7 +7,6 @@ Checks: > -*-narrowing-conversions, -altera-*, -bugprone-assignment-in-if-condition, - -bugprone-branch-clone, -bugprone-casting-through-void, -bugprone-easily-swappable-parameters, -bugprone-multi-level-implicit-pointer-conversion, @@ -153,16 +153,10 @@ jack_process_cb(jack_nframes_t nframes, void* data) // Prepare port buffers for (uint32_t p = 0; p < jalv->num_ports; ++p) { struct Port* port = &jalv->ports[p]; - if (port->type == TYPE_AUDIO && port->sys_port) { + if (port->sys_port && (port->type == TYPE_AUDIO || port->type == TYPE_CV)) { // Connect plugin port directly to Jack port buffer lilv_instance_connect_port( jalv->instance, p, jack_port_get_buffer(port->sys_port, nframes)); -#if USE_JACK_METADATA - } else if (port->type == TYPE_CV && port->sys_port) { - // Connect plugin port directly to Jack port buffer - lilv_instance_connect_port( - jalv->instance, p, jack_port_get_buffer(port->sys_port, nframes)); -#endif } else if (port->type == TYPE_EVENT && port->flow == FLOW_INPUT) { lv2_evbuf_reset(port->evbuf, true); |