metadata: improve default sink/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

View file

@ -649,14 +649,13 @@ static int metadata_property(void *object,
uint32_t subject, const char *key, const char *type, const char *value)
{
struct data *data = object;
uint32_t val;
if (key && strcmp(key, "default.audio.sink") == 0) {
val = value ? (uint32_t)atoi(value) : SPA_ID_INVALID;
data->default_sink = val;
} else if (key && strcmp(key, "default.audio.source") == 0) {
val = value ? (uint32_t)atoi(value) : SPA_ID_INVALID;
data->default_source = val;
if (subject == PW_ID_CORE) {
uint32_t val = (key && value) ? (uint32_t)atoi(value) : SPA_ID_INVALID;
if (key == NULL || strcmp(key, "default.audio.sink") == 0)
data->default_sink = val;
if (key == NULL || strcmp(key, "default.audio.source") == 0)
data->default_source = val;
}
return 0;
}