diff options
| author | Max Kellermann <max@duempel.org> | 2014-02-21 23:12:51 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-02-22 00:18:46 +0100 |
| commit | 3d4689756c8532551b80a3ba09586fa5d74e05fb (patch) | |
| tree | 9a41945b6db8b022c4b2b24911d563b377576585 /src | |
| parent | 90114514a9d9439f7ed9519f2956bb00942771c5 (diff) | |
| download | mpd-3d4689756c8532551b80a3ba09586fa5d74e05fb.tar.gz mpd-3d4689756c8532551b80a3ba09586fa5d74e05fb.tar.xz mpd-3d4689756c8532551b80a3ba09586fa5d74e05fb.zip | |
Main: disable command-line parser and signal handlers on Android
Diffstat (limited to 'src')
| -rw-r--r-- | src/Main.cxx | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/Main.cxx b/src/Main.cxx index cfb2dcc92..fb2aaf0a9 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -114,6 +114,8 @@ Instance *instance; static StateFile *state_file; +#ifndef ANDROID + static bool glue_daemonize_init(const struct options *options, Error &error) { @@ -131,6 +133,8 @@ glue_daemonize_init(const struct options *options, Error &error) return true; } +#endif + static bool glue_mapper_init(Error &error) { @@ -375,6 +379,7 @@ int mpd_main(int argc, char *argv[]) struct options options; Error error; +#ifndef ANDROID daemonize_close_stdin(); #ifdef HAVE_LOCALE_H @@ -390,11 +395,16 @@ int mpd_main(int argc, char *argv[]) g_thread_init(nullptr); #endif #endif +#endif winsock_init(); io_thread_init(); config_global_init(); +#ifdef ANDROID + (void)argc; + (void)argv; +#else if (!parse_cmdline(argc, argv, &options, error)) { LogError(error); return EXIT_FAILURE; @@ -404,6 +414,7 @@ int mpd_main(int argc, char *argv[]) LogError(error); return EXIT_FAILURE; } +#endif stats_global_init(); TagLoadConfig(); @@ -440,8 +451,10 @@ int mpd_main(int argc, char *argv[]) return EXIT_FAILURE; } +#ifndef ANDROID daemonize_set_user(); daemonize_begin(options.daemon); +#endif GlobalEvents::Initialize(*instance->event_loop); GlobalEvents::Register(GlobalEvents::IDLE, idle_event_emitted); @@ -490,11 +503,13 @@ int mpd_main(int argc, char *argv[]) playlist_list_global_init(); +#ifndef ANDROID daemonize_commit(); setup_log_output(options.log_stderr); SignalHandlersInit(*instance->event_loop); +#endif io_thread_start(); @@ -616,10 +631,14 @@ int mpd_main(int argc, char *argv[]) #endif config_global_finish(); io_thread_deinit(); +#ifndef ANDROID SignalHandlersFinish(); +#endif delete instance->event_loop; delete instance; +#ifndef ANDROID daemonize_finish(); +#endif #ifdef WIN32 WSACleanup(); #endif |