diff options
| author | Max Kellermann <max@duempel.org> | 2014-01-29 18:36:32 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-01-29 18:36:32 +0100 |
| commit | 4b044bd8e1c180ced319a83551afe85bcba1db2f (patch) | |
| tree | bd5a285a614a383051f1e8d2e3a46026bdf3bc92 | |
| parent | aeaf64b46757e64bf32e945d52df2c4d447e5aa4 (diff) | |
| download | mpd-4b044bd8e1c180ced319a83551afe85bcba1db2f.tar.gz mpd-4b044bd8e1c180ced319a83551afe85bcba1db2f.tar.xz mpd-4b044bd8e1c180ced319a83551afe85bcba1db2f.zip | |
InotifyUpdate: pass EventLoop to mpd_inotify_init()
| -rw-r--r-- | src/Main.cxx | 3 | ||||
| -rw-r--r-- | src/db/update/InotifyUpdate.cxx | 7 | ||||
| -rw-r--r-- | src/db/update/InotifyUpdate.hxx | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/Main.cxx b/src/Main.cxx index 86ac7fc7a..f8f7a6545 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -504,7 +504,8 @@ int mpd_main(int argc, char *argv[]) if (config_get_bool(CONF_AUTO_UPDATE, false)) { #ifdef ENABLE_INOTIFY if (mapper_has_music_directory()) - mpd_inotify_init(config_get_unsigned(CONF_AUTO_UPDATE_DEPTH, + mpd_inotify_init(*main_loop, + config_get_unsigned(CONF_AUTO_UPDATE_DEPTH, G_MAXUINT)); #else FormatWarning(main_domain, diff --git a/src/db/update/InotifyUpdate.cxx b/src/db/update/InotifyUpdate.cxx index 7515990d7..72f22ceb1 100644 --- a/src/db/update/InotifyUpdate.cxx +++ b/src/db/update/InotifyUpdate.cxx @@ -23,7 +23,6 @@ #include "InotifyQueue.hxx" #include "InotifyDomain.hxx" #include "Mapper.hxx" -#include "Main.hxx" #include "fs/AllocatedPath.hxx" #include "fs/FileSystem.hxx" #include "util/Error.hxx" @@ -286,7 +285,7 @@ mpd_inotify_callback(int wd, unsigned mask, } void -mpd_inotify_init(unsigned max_depth) +mpd_inotify_init(EventLoop &loop, unsigned max_depth) { LogDebug(inotify_domain, "initializing inotify"); @@ -297,7 +296,7 @@ mpd_inotify_init(unsigned max_depth) } Error error; - inotify_source = InotifySource::Create(*main_loop, + inotify_source = InotifySource::Create(loop, mpd_inotify_callback, nullptr, error); if (inotify_source == nullptr) { @@ -321,7 +320,7 @@ mpd_inotify_init(unsigned max_depth) recursive_watch_subdirectories(inotify_root, path, 0); - inotify_queue = new InotifyQueue(*main_loop); + inotify_queue = new InotifyQueue(loop); LogDebug(inotify_domain, "watching music directory"); } diff --git a/src/db/update/InotifyUpdate.hxx b/src/db/update/InotifyUpdate.hxx index 2d7d4e3b4..7cf486e5a 100644 --- a/src/db/update/InotifyUpdate.hxx +++ b/src/db/update/InotifyUpdate.hxx @@ -21,11 +21,14 @@ #define MPD_INOTIFY_UPDATE_HXX #include "check.h" +#include "Compiler.h" + +class EventLoop; #ifdef HAVE_INOTIFY_INIT void -mpd_inotify_init(unsigned max_depth); +mpd_inotify_init(EventLoop &loop, unsigned max_depth); void mpd_inotify_finish(void); @@ -33,7 +36,7 @@ mpd_inotify_finish(void); #else /* !HAVE_INOTIFY_INIT */ static inline void -mpd_inotify_init(gcc_unused unsigned max_depth) +mpd_inotify_init(gcc_unused EventLoop &loop, gcc_unused unsigned max_depth) { } |