mpd.conf: new bool config value for enabling/disabling inotify update

5 files changed, 17 insertions, 2 deletions

diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 6bbd7e784..c64dfb94c 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -248,6 +248,11 @@ tags may be specified as a comma separated list.  An example value is
 "artist,album,title,track".  The special value "none" may be used alone to
 disable all metadata.  The default is to use all known tag types except for
 comments.
+.TP
+.B auto_update <yes or no>
+This specifies the wheter to support automatic update of music database when
+files are changed in music_directory. The default is to disable autoupdate
+of database.
 .SH REQUIRED AUDIO OUTPUT PARAMETERS
 .TP
 .B type <type>
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 3b9e460b1..166212ebd 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -109,6 +109,10 @@
 #
 #metadata_to_use	"artist,album,title,track,name,genre,date,composer,performer,disc"
 #
+# This setting enables automatic update of MPD's database when files in 
+# music_directory are changed.
+#
+#auto_update	"yes"
 ###############################################################################
 
 
diff --git a/src/conf.c b/src/conf.c
index 58a4f4e90..803ad8503 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -91,6 +91,7 @@ static struct config_entry config_entries[] = {
 	{ .name = CONF_INPUT, true, true },
 	{ .name = CONF_GAPLESS_MP3_PLAYBACK, false, false },
 	{ .name = CONF_PLAYLIST_PLUGIN, true, true },
+	{ .name = CONF_AUTO_UPDATE, false, false },
 	{ .name = "filter", true, true },
 };
 
diff --git a/src/conf.h b/src/conf.h
index 3f771f122..7dd12afda 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -68,6 +68,7 @@
 #define CONF_INPUT "input"
 #define CONF_GAPLESS_MP3_PLAYBACK	"gapless_mp3_playback"
 #define CONF_PLAYLIST_PLUGIN "playlist_plugin"
+#define CONF_AUTO_UPDATE		"auto_update"
 
 #define DEFAULT_PLAYLIST_MAX_LENGTH (1024*16)
 #define DEFAULT_PLAYLIST_SAVE_ABSOLUTE_PATHS false
diff --git a/src/main.c b/src/main.c
index 49190af71..86fe069e5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -372,9 +372,13 @@ int main(int argc, char *argv[])
 
 	glue_state_file_init();
 
+	success = config_get_bool(CONF_AUTO_UPDATE, false);
 #ifdef ENABLE_INOTIFY
-	if (mapper_has_music_directory())
-		mpd_inotify_init();
+	if (success && mapper_has_music_directory())
+    		mpd_inotify_init();
+#else
+	if (success)
+		g_warning("inotify: auto_update was disabled. enable during compilation phase");
 #endif
 
 	config_global_check();