From 54923bf5bd09357d773a4b3369c6469c60c9d2b8 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 18 Jun 2025 09:48:08 +0200 Subject: [PATCH] alsa: remove UMP negotiation constraint Otherwise we won't be able to negotiate with a port that only wants old style midi. Instead just negotiate the control link, conversion to old style midi will be done in the control mixer for the old client. Fixes #4759 --- spa/plugins/alsa/alsa-seq-bridge.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/spa/plugins/alsa/alsa-seq-bridge.c b/spa/plugins/alsa/alsa-seq-bridge.c index 68e6c91a8..e08d87e4a 100644 --- a/spa/plugins/alsa/alsa-seq-bridge.c +++ b/spa/plugins/alsa/alsa-seq-bridge.c @@ -529,8 +529,7 @@ impl_node_port_enum_params(void *object, int seq, param = spa_pod_builder_add_object(&b, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_application), - SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control), - SPA_FORMAT_CONTROL_types, SPA_POD_CHOICE_FLAGS_Int(1u<have_format = false; } else { struct spa_audio_info info = { 0 }; - uint32_t types; if ((err = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0) return err; @@ -644,13 +641,6 @@ static int port_set_format(void *object, struct seq_port *port, info.media_subtype != SPA_MEDIA_SUBTYPE_control) return -EINVAL; - if ((err = spa_pod_parse_object(format, - SPA_TYPE_OBJECT_Format, NULL, - SPA_FORMAT_CONTROL_types, SPA_POD_Int(&types))) < 0) - return err; - if (types != 1u << SPA_CONTROL_UMP) - return -EINVAL; - port->current_format = info; port->have_format = true; }