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

Main: simplify Android startup

Browse Source
This commit is contained in:
Max Kellermann
2019-05-29 14:58:24 +02:00
parent c782fdb698
commit 14cee01ba1
1 changed files with 26 additions and 17 deletions

43
src/Main.cxx

@ -455,33 +455,19 @@ MainConfigured(const struct options &options, const ConfigData &raw_config)
mpd_main_after_fork(raw_config, config); mpd_main_after_fork(raw_config, config);
} }
#ifndef ANDROID
static inline void static inline void
MainOrThrow(int argc, char *argv[]) MainOrThrow(int argc, char *argv[])
{ {
struct options options; struct options options;
ConfigData raw_config; ConfigData raw_config;
#ifdef ANDROID
(void)argc;
(void)argv;
const auto sdcard = Environment::getExternalStorageDirectory();
if (!sdcard.IsNull()) {
const auto config_path =
sdcard / Path::FromFS("mpd.conf");
if (FileExists(config_path))
ReadConfigFile(raw_config, config_path);
}
#else
ParseCommandLine(argc, argv, options, raw_config); ParseCommandLine(argc, argv, options, raw_config);
#endif
MainConfigured(options, raw_config); MainConfigured(options, raw_config);
} }
#ifdef ANDROID
static inline
#endif
int mpd_main(int argc, char *argv[]) noexcept int mpd_main(int argc, char *argv[]) noexcept
{ {
AtScopeExit() { log_deinit(); }; AtScopeExit() { log_deinit(); };
@ -495,6 +481,8 @@ int mpd_main(int argc, char *argv[]) noexcept
} }
} }
#endif /* !ANDROID */
static void static void
mpd_main_after_fork(const ConfigData &raw_config, const Config &config) mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
{ {
@ -632,6 +620,23 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
#ifdef ANDROID #ifdef ANDROID
static void
AndroidMain()
{
struct options options;
ConfigData raw_config;
const auto sdcard = Environment::getExternalStorageDirectory();
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);
}
gcc_visibility_default gcc_visibility_default
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_org_musicpd_Bridge_run(JNIEnv *env, jclass, jobject _context, jobject _logListener) Java_org_musicpd_Bridge_run(JNIEnv *env, jclass, jobject _context, jobject _logListener)
@ -649,7 +654,11 @@ Java_org_musicpd_Bridge_run(JNIEnv *env, jclass, jobject _context, jobject _logL
logListener = new LogListener(env, _logListener); logListener = new LogListener(env, _logListener);
AtScopeExit() { delete logListener; }; AtScopeExit() { delete logListener; };
mpd_main(0, nullptr); try {
AndroidMain();
} catch (...) {
LogError(std::current_exception());
}
} }
gcc_visibility_default gcc_visibility_default