1 files changed, 87 insertions, 31 deletions

diff --git a/src/main.c b/src/main.c
index 5035a4836..81bc8464a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -45,6 +45,7 @@
 #include "replay_gain.h"
 #include "decoder_list.h"
 #include "input_stream.h"
+#include "playlist_list.h"
 #include "state_file.h"
 #include "tag.h"
 #include "dbUtils.h"
@@ -55,6 +56,7 @@
 #include "dirvec.h"
 #include "songvec.h"
 #include "tag_pool.h"
+#include "inotify_update.h"
 
 #ifdef ENABLE_SQLITE
 #include "sticker.h"
@@ -90,13 +92,38 @@ GMainLoop *main_loop;
 
 struct notify main_notify;
 
+static void
+glue_daemonize_init(const struct options *options)
+{
+	daemonize_init(config_get_string(CONF_USER, NULL),
+		       config_get_string(CONF_GROUP, NULL),
+		       config_get_path(CONF_PID_FILE));
+
+	if (options->kill)
+		daemonize_kill();
+}
+
+static void
+glue_mapper_init(void)
+{
+	const char *music_dir, *playlist_dir;
+
+	music_dir = config_get_path(CONF_MUSIC_DIR);
+	if (music_dir == NULL)
+		music_dir = g_get_user_special_dir(G_USER_DIRECTORY_MUSIC);
+
+	playlist_dir = config_get_path(CONF_PLAYLIST_DIR);
+
+	mapper_init(music_dir, playlist_dir);
+}
+
 /**
  * Returns the database.  If this function returns false, this has not
  * succeeded, and the caller should create the database after the
  * process has been daemonized.
  */
 static bool
-openDB(const Options *options)
+glue_db_init_and_load(void)
 {
 	const char *path = config_get_path(CONF_DB_FILE);
 	bool ret;
@@ -115,19 +142,11 @@ openDB(const Options *options)
 
 	db_init(path);
 
-	if (options->createDB > 0)
-		/* don't attempt to load the old database */
-		return false;
-
 	ret = db_load(&error);
 	if (!ret) {
 		g_warning("Failed to load database: %s", error->message);
 		g_error_free(error);
 
-		if (options->createDB < 0)
-			g_error("can't open db file and using "
-				"\"--no-create-db\" command line option");
-
 		if (!db_check())
 			exit(EXIT_FAILURE);
 
@@ -141,6 +160,29 @@ openDB(const Options *options)
 }
 
 /**
+ * Configure and initialize the sticker subsystem.
+ */
+static void
+glue_sticker_init(void)
+{
+#ifdef ENABLE_SQLITE
+	bool success;
+	GError *error = NULL;
+
+	success = sticker_global_init(config_get_path(CONF_STICKER_FILE),
+				      &error);
+	if (!success)
+		g_error("%s", error->message);
+#endif
+}
+
+static void
+glue_state_file_init(void)
+{
+	state_file_init(config_get_path(CONF_STATE_FILE));
+}
+
+/**
  * Windows-only initialization of the Winsock2 library.
  */
 #ifdef WIN32
@@ -228,9 +270,11 @@ idle_event_emitted(void)
 
 int main(int argc, char *argv[])
 {
-	Options options;
+	struct options options;
 	clock_t start;
 	bool create_db;
+	GError *error = NULL;
+	bool success;
 
 	daemonize_close_stdin();
 
@@ -251,19 +295,25 @@ int main(int argc, char *argv[])
 	tag_pool_init();
 	config_global_init();
 
-	parseOptions(argc, argv, &options);
-
-	daemonize_init(config_get_string(CONF_USER, NULL),
-		       config_get_path(CONF_PID_FILE));
+	success = parse_cmdline(argc, argv, &options, &error);
+	if (!success) {
+		g_warning("%s", error->message);
+		g_error_free(error);
+		return EXIT_FAILURE;
+	}
 
-	if (options.kill)
-		daemonize_kill();
+	glue_daemonize_init(&options);
 
 	stats_global_init();
 	tag_lib_init();
-	log_init(options.verbose, options.stdOutput);
+	log_init(options.verbose, options.log_stderr);
 
-	listen_global_init();
+	success = listen_global_init(&error);
+	if (!success) {
+		g_warning("%s", error->message);
+		g_error_free(error);
+		return EXIT_FAILURE;
+	}
 
 	daemonize_set_user();
 
@@ -275,9 +325,9 @@ int main(int argc, char *argv[])
 	event_pipe_register(PIPE_EVENT_IDLE, idle_event_emitted);
 
 	path_global_init();
-	mapper_init();
+	glue_mapper_init();
 	initPermissions();
-	initPlaylist();
+	playlist_global_init();
 	spl_global_init();
 #ifdef ENABLE_ARCHIVE
 	archive_plugin_init_all();
@@ -285,11 +335,9 @@ int main(int argc, char *argv[])
 	decoder_plugin_init_all();
 	update_global_init();
 
-	create_db = !openDB(&options);
+	create_db = !glue_db_init_and_load();
 
-#ifdef ENABLE_SQLITE
-	sticker_global_init(config_get_path(CONF_STICKER_FILE));
-#endif
+	glue_sticker_init();
 
 	command_init();
 	initialize_decoder_and_player();
@@ -300,10 +348,11 @@ int main(int argc, char *argv[])
 	replay_gain_global_init();
 	initNormalization();
 	input_stream_global_init();
+	playlist_list_global_init();
 
 	daemonize(options.daemon);
 
-	setup_log_output(options.stdOutput);
+	setup_log_output(options.log_stderr);
 
 	initSigHandlers();
 
@@ -312,15 +361,19 @@ int main(int argc, char *argv[])
 	player_create();
 
 	if (create_db) {
-		/* the database failed to load, or MPD was started
-		   with --create-db: recreate a new database */
-		unsigned job = directory_update_init(NULL);
+		/* the database failed to load: recreate the
+		   database */
+		unsigned job = update_enqueue(NULL, true);
 		if (job == 0)
 			g_error("directory update failed");
 	}
 
+	glue_state_file_init();
 
-	state_file_init(config_get_path(CONF_STATE_FILE));
+	if (mapper_has_music_directory())
+		mpd_inotify_init();
+
+	config_global_check();
 
 	/* run the main loop */
 
@@ -330,12 +383,14 @@ int main(int argc, char *argv[])
 
 	g_main_loop_unref(main_loop);
 
+	mpd_inotify_finish();
+
 	state_file_finish();
-	playerKill();
+	pc_kill();
 	finishZeroconf();
 	client_manager_deinit();
 	listen_global_finish();
-	finishPlaylist();
+	playlist_global_finish();
 
 	start = clock();
 	db_finish();
@@ -349,6 +404,7 @@ int main(int argc, char *argv[])
 	notify_deinit(&main_notify);
 	event_pipe_deinit();
 
+	playlist_list_global_finish();
 	input_stream_global_finish();
 	finishNormalization();
 	audio_output_all_finish();