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

pod: add info property flag

Browse source 
Add an info property flag that should not be taken into account
when intersecting. We use this for docs and labels.
Improve builder, make it possible to make struct properties with
flags.
Add some docs to the property flags and ranges.
This commit is contained in:
Wim Taymans 2017-12-15 16:25:46 +01:00
parent a9ece1df91
commit 1c19342487
2 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -398,6 +398,8 @@ static inline uint32_t spa_pod_flag_from_id(char id)
return SPA_POD_PROP_FLAG_READONLY;
case 'd':
return SPA_POD_PROP_FLAG_DEPRECATED;
case 'i':
return SPA_POD_PROP_FLAG_INFO;
default:
return 0;
}
@ -500,7 +502,9 @@ spa_pod_builder_addv(struct spa_pod_builder *builder,
const char *format, va_list args)
{
while (format) {
switch (*format) {
char t = *format;
next:
switch (t) {
case '<':
{
uint32_t id = va_arg(args, uint32_t);
@ -516,32 +520,28 @@ spa_pod_builder_addv(struct spa_pod_builder *builder,
break;
case ':':
{
const char *spec;
char type;
int n_values;
uint32_t key, flags;
key = va_arg(args, uint32_t);
format = spec = va_arg(args, const char *);
type = *spec;
if (*spec != '\0')
spec++;
flags = spa_pod_range_from_id(*spec);
if (*spec != '\0')
spec++;
for (;*spec;spec++)
flags |= spa_pod_flag_from_id(*spec);
format = va_arg(args, const char *);
t = *format;
if (*format != '\0')
format++;
flags = spa_pod_range_from_id(*format);
if (*format != '\0')
format++;
for (;*format;format++)
flags |= spa_pod_flag_from_id(*format);
spa_pod_builder_push_prop(builder, key, flags);
if (type == '{' || type == '[')
continue;
format = spec;
if (t == '<' || t == '[')
goto next;
n_values = -1;
while (n_values-- != 0) {
SPA_POD_BUILDER_COLLECT(builder, type, args);
SPA_POD_BUILDER_COLLECT(builder, t, args);
if ((flags & SPA_POD_PROP_RANGE_MASK) == 0)
break;
@ -565,10 +565,11 @@ spa_pod_builder_addv(struct spa_pod_builder *builder,
format = va_arg(args, const char *);
continue;
default:
SPA_POD_BUILDER_COLLECT(builder,*format,args);
SPA_POD_BUILDER_COLLECT(builder, t, args);
break;;
}
format++;
if (*format != '\0')
format++;
}
return spa_pod_builder_deref(builder, builder->frame[builder->state.depth].ref);
}