From 1f0dfb4407344996bbe874525413275b79da12b3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 18 Jan 2009 16:56:07 +0100 Subject: mapper: make the music_directory optional Without a music_directory, MPD is an excellent streaming client. --- src/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index b7e9e0106..1bcae8f36 100644 --- a/src/main.c +++ b/src/main.c @@ -128,7 +128,16 @@ static void openDB(Options * options, char *argv0) { struct config_param *param; - param = parseConfigFilePath(CONF_DB_FILE, true); + param = parseConfigFilePath(CONF_DB_FILE, + mapper_has_music_directory()); + if (!mapper_has_music_directory()) { + if (param != NULL) + g_message("Found " CONF_DB_FILE " setting without " + CONF_MUSIC_DIR " - disabling database"); + db_init(NULL); + return; + } + db_init(param->value); if (options->createDB > 0 || !db_load()) { -- cgit v1.2.3