media-session/pulse-server: more error checks + minor fixes

This commit is contained in:
Pauli Virtanen 2021-03-27 17:03:50 +02:00
parent f330446291
commit 2681b8236b
10 changed files with 79 additions and 54 deletions

View file

@ -212,13 +212,14 @@ static int do_extension_stream_restore_write(struct client *client, uint32_t com
spa_zero(map);
spa_zero(vol);
message_get(m,
TAG_STRING, &name,
TAG_CHANNEL_MAP, &map,
TAG_CVOLUME, &vol,
TAG_STRING, &device_name,
TAG_BOOLEAN, &mute,
TAG_INVALID);
if (message_get(m,
TAG_STRING, &name,
TAG_CHANNEL_MAP, &map,
TAG_CVOLUME, &vol,
TAG_STRING, &device_name,
TAG_BOOLEAN, &mute,
TAG_INVALID) < 0)
return -EPROTO;
if (name == NULL || name[0] == '\0')
return -EPROTO;
@ -247,9 +248,10 @@ static int do_extension_stream_restore_write(struct client *client, uint32_t com
if (key_from_name(name, key, sizeof(key)) >= 0) {
pw_log_debug("%s -> %s: %s", name, key, ptr);
pw_manager_set_metadata(client->manager,
client->metadata_routes,
PW_ID_CORE, key, "Spa:String:JSON", "%s", ptr);
if (pw_manager_set_metadata(client->manager,
client->metadata_routes,
PW_ID_CORE, key, "Spa:String:JSON", "%s", ptr) < 0)
pw_log_warn(NAME ": failed to set metadata %s = %s", key, ptr);
}
free(ptr);
}