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

InotifyUpdate: use class Storage instead of Mapper.cxx

Browse Source
This commit is contained in:
Max Kellermann 2014-02-07 22:16:37 +01:00
parent f6939f71a7
commit f947274626
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Main.cxx
View File

@ -528,8 +528,11 @@ int mpd_main(int argc, char *argv[])
if (config_get_bool(CONF_AUTO_UPDATE, false)) { if (config_get_bool(CONF_AUTO_UPDATE, false)) {
#ifdef ENABLE_INOTIFY #ifdef ENABLE_INOTIFY
if (mapper_has_music_directory() && if (mapper_has_music_directory() &&
instance->storage != nullptr &&
instance->update != nullptr) instance->update != nullptr)
mpd_inotify_init(*instance->event_loop, *instance->update, mpd_inotify_init(*instance->event_loop,
*instance->storage,
*instance->update,
config_get_unsigned(CONF_AUTO_UPDATE_DEPTH, config_get_unsigned(CONF_AUTO_UPDATE_DEPTH,
G_MAXUINT)); G_MAXUINT));
#else #else

7
src/db/update/InotifyUpdate.cxx
View File

@ -22,7 +22,7 @@
#include "InotifySource.hxx" #include "InotifySource.hxx"
#include "InotifyQueue.hxx" #include "InotifyQueue.hxx"
#include "InotifyDomain.hxx" #include "InotifyDomain.hxx"
#include "Mapper.hxx" #include "storage/StorageInterface.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "fs/FileSystem.hxx" #include "fs/FileSystem.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
@ -290,11 +290,12 @@ mpd_inotify_callback(int wd, unsigned mask,
} }
void void
mpd_inotify_init(EventLoop &loop, UpdateService &update, unsigned max_depth) mpd_inotify_init(EventLoop &loop, Storage &storage, UpdateService &update,
unsigned max_depth)
{ {
LogDebug(inotify_domain, "initializing inotify"); LogDebug(inotify_domain, "initializing inotify");
const auto &path = mapper_get_music_directory_fs(); const auto path = storage.MapFS("");
if (path.IsNull()) { if (path.IsNull()) {
LogDebug(inotify_domain, "no music directory configured"); LogDebug(inotify_domain, "no music directory configured");
return; return;

4
src/db/update/InotifyUpdate.hxx
View File

@ -24,10 +24,12 @@
#include "Compiler.h" #include "Compiler.h"
class EventLoop; class EventLoop;
class Storage;
class UpdateService; class UpdateService;
void void
mpd_inotify_init(EventLoop &loop, UpdateService &update, unsigned max_depth); mpd_inotify_init(EventLoop &loop, Storage &storage, UpdateService &update,
unsigned max_depth);
void void
mpd_inotify_finish(void); mpd_inotify_finish(void);