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

Main: move code to LoadConfigFile()

Browse Source
This commit is contained in:
Max Kellermann
2022-08-18 14:59:50 +02:00
parent 5d0d5b5d97
commit 6229210d51
1 changed files with 13 additions and 7 deletions

20
src/Main.cxx

@ -590,19 +590,25 @@ MainConfigured(const CommandLineOptions &options,
#ifdef ANDROID #ifdef ANDROID
static void
LoadConfigFile(JNIEnv *env, ConfigData &config)
{
if (const auto dir = Environment::getExternalStorageDirectory(env);
!dir.IsNull()) {
const auto config_path =
dir / Path::FromFS("mpd.conf");
if (FileExists(config_path))
ReadConfigFile(config, config_path);
}
}
static void static void
AndroidMain(JNIEnv *env) AndroidMain(JNIEnv *env)
{ {
CommandLineOptions options; CommandLineOptions options;
ConfigData raw_config; ConfigData raw_config;
const auto sdcard = Environment::getExternalStorageDirectory(env); LoadConfigFile(env, raw_config);
if (!sdcard.IsNull()) {
const auto config_path =
sdcard / Path::FromFS("mpd.conf");
if (FileExists(config_path))
ReadConfigFile(raw_config, config_path);
}
MainConfigured(options, raw_config); MainConfigured(options, raw_config);
} }