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

metadata: improve default sink/source

Browse source 
Only check defaults when subject is PW_ID_CORE
Handle NULL keys: remove the defaults
This commit is contained in:
Wim Taymans 2020-08-18 17:56:05 +02:00
parent 759e1ccb6b
commit 0c04481ba7
6 changed files with 53 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pipewire-jack/src/pipewire-jack.c
View file

@ -2004,17 +2004,11 @@ static int metadata_property(void *object, uint32_t id,
pw_log_info("set id:%u key:'%s' value:'%s' type:'%s'", id, key, value, type);
if (id == PW_ID_CORE) {
if (key) {
uint32_t val = value ? (uint32_t)atoi(value) : SPA_ID_INVALID;
if (strcmp(key, "default.audio.sink") == 0) {
c->metadata->default_audio_sink = val;
} else if (strcmp(key, "default.audio.source") == 0) {
c->metadata->default_audio_source = val;
}
} else {
c->metadata->default_audio_source = SPA_ID_INVALID;
c->metadata->default_audio_sink = SPA_ID_INVALID;
}
uint32_t val = (key && value) ? (uint32_t)atoi(value) : SPA_ID_INVALID;
if (key == NULL || strcmp(key, "default.audio.sink") == 0)
c->metadata->default_audio_sink = val;
if (key == NULL || strcmp(key, "default.audio.source") == 0)
c->metadata->default_audio_source = val;
} else {
o = pw_map_lookup(&c->context.globals, id);
if (o == NULL)