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

pipewire-pulse: improve parsing of defaults

Browse source 
When we fail to parse a fraction from the config, give a warning and
continue with the default settings.
Print the final parsed value as debug.
This commit is contained in:
Wim Taymans 2022-11-20 16:11:53 +01:00
parent fc159be9c6
commit b1c0662a00
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -5502,8 +5502,10 @@ static int parse_frac(struct pw_properties *props, const char *key, const char *
if (props == NULL || if (props == NULL ||
(str = pw_properties_get(props, key)) == NULL) (str = pw_properties_get(props, key)) == NULL)
str = def; str = def;
if (sscanf(str, "%u/%u", &res->num, &res->denom) != 2 || res->denom == 0) if (sscanf(str, "%u/%u", &res->num, &res->denom) != 2 || res->denom == 0) {
return -EINVAL; pw_log_warn(": invalid fraction %s, default to %s", str, def);
sscanf(def, "%u/%u", &res->num, &res->denom);
}
pw_log_info(": defaults: %s = %u/%u", key, res->num, res->denom); pw_log_info(": defaults: %s = %u/%u", key, res->num, res->denom);
return 0; return 0;
} }
@ -5543,7 +5545,7 @@ static int parse_format(struct pw_properties *props, const char *key, const char
pw_log_warn(": unknown format %s, default to %s", str, def); pw_log_warn(": unknown format %s, default to %s", str, def);
res->format = format_name2id(def); res->format = format_name2id(def);
} }
pw_log_info(": defaults: %s = %s", key, str); pw_log_info(": defaults: %s = %s", key, format_id2name(res->format));
return 0; return 0;
} }