diff options
| author | Max Kellermann <max@duempel.org> | 2014-03-01 22:50:11 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-03-01 22:51:51 +0100 |
| commit | 36ca57a54ebcbdfb2fa4374378280867a089bb91 (patch) | |
| tree | 02eca17f29c90d367d9c964f921961fa16f061c1 /src/db | |
| parent | efa6678bcc0cbd6679061809c464c91f06b552ec (diff) | |
| download | mpd-36ca57a54ebcbdfb2fa4374378280867a089bb91.tar.gz mpd-36ca57a54ebcbdfb2fa4374378280867a089bb91.tar.xz mpd-36ca57a54ebcbdfb2fa4374378280867a089bb91.zip | |
fs/StandardDirectory: add GetUserCacheDir()
Move code from CreateConfiguredDatabase() and add XDG support. This
implements an automatic Linux fallback for the setting "db_file" if
none was specified.
Diffstat (limited to '')
| -rw-r--r-- | src/db/Configured.cxx | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/db/Configured.cxx b/src/db/Configured.cxx index 78be3e999..625300d75 100644 --- a/src/db/Configured.cxx +++ b/src/db/Configured.cxx @@ -23,16 +23,11 @@ #include "config/ConfigGlobal.hxx" #include "config/ConfigData.hxx" #include "config/ConfigError.hxx" +#include "fs/AllocatedPath.hxx" +#include "fs/StandardDirectory.hxx" #include "util/Error.hxx" #include "Log.hxx" -#ifdef ANDROID -#include "Main.hxx" -#include "android/Context.hxx" -#include "fs/AllocatedPath.hxx" -#include "plugins/simple/SimpleDatabasePlugin.hxx" -#endif - Database * CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener, Error &error) @@ -57,12 +52,9 @@ CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener, } if (param == nullptr) { -#ifdef ANDROID - /* if there is no override, use the Android cache - directory */ + /* if there is no override, use the cache directory */ - const AllocatedPath cache_dir = - context->GetCacheDir(Java::GetEnv()); + const AllocatedPath cache_dir = GetUserCacheDir(); if (cache_dir.IsNull()) return nullptr; @@ -71,9 +63,6 @@ CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener, allocated = new config_param("database"); allocated->AddBlockParam("path", db_file.c_str(), -1); param = allocated; -#else - return nullptr; -#endif } Database *db = DatabaseGlobalInit(loop, listener, *param, |