oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ConfigFile: add enum ConfigOption

Browse Source 
Look up top-level config options by enum (= integer), not by name
string.
This commit is contained in:
Max Kellermann
2013-01-30 17:52:51 +01:00
parent daa4647712
commit 595b6a4f6c
16 changed files with 278 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Main.cxx
View File

@@ -167,12 +167,11 @@ glue_mapper_init(GError **error_r)
static bool
glue_db_init_and_load(void)
{
const struct config_param *param = config_get_param("database");
const struct config_param *param = config_get_param(CONF_DATABASE);
const struct config_param *path = config_get_param(CONF_DB_FILE);
if (param != NULL && path != NULL)
g_message("Found both 'database' and '" CONF_DB_FILE
"' setting - ignoring the latter");
g_message("Found both 'database' and 'db_file' setting - ignoring the latter");
GError *error = NULL;
bool ret;
@@ -180,10 +179,10 @@ glue_db_init_and_load(void)
if (!mapper_has_music_directory()) {
if (param != NULL)
g_message("Found database setting without "
CONF_MUSIC_DIR " - disabling database");
"music_directory - disabling database");
if (path != NULL)
g_message("Found " CONF_DB_FILE " setting without "
CONF_MUSIC_DIR " - disabling database");
g_message("Found db_file setting without "
"music_directory - disabling database");
return true;
}