diff options
Diffstat (limited to 'src/pcm/pcm_plug.c')
| -rw-r--r-- | src/pcm/pcm_plug.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c index c32260e6..e794fc38 100644 --- a/src/pcm/pcm_plug.c +++ b/src/pcm/pcm_plug.c @@ -712,30 +712,31 @@ int _snd_pcm_plug_open(snd_pcm_t **pcmp, const char *name, snd_pcm_route_ttable_entry_t *ttable = NULL; unsigned int cused, sused; snd_config_foreach(i, 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, "type") == 0) + if (strcmp(id, "type") == 0) continue; - if (strcmp(n->id, "stream") == 0) + if (strcmp(id, "stream") == 0) continue; - if (strcmp(n->id, "sname") == 0) { - err = snd_config_string_get(n, &sname); + if (strcmp(id, "sname") == 0) { + err = snd_config_get_string(n, &sname); if (err < 0) { - ERR("Invalid type for %s", n->id); + ERR("Invalid type for %s", id); return -EINVAL; } continue; } - if (strcmp(n->id, "ttable") == 0) { - if (snd_config_type(n) != SND_CONFIG_TYPE_COMPOUND) { - ERR("Invalid type for %s", n->id); + if (strcmp(id, "ttable") == 0) { + if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) { + ERR("Invalid type for %s", id); return -EINVAL; } tt = n; continue; } - ERR("Unknown field %s", n->id); + ERR("Unknown field %s", id); return -EINVAL; } if (!sname) { |