summaryrefslogtreecommitdiff
path: root/include/conf.h
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2001-06-13 09:31:05 +0000
committerJaroslav Kysela <perex@perex.cz>2001-06-13 09:31:05 +0000
commit5c3075d32febcd03ce8b76f7aab8dbf78b3329fd (patch)
tree9de61e4678881975244f37e267a7fe1d24b66389 /include/conf.h
parentbf780a25a54071196a7ff755a2c0bf1ee404cbab (diff)
downloadalsa-lib-5c3075d32febcd03ce8b76f7aab8dbf78b3329fd.tar.gz
Enhanced configuration syntax (added [ ] block for arrays).
The snd_config_expand functions expands the runtime contents (@func...). Removed the environment variable replace code from the configuration parser. Updated the alsa.conf configuration file.
Diffstat (limited to 'include/conf.h')
-rw-r--r--include/conf.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/conf.h b/include/conf.h
index 43b93e9a..1c5e91a6 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -39,7 +39,7 @@ int snd_config_search_alias(snd_config_t *config,
snd_config_t **result);
int snd_config_expand(snd_config_t *config, const char *args,
- snd_config_t **result);
+ void *private_data, snd_config_t **result);
int snd_config_add(snd_config_t *config, snd_config_t *leaf);
int snd_config_delete(snd_config_t *config);
@@ -96,11 +96,12 @@ int snd_config_string_replace(const char *src, char idchr,
snd_config_string_replace_callback_t *callback,
void *private_data,
char **dst);
-int snd_config_redirect_load(snd_config_t *root, snd_config_t *config,
- char **name, snd_config_t **dst_config,
+int snd_config_redirect_load(snd_config_t *root,
+ snd_config_t *config,
+ char **name,
+ snd_config_t **dst_config,
int *dst_dynamic);
-
#ifdef __cplusplus
}
#endif