mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-01 22:58:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Encapsulated conf API

Browse source
This commit is contained in:
Abramo Bagnara 2001-02-07 11:34:33 +00:00
parent 8f0cb26fdf
commit 3e091c8822
26 changed files with 473 additions and 404 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/seq/seq.c
View file

@ -46,15 +46,16 @@ int snd_seq_open(snd_seq_t **seqp, char *name,
ERR("Unknown SEQ %s", name);
return -ENOENT;
}
if (snd_config_type(seq_conf) != SND_CONFIG_TYPE_COMPOUND) {
if (snd_config_get_type(seq_conf) != SND_CONFIG_TYPE_COMPOUND) {
ERR("Invalid type for SEQ %s definition", name);
return -EINVAL;
}
err = snd_config_search(seq_conf, "streams", &conf);
if (err >= 0) {
err = snd_config_string_get(conf, &str);
const char *id = snd_config_get_id(conf);
err = snd_config_get_string(conf, &str);
if (err < 0) {
ERR("Invalid type for %s", conf->id);
ERR("Invalid type for %s", id);
return err;
}
if (strcmp(str, "output") == 0) {
@ -67,7 +68,7 @@ int snd_seq_open(snd_seq_t **seqp, char *name,
if (streams != SND_SEQ_OPEN_DUPLEX)
return -EINVAL;
} else {
ERR("Invalid value for %s", conf->id);
ERR("Invalid value for %s", id);
return -EINVAL;
}
}
@ -76,9 +77,9 @@ int snd_seq_open(snd_seq_t **seqp, char *name,
ERR("type is not defined");
return err;
}
err = snd_config_string_get(conf, &str);
err = snd_config_get_string(conf, &str);
if (err < 0) {
ERR("Invalid type for %s", conf->id);
ERR("Invalid type for %s", snd_config_get_id(conf));
return err;
}
err = snd_config_searchv(snd_config, &type_conf, "seqtype", str, 0);
@ -87,25 +88,26 @@ int snd_seq_open(snd_seq_t **seqp, char *name,
return err;
}
snd_config_foreach(i, type_conf) {
snd_config_t *n = snd_config_entry(i);
if (strcmp(n->id, "comment") == 0)
snd_config_t *n = snd_config_iterator_entry(i);
const char *id = snd_config_get_id(n);
if (strcmp(id, "comment") == 0)
continue;
if (strcmp(n->id, "lib") == 0) {
err = snd_config_string_get(n, &lib);
if (strcmp(id, "lib") == 0) {
err = snd_config_get_string(n, &lib);
if (err < 0) {
ERR("Invalid type for %s", n->id);
ERR("Invalid type for %s", id);
return -EINVAL;
}
continue;
}
if (strcmp(n->id, "open") == 0) {
err = snd_config_string_get(n, &open);
if (strcmp(id, "open") == 0) {
err = snd_config_get_string(n, &open);
if (err < 0) {
ERR("Invalid type for %s", n->id);
ERR("Invalid type for %s", id);
return -EINVAL;
}
continue;
ERR("Unknown field %s", n->id);
ERR("Unknown field %s", id);
return -EINVAL;
}
}