diff options
| author | NanoTech <nanotech@nanotechcorp.net> | 2014-10-12 16:29:43 -0600 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-10-31 15:03:53 +0100 |
| commit | d42c0f1dc5063d50a62817b63a1c2a4507c46071 (patch) | |
| tree | cd921a0a42cbc835ca588d0f6d88c2b7deb4a717 | |
| parent | 6ad1e4d99aba346440e984a232a312ea49561e7d (diff) | |
| download | mpd-d42c0f1dc5063d50a62817b63a1c2a4507c46071.tar.gz mpd-d42c0f1dc5063d50a62817b63a1c2a4507c46071.tar.xz mpd-d42c0f1dc5063d50a62817b63a1c2a4507c46071.zip | |
Main: run the OS X native event loop after forking
| -rw-r--r-- | src/Main.cxx | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/Main.cxx b/src/Main.cxx index 417e055d6..2719c05e0 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -114,6 +114,10 @@ #include <ws2tcpip.h> #endif +#ifdef __APPLE__ +#include <dispatch/dispatch.h> +#endif + #include <limits.h> static constexpr unsigned DEFAULT_BUFFER_SIZE = 4096; @@ -408,6 +412,8 @@ int main(int argc, char *argv[]) #endif +static int mpd_main_after_fork(struct options); + #ifdef ANDROID static inline #endif @@ -511,6 +517,27 @@ int mpd_main(int argc, char *argv[]) daemonize_begin(options.daemon); #endif +#ifdef __APPLE__ + /* Runs the OS X native event loop in the main thread, and runs + the rest of mpd_main on a new thread. This lets CoreAudio receive + route change notifications (e.g. plugging or unplugging headphones). + All hardware output on OS X ultimately uses CoreAudio internally. + This must be run after forking; if dispatch is called before forking, + the child process will have a broken internal dispatch state. */ + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + exit(mpd_main_after_fork(options)); + }); + dispatch_main(); + return EXIT_FAILURE; // unreachable, because dispatch_main never returns +#else + return mpd_main_after_fork(options); +#endif +} + +static int mpd_main_after_fork(struct options options) +{ + Error error; + GlobalEvents::Initialize(*instance->event_loop); GlobalEvents::Register(GlobalEvents::IDLE, idle_event_emitted); #ifdef WIN32 |