diff --git a/spa/plugins/alsa/alsa-pcm-sink.c b/spa/plugins/alsa/alsa-pcm-sink.c index b8d6385cc..e6d0f1c22 100644 --- a/spa/plugins/alsa/alsa-pcm-sink.c +++ b/spa/plugins/alsa/alsa-pcm-sink.c @@ -195,8 +195,7 @@ static int impl_node_enum_params(void *object, int seq, } SPA_FALLTHROUGH default: - param = spa_alsa_enum_propinfo(this, result.index - 7, - SPA_PROP_START_CUSTOM + result.index - 6, &b); + param = spa_alsa_enum_propinfo(this, result.index - 7, &b); if (param == NULL) return 0; } diff --git a/spa/plugins/alsa/alsa-pcm-source.c b/spa/plugins/alsa/alsa-pcm-source.c index e3e8a447e..92cf54581 100644 --- a/spa/plugins/alsa/alsa-pcm-source.c +++ b/spa/plugins/alsa/alsa-pcm-source.c @@ -181,8 +181,7 @@ static int impl_node_enum_params(void *object, int seq, SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Long(0LL, 0LL, INT64_MAX)); break; default: - param = spa_alsa_enum_propinfo(this, result.index - 6, - SPA_PROP_START_CUSTOM + result.index - 5, &b); + param = spa_alsa_enum_propinfo(this, result.index - 6, &b); if (param == NULL) return 0; } diff --git a/spa/plugins/alsa/alsa-pcm.c b/spa/plugins/alsa/alsa-pcm.c index 3cdf85981..c21f3052f 100644 --- a/spa/plugins/alsa/alsa-pcm.c +++ b/spa/plugins/alsa/alsa-pcm.c @@ -150,15 +150,14 @@ static int position_to_string(struct channel_map *map, char *val, size_t len) } struct spa_pod *spa_alsa_enum_propinfo(struct state *state, - uint32_t idx, uint32_t id, struct spa_pod_builder *b) + uint32_t idx, struct spa_pod_builder *b) { struct spa_pod *param; switch (idx) { case 0: param = spa_pod_builder_add_object(b, - SPA_TYPE_OBJECT_PropInfo, id, - SPA_PROP_INFO_id, SPA_POD_Id(id), + SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_name, SPA_POD_String(SPA_KEY_AUDIO_CHANNELS), SPA_PROP_INFO_description, SPA_POD_String("Audio Channels"), SPA_PROP_INFO_type, SPA_POD_Int(state->default_channels), @@ -166,8 +165,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state, break; case 1: param = spa_pod_builder_add_object(b, - SPA_TYPE_OBJECT_PropInfo, id, - SPA_PROP_INFO_id, SPA_POD_Id(id), + SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_name, SPA_POD_String(SPA_KEY_AUDIO_RATE), SPA_PROP_INFO_description, SPA_POD_String("Audio Rate"), SPA_PROP_INFO_type, SPA_POD_Int(state->default_rate), @@ -175,8 +173,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state, break; case 2: param = spa_pod_builder_add_object(b, - SPA_TYPE_OBJECT_PropInfo, id, - SPA_PROP_INFO_id, SPA_POD_Id(id), + SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_name, SPA_POD_String(SPA_KEY_AUDIO_FORMAT), SPA_PROP_INFO_description, SPA_POD_String("Audio Format"), SPA_PROP_INFO_type, SPA_POD_String( @@ -189,8 +186,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state, char buf[1024]; position_to_string(&state->default_pos, buf, sizeof(buf)); param = spa_pod_builder_add_object(b, - SPA_TYPE_OBJECT_PropInfo, id, - SPA_PROP_INFO_id, SPA_POD_Id(id), + SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_name, SPA_POD_String(SPA_KEY_AUDIO_POSITION), SPA_PROP_INFO_description, SPA_POD_String("Audio Position"), SPA_PROP_INFO_type, SPA_POD_String(buf), @@ -199,8 +195,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state, } case 4: param = spa_pod_builder_add_object(b, - SPA_TYPE_OBJECT_PropInfo, id, - SPA_PROP_INFO_id, SPA_POD_Id(id), + SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_name, SPA_POD_String("api.alsa.period-size"), SPA_PROP_INFO_description, SPA_POD_String("Period Size"), SPA_PROP_INFO_type, SPA_POD_Int(state->default_period_size), @@ -208,8 +203,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state, break; case 5: param = spa_pod_builder_add_object(b, - SPA_TYPE_OBJECT_PropInfo, id, - SPA_PROP_INFO_id, SPA_POD_Id(id), + SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_name, SPA_POD_String("api.alsa.headroom"), SPA_PROP_INFO_description, SPA_POD_String("Headroom"), SPA_PROP_INFO_type, SPA_POD_Int(state->default_headroom), @@ -217,8 +211,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state, break; case 6: param = spa_pod_builder_add_object(b, - SPA_TYPE_OBJECT_PropInfo, id, - SPA_PROP_INFO_id, SPA_POD_Id(id), + SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_name, SPA_POD_String("api.alsa.start-delay"), SPA_PROP_INFO_description, SPA_POD_String("Start Delay"), SPA_PROP_INFO_type, SPA_POD_Int(state->default_start_delay), @@ -226,8 +219,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state, break; case 7: param = spa_pod_builder_add_object(b, - SPA_TYPE_OBJECT_PropInfo, id, - SPA_PROP_INFO_id, SPA_POD_Id(id), + SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_name, SPA_POD_String("api.alsa.disable-mmap"), SPA_PROP_INFO_description, SPA_POD_String("Disable MMAP"), SPA_PROP_INFO_type, SPA_POD_Bool(state->disable_mmap), @@ -235,8 +227,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state, break; case 8: param = spa_pod_builder_add_object(b, - SPA_TYPE_OBJECT_PropInfo, id, - SPA_PROP_INFO_id, SPA_POD_Id(id), + SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_name, SPA_POD_String("api.alsa.disable-batch"), SPA_PROP_INFO_description, SPA_POD_String("Disable Batch"), SPA_PROP_INFO_type, SPA_POD_Bool(state->disable_batch), @@ -244,8 +235,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state, break; case 9: param = spa_pod_builder_add_object(b, - SPA_TYPE_OBJECT_PropInfo, id, - SPA_PROP_INFO_id, SPA_POD_Id(id), + SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_name, SPA_POD_String("api.alsa.use-chmap"), SPA_PROP_INFO_description, SPA_POD_String("Use the driver channelmap"), SPA_PROP_INFO_type, SPA_POD_Bool(state->props.use_chmap), @@ -253,8 +243,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state, break; case 10: param = spa_pod_builder_add_object(b, - SPA_TYPE_OBJECT_PropInfo, id, - SPA_PROP_INFO_id, SPA_POD_Id(id), + SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_name, SPA_POD_String("api.alsa.multi-rate"), SPA_PROP_INFO_description, SPA_POD_String("Support multiple rates"), SPA_PROP_INFO_type, SPA_POD_Bool(state->multi_rate), diff --git a/spa/plugins/alsa/alsa-pcm.h b/spa/plugins/alsa/alsa-pcm.h index fe35ee639..4a04c0022 100644 --- a/spa/plugins/alsa/alsa-pcm.h +++ b/spa/plugins/alsa/alsa-pcm.h @@ -222,7 +222,7 @@ struct state { }; struct spa_pod *spa_alsa_enum_propinfo(struct state *state, - uint32_t idx, uint32_t id, struct spa_pod_builder *b); + uint32_t idx, struct spa_pod_builder *b); int spa_alsa_add_prop_params(struct state *state, struct spa_pod_builder *b); int spa_alsa_parse_prop_params(struct state *state, struct spa_pod *params);