Get rid of GCD on macOS which breaks debug builds

With Grand Central Dispatch used in Main.cxx, debug builds on macOS crash as the IsInside() assertion gets triggered in the event loop. As a simple fix, usage of GCD is removed. Plugging and unplugging headphones or changes of the default output device was tested without issues. Whatever the original commit tried to fix by GCD probably does not need fixing anymore.

Get rid of GCD on macOS which breaks debug builds
79535212 · Christian Kröner · Max Kellermann · ef5f96a1 · 79535212 · 79535212
Commit 79535212 authored Mar 03, 2018 by Christian Kröner Committed by Max Kellermann Mar 04, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 18 deletions

NEWS NEWS +1 -0

Main.cxx src/Main.cxx +1 -18

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.20.19 (not yet released)
+* macOS: fix crash bug

 ver 0.20.18 (2018/02/24)
 * input

--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -107,10 +107,6 @@
 #include <locale.h>
 #endif

-#ifdef __BLOCKS__
-#include <dispatch/dispatch.h>
-#endif
-
 #include <limits.h>

 static constexpr size_t KILOBYTE = 1024;
@@ -483,21 +479,8 @@ try {
 	daemonize_begin(options.daemon);
 #endif

-#ifdef __BLOCKS__
-	/* 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(config));
-	});
-	dispatch_main();
-	return EXIT_FAILURE; // unreachable, because dispatch_main never returns
-#else
 	return mpd_main_after_fork(config);
-#endif
+
 } catch (const std::exception &e) {
 	LogError(e);
 	return EXIT_FAILURE;