mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-14 06:59:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: add spa_json_begin

Browse source 
That combines spa_json_init() and spa_json_next, a common thing to do.
This commit is contained in:
Wim Taymans 2024-09-13 09:22:27 +02:00
parent 08057e0328
commit feccb882b6
7 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/module-protocol-pulse/format.c
View file

@ -806,8 +806,7 @@ static uint32_t format_info_get_format(const struct format_info *info)
if ((str = pw_properties_get(info->props, "format.sample_format")) == NULL)
return SPA_AUDIO_FORMAT_UNKNOWN;
spa_json_init(&it[0], str, strlen(str));
if ((len = spa_json_next(&it[0], &val)) <= 0)
if ((len = spa_json_begin(&it[0], str, strlen(str), &val)) <= 0)
return SPA_AUDIO_FORMAT_UNKNOWN;
if (spa_json_is_string(val, len))
@ -825,8 +824,7 @@ static int format_info_get_rate(const struct format_info *info)
if ((str = pw_properties_get(info->props, "format.rate")) == NULL)
return -ENOENT;
spa_json_init(&it[0], str, strlen(str));
if ((len = spa_json_next(&it[0], &val)) <= 0)
if ((len = spa_json_begin(&it[0], str, strlen(str), &val)) <= 0)
return -EINVAL;
if (spa_json_is_int(val, len)) {
if (spa_json_parse_int(val, len, &v) <= 0)
@ -862,8 +860,7 @@ int format_info_to_spec(const struct format_info *info, struct sample_spec *ss,
if ((str = pw_properties_get(info->props, "format.channels")) == NULL)
return -ENOENT;
spa_json_init(&it[0], str, strlen(str));
if ((len = spa_json_next(&it[0], &val)) <= 0)
if ((len = spa_json_begin(&it[0], str, strlen(str), &val)) <= 0)
return -EINVAL;
if (spa_json_is_float(val, len)) {
if (spa_json_parse_float(val, len, &f) <= 0)
@ -877,8 +874,7 @@ int format_info_to_spec(const struct format_info *info, struct sample_spec *ss,
return -ENOTSUP;
if ((str = pw_properties_get(info->props, "format.channel_map")) != NULL) {
spa_json_init(&it[0], str, strlen(str));
if ((len = spa_json_next(&it[0], &val)) <= 0)
if ((len = spa_json_begin(&it[0], str, strlen(str), &val)) <= 0)
return -EINVAL;
if (!spa_json_is_string(val, len))
return -EINVAL;

3
src/tools/pw-config.c
View file

@ -66,8 +66,7 @@ static int do_merge_section(void *data, const char *location, const char *sectio
int l;
const char *value;
spa_json_init(&it[0], str, len);
if ((l = spa_json_next(&it[0], &value)) <= 0)
if ((l = spa_json_begin(&it[0], str, len, &value)) <= 0)
return 0;
if (spa_json_is_array(value, l)) {

3
src/tools/pw-dump.c
View file

@ -1144,8 +1144,7 @@ static void json_dump(struct data *d, const char *key, const char *value)
struct spa_json it[1];
int len;
const char *val;
spa_json_init(&it[0], value, strlen(value));
if ((len = spa_json_next(&it[0], &val)) >= 0)
if ((len = spa_json_begin(&it[0], value, strlen(value), &val)) >= 0)
json_dump_val(d, key, &it[0], val, len);
}