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

media-session: check metadata before using it

Browse source 
The session manager might be configured without metadata support
so check this before attempting to use the metadata. It's not
really a problem because the default sink/source can only be
changed with the pulseaudio API, which activates metadata.
This commit is contained in:
Wim Taymans 2021-03-05 10:34:27 +01:00
parent 93002ecd11
commit b40397d986
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/examples/media-session/default-nodes.c
View file

@ -227,6 +227,7 @@ static void session_create(void *data, struct sm_object *object)
if (def->key == NULL) if (def->key == NULL)
continue; continue;
if (impl->session->metadata != NULL) {
char val[16]; char val[16];
snprintf(val, sizeof(val), "%u", d.id); snprintf(val, sizeof(val), "%u", d.id);
pw_log_info("found %s with id:%s restore as %s", pw_log_info("found %s with id:%s restore as %s",
@ -235,6 +236,7 @@ static void session_create(void *data, struct sm_object *object)
PW_ID_CORE, item->key, SPA_TYPE_INFO_BASE"Id", val); PW_ID_CORE, item->key, SPA_TYPE_INFO_BASE"Id", val);
} }
} }
}
} }
static void session_remove(void *data, struct sm_object *object) static void session_remove(void *data, struct sm_object *object)
@ -248,7 +250,10 @@ static void session_remove(void *data, struct sm_object *object)
for (def = impl->defaults; def->key != NULL; ++def) { for (def = impl->defaults; def->key != NULL; ++def) {
if (def->value == object->id) { if (def->value == object->id) {
def->value = SPA_ID_INVALID; def->value = SPA_ID_INVALID;
pw_metadata_set_property(impl->session->metadata, PW_ID_CORE, def->key, NULL, NULL); if (impl->session->metadata != NULL) {
pw_metadata_set_property(impl->session->metadata,
PW_ID_CORE, def->key, NULL, NULL);
}
} }
} }
} }

3
src/examples/media-session/restore-stream.c
View file

@ -217,7 +217,8 @@ static void sync_metadata(struct impl *impl)
impl->sync = true; impl->sync = true;
spa_dict_for_each(it, &impl->props->dict) spa_dict_for_each(it, &impl->props->dict)
pw_metadata_set_property(impl->metadata, 0, it->key, "Spa:String:JSON", it->value); pw_metadata_set_property(impl->metadata,
PW_ID_CORE, it->key, "Spa:String:JSON", it->value);
impl->sync = false; impl->sync = false;
} }