diff options
| author | nanotech <nanotech@nanotechcorp.net> | 2014-10-10 19:20:53 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-10-10 19:51:44 +0200 |
| commit | f0be48ff90503d9ffa5b295fd4454eec753950ee (patch) | |
| tree | c87081479266501d3842709b8956a48649238541 | |
| parent | bb922d577dd8dc484d25c29c7c85bf04ecd62256 (diff) | |
| download | mpd-f0be48ff90503d9ffa5b295fd4454eec753950ee.tar.gz mpd-f0be48ff90503d9ffa5b295fd4454eec753950ee.tar.xz mpd-f0be48ff90503d9ffa5b295fd4454eec753950ee.zip | |
Main: run the OS X native event loop
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/Main.cxx | 2 | ||||
| -rw-r--r-- | src/Main.hxx | 11 | ||||
| -rw-r--r-- | src/osx/OSXMain.cxx | 37 |
5 files changed, 52 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 90e2074fc..e263f9c61 100644 --- a/Makefile.am +++ b/Makefile.am @@ -130,6 +130,7 @@ libmpd_a_SOURCES = \ src/IOThread.cxx src/IOThread.hxx \ src/Instance.cxx src/Instance.hxx \ src/win32/Win32Main.cxx \ + src/osx/OSXMain.cxx \ src/GlobalEvents.cxx src/GlobalEvents.hxx \ src/MixRampInfo.hxx \ src/MusicBuffer.cxx src/MusicBuffer.hxx \ @@ -59,6 +59,7 @@ ver 0.19 (not yet released) * output - alsa: support native DSD playback - alsa: rename "DSD over USB" to "DoP" + - osx: fix hang after (un)plugging headphones * threads: - the update thread runs at "idle" priority - the output thread runs at "real-time" priority diff --git a/src/Main.cxx b/src/Main.cxx index 417e055d6..d17590e44 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -401,6 +401,8 @@ int main(int argc, char *argv[]) { #ifdef WIN32 return win32_main(argc, argv); +#elif __APPLE__ + return osx_main(argc, argv); #else return mpd_main(argc, argv); #endif diff --git a/src/Main.hxx b/src/Main.hxx index 7e3fecd0b..dae7a5043 100644 --- a/src/Main.hxx +++ b/src/Main.hxx @@ -75,4 +75,15 @@ win32_app_stopping(void); #endif +#ifdef __APPLE__ + +/* Runs the OS X native event loop in the main thread, and runs + * 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. + */ +int osx_main(int argc, char *argv[]); + +#endif + #endif diff --git a/src/osx/OSXMain.cxx b/src/osx/OSXMain.cxx new file mode 100644 index 000000000..1ac9aec23 --- /dev/null +++ b/src/osx/OSXMain.cxx @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2003-2014 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" +#include "Main.hxx" + +#ifdef __APPLE__ + +#include <stdlib.h> +#include <dispatch/dispatch.h> + +int osx_main(int argc, char *argv[]) +{ + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + exit(mpd_main(argc, argv)); + }); + dispatch_main(); + return EXIT_FAILURE; // unreachable, because dispatch_main never returns +} + +#endif |