From 940c8645d3f31e29a052b65671b88854cef047de Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 28 Sep 2018 17:44:14 +0200 Subject: [PATCH] remove property flags Remove the property flags, we will add info about properties with the param interface. --- spa/include/spa/debug/pod.h | 4 ++-- spa/include/spa/pod/builder.h | 26 ++----------------------- spa/include/spa/pod/pod.h | 8 +------- spa/plugins/audiotestsrc/audiotestsrc.c | 2 +- spa/plugins/videotestsrc/videotestsrc.c | 2 +- spa/tests/test-props2.c | 2 +- 6 files changed, 8 insertions(+), 36 deletions(-) diff --git a/spa/include/spa/debug/pod.h b/spa/include/spa/debug/pod.h index 777c7cc9a..b6aaae7de 100644 --- a/spa/include/spa/debug/pod.h +++ b/spa/include/spa/debug/pod.h @@ -204,8 +204,8 @@ spa_debug_pod_value(int indent, const struct spa_type_info *info, SPA_POD_OBJECT_BODY_FOREACH(b, size, p) { ii = spa_debug_type_find(info, p->key); - spa_debug("%*s" "Prop: key %s, flags %08x", indent+2, "", - ii ? ii->name : "unknown", p->flags); + spa_debug("%*s" "Prop: key %s, context %d", indent+2, "", + ii ? ii->name : "unknown", p->context); spa_debug_pod_value(indent + 4, ii->values, p->value.type, diff --git a/spa/include/spa/pod/builder.h b/spa/include/spa/pod/builder.h index 906ee0b13..9ff72c4d7 100644 --- a/spa/include/spa/pod/builder.h +++ b/spa/include/spa/pod/builder.h @@ -470,24 +470,6 @@ static inline uint32_t spa_choice_from_id(char id) } } -static inline uint32_t spa_pod_flag_from_id(char id) -{ - switch (id) { - case 'o': - return SPA_POD_PROP_FLAG_OPTIONAL; - case 'r': - return SPA_POD_PROP_FLAG_READONLY; - case 'd': - return SPA_POD_PROP_FLAG_DEPRECATED; - case 'i': - return SPA_POD_PROP_FLAG_INFO; - case 'c': - return SPA_POD_PROP_FLAG_CONTROLLABLE; - default: - return 0; - } -} - #define SPA_POD_BUILDER_COLLECT(builder,type,args) \ do { \ switch (type) { \ @@ -631,13 +613,9 @@ spa_pod_builder_addv(struct spa_pod_builder *builder, } case ':': { - uint32_t key, flags = 0; - + uint32_t key; key = va_arg(args, uint32_t); - for (format++;*format;format++) - SPA_FLAG_SET(flags, spa_pod_flag_from_id(*format)); - - spa_pod_builder_prop(builder, key, flags); + spa_pod_builder_prop(builder, key, 0); break; } case ']': case ')': case '>': case '}': diff --git a/spa/include/spa/pod/pod.h b/spa/include/spa/pod/pod.h index 48613ca91..4f50eab92 100644 --- a/spa/include/spa/pod/pod.h +++ b/spa/include/spa/pod/pod.h @@ -213,13 +213,7 @@ static inline struct spa_pod *spa_pod_get_values(const struct spa_pod *pod, uint struct spa_pod_prop { uint32_t key; /**< key of property, list of valid keys depends on the * object type */ -#define SPA_POD_PROP_FLAG_OPTIONAL (1 << 0) /**< property value is optional */ -#define SPA_POD_PROP_FLAG_READONLY (1 << 1) /**< property is readonly */ -#define SPA_POD_PROP_FLAG_DEPRECATED (1 << 2) /**< property is deprecated */ -#define SPA_POD_PROP_FLAG_INFO (1 << 3) /**< property is informational and is not - * used when filtering */ -#define SPA_POD_PROP_FLAG_CONTROLLABLE (1 << 4) /**< property can be controlled */ - uint32_t flags; + uint32_t context; /**< context for property */ struct spa_pod value; /* value follows */ }; diff --git a/spa/plugins/audiotestsrc/audiotestsrc.c b/spa/plugins/audiotestsrc/audiotestsrc.c index 9213dfe76..29a029950 100644 --- a/spa/plugins/audiotestsrc/audiotestsrc.c +++ b/spa/plugins/audiotestsrc/audiotestsrc.c @@ -174,7 +174,7 @@ static int impl_node_enum_params(struct spa_node *node, SPA_PROP_INFO_name, &SPA_POD_Stringc("Select the waveform"), SPA_PROP_INFO_type, &SPA_POD_Int(p->wave), 0); - spa_pod_builder_prop(&b, SPA_PROP_INFO_labels, SPA_POD_PROP_FLAG_INFO); + spa_pod_builder_prop(&b, SPA_PROP_INFO_labels, 0); spa_pod_builder_push_struct(&b); spa_pod_builder_int(&b, WAVE_SINE); spa_pod_builder_string(&b, "Sine wave"); diff --git a/spa/plugins/videotestsrc/videotestsrc.c b/spa/plugins/videotestsrc/videotestsrc.c index fde0e3369..cf24f5886 100644 --- a/spa/plugins/videotestsrc/videotestsrc.c +++ b/spa/plugins/videotestsrc/videotestsrc.c @@ -158,7 +158,7 @@ static int impl_node_enum_params(struct spa_node *node, SPA_PROP_INFO_name, &SPA_POD_Stringc("The pattern"), SPA_PROP_INFO_type, &SPA_POD_Int(p->pattern), 0); - spa_pod_builder_prop(&b, SPA_PROP_INFO_labels, SPA_POD_PROP_FLAG_INFO), + spa_pod_builder_prop(&b, SPA_PROP_INFO_labels, 0), spa_pod_builder_push_struct(&b); spa_pod_builder_int(&b, PATTERN_SMPTE_SNOW); spa_pod_builder_string(&b, "SMPTE snow"); diff --git a/spa/tests/test-props2.c b/spa/tests/test-props2.c index a5a5bb479..18979710d 100644 --- a/spa/tests/test-props2.c +++ b/spa/tests/test-props2.c @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) spa_pod_builder_raw(&b, sizes, sizeof(sizes)); spa_pod_builder_pop(&b); - spa_pod_builder_prop(&b, 4, SPA_POD_PROP_FLAG_READONLY); + spa_pod_builder_prop(&b, 4, 0); ref = spa_pod_builder_push_struct(&b); spa_pod_builder_int(&b, 4); spa_pod_builder_long(&b, 6000);