From f29bc42b4de013eb4803d9993f3fe159596fd155 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 31 Dec 2020 10:11:10 +0100 Subject: [PATCH] media-session: improve conf parsing Just use parse_string to convert the value. --- src/examples/media-session/alsa-monitor.c | 4 ++-- src/examples/media-session/media-session.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/examples/media-session/alsa-monitor.c b/src/examples/media-session/alsa-monitor.c index 53b918ef9..3f21bde4a 100644 --- a/src/examples/media-session/alsa-monitor.c +++ b/src/examples/media-session/alsa-monitor.c @@ -217,10 +217,10 @@ static bool find_match(struct spa_json *arr, struct pw_properties *props) continue; str = pw_properties_get(props, key); + if (spa_json_is_null(value, len)) { success = str == NULL; - } - else if (spa_json_is_string(value, len)) { + } else { spa_json_parse_string(value, SPA_MIN(len, 1024), val); value = val; len = strlen(val); diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c index 975017c74..858000b3a 100644 --- a/src/examples/media-session/media-session.c +++ b/src/examples/media-session/media-session.c @@ -2176,7 +2176,6 @@ again: while (spa_json_get_string(&it[1], key, sizeof(key)-1) > 0) { bool add = false; - pw_log_info("%s", key); if (key[0] == '#') { add = false; } else if (pw_properties_get(impl->modules, key) != NULL) {