mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove property flags

Browse source 
Remove the property flags, we will add info about properties
with the param interface.
This commit is contained in:
Wim Taymans 2018-09-28 17:44:14 +02:00
parent 2ebc65728c
commit 940c8645d3
6 changed files with 8 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/include/spa/debug/pod.h
View file

@ -204,8 +204,8 @@ spa_debug_pod_value(int indent, const struct spa_type_info *info,
SPA_POD_OBJECT_BODY_FOREACH(b, size, p) { SPA_POD_OBJECT_BODY_FOREACH(b, size, p) {
ii = spa_debug_type_find(info, p->key); ii = spa_debug_type_find(info, p->key);
spa_debug("%*s" "Prop: key %s, flags %08x", indent+2, "", spa_debug("%*s" "Prop: key %s, context %d", indent+2, "",
ii ? ii->name : "unknown", p->flags); ii ? ii->name : "unknown", p->context);
spa_debug_pod_value(indent + 4, ii->values, spa_debug_pod_value(indent + 4, ii->values,
p->value.type, p->value.type,

26
spa/include/spa/pod/builder.h
View file

@ -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) \ #define SPA_POD_BUILDER_COLLECT(builder,type,args) \
do { \ do { \
switch (type) { \ switch (type) { \
@ -631,13 +613,9 @@ spa_pod_builder_addv(struct spa_pod_builder *builder,
} }
case ':': case ':':
{ {
uint32_t key, flags = 0; uint32_t key;
key = va_arg(args, uint32_t); key = va_arg(args, uint32_t);
for (format++;*format;format++) spa_pod_builder_prop(builder, key, 0);
SPA_FLAG_SET(flags, spa_pod_flag_from_id(*format));
spa_pod_builder_prop(builder, key, flags);
break; break;
} }
case ']': case ')': case '>': case '}': case ']': case ')': case '>': case '}':

8
spa/include/spa/pod/pod.h
View file

@ -213,13 +213,7 @@ static inline struct spa_pod *spa_pod_get_values(const struct spa_pod *pod, uint
struct spa_pod_prop { struct spa_pod_prop {
uint32_t key; /**< key of property, list of valid keys depends on the uint32_t key; /**< key of property, list of valid keys depends on the
* object type */ * object type */
#define SPA_POD_PROP_FLAG_OPTIONAL (1 << 0) /**< property value is optional */ uint32_t context; /**< context for property */
#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;
struct spa_pod value; struct spa_pod value;
/* value follows */ /* value follows */
}; };

2
spa/plugins/audiotestsrc/audiotestsrc.c
View file

@ -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_name, &SPA_POD_Stringc("Select the waveform"),
SPA_PROP_INFO_type, &SPA_POD_Int(p->wave), SPA_PROP_INFO_type, &SPA_POD_Int(p->wave),
0); 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_push_struct(&b);
spa_pod_builder_int(&b, WAVE_SINE); spa_pod_builder_int(&b, WAVE_SINE);
spa_pod_builder_string(&b, "Sine wave"); spa_pod_builder_string(&b, "Sine wave");

2
spa/plugins/videotestsrc/videotestsrc.c
View file

@ -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_name, &SPA_POD_Stringc("The pattern"),
SPA_PROP_INFO_type, &SPA_POD_Int(p->pattern), SPA_PROP_INFO_type, &SPA_POD_Int(p->pattern),
0); 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_push_struct(&b);
spa_pod_builder_int(&b, PATTERN_SMPTE_SNOW); spa_pod_builder_int(&b, PATTERN_SMPTE_SNOW);
spa_pod_builder_string(&b, "SMPTE snow"); spa_pod_builder_string(&b, "SMPTE snow");

2
spa/tests/test-props2.c
View file

@ -63,7 +63,7 @@ int main(int argc, char *argv[])
spa_pod_builder_raw(&b, sizes, sizeof(sizes)); spa_pod_builder_raw(&b, sizes, sizeof(sizes));
spa_pod_builder_pop(&b); 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); ref = spa_pod_builder_push_struct(&b);
spa_pod_builder_int(&b, 4); spa_pod_builder_int(&b, 4);
spa_pod_builder_long(&b, 6000); spa_pod_builder_long(&b, 6000);