From a8e9e171592914d8eab86f54022d6edfdb7aa331 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 18 Mar 2019 11:18:27 +0100 Subject: [PATCH] audioconvert: enumerate propinfo correctly --- spa/plugins/audioconvert/audioconvert.c | 16 ++-------------- spa/plugins/audioconvert/channelmix.c | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c index bf847efef..cf77e4ac5 100644 --- a/spa/plugins/audioconvert/audioconvert.c +++ b/spa/plugins/audioconvert/audioconvert.c @@ -430,22 +430,10 @@ static int impl_node_enum_params(struct spa_node *node, int seq, break; case SPA_PARAM_PropInfo: - switch (result.index) { - case 0: - return spa_node_enum_params(this->channelmix, seq, id, start, num, filter); - default: - return 0; - } - break; + return spa_node_enum_params(this->channelmix, seq, id, start, num, filter); case SPA_PARAM_Props: - switch (result.index) { - case 0: - return spa_node_enum_params(this->channelmix, seq, id, start, num, filter); - default: - return 0; - } - break; + return spa_node_enum_params(this->channelmix, seq, id, start, num, filter); default: return -ENOENT; diff --git a/spa/plugins/audioconvert/channelmix.c b/spa/plugins/audioconvert/channelmix.c index 548709e72..e140f5652 100644 --- a/spa/plugins/audioconvert/channelmix.c +++ b/spa/plugins/audioconvert/channelmix.c @@ -478,7 +478,7 @@ static int impl_node_enum_params(struct spa_node *node, int seq, SPA_TYPE_OBJECT_PropInfo, id, SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_mute), SPA_PROP_INFO_name, SPA_POD_String("Mute"), - SPA_PROP_INFO_type, SPA_POD_Bool(p->mute)); + SPA_PROP_INFO_type, SPA_POD_CHOICE_Bool(p->mute)); break; default: return 0;