Main: run the OS X native event loop
This commit is contained in:
parent
bb922d577d
commit
f0be48ff90
|
@ -130,6 +130,7 @@ libmpd_a_SOURCES = \
|
||||||
src/IOThread.cxx src/IOThread.hxx \
|
src/IOThread.cxx src/IOThread.hxx \
|
||||||
src/Instance.cxx src/Instance.hxx \
|
src/Instance.cxx src/Instance.hxx \
|
||||||
src/win32/Win32Main.cxx \
|
src/win32/Win32Main.cxx \
|
||||||
|
src/osx/OSXMain.cxx \
|
||||||
src/GlobalEvents.cxx src/GlobalEvents.hxx \
|
src/GlobalEvents.cxx src/GlobalEvents.hxx \
|
||||||
src/MixRampInfo.hxx \
|
src/MixRampInfo.hxx \
|
||||||
src/MusicBuffer.cxx src/MusicBuffer.hxx \
|
src/MusicBuffer.cxx src/MusicBuffer.hxx \
|
||||||
|
|
1
NEWS
1
NEWS
|
@ -59,6 +59,7 @@ ver 0.19 (not yet released)
|
||||||
* output
|
* output
|
||||||
- alsa: support native DSD playback
|
- alsa: support native DSD playback
|
||||||
- alsa: rename "DSD over USB" to "DoP"
|
- alsa: rename "DSD over USB" to "DoP"
|
||||||
|
- osx: fix hang after (un)plugging headphones
|
||||||
* threads:
|
* threads:
|
||||||
- the update thread runs at "idle" priority
|
- the update thread runs at "idle" priority
|
||||||
- the output thread runs at "real-time" priority
|
- the output thread runs at "real-time" priority
|
||||||
|
|
|
@ -401,6 +401,8 @@ int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
return win32_main(argc, argv);
|
return win32_main(argc, argv);
|
||||||
|
#elif __APPLE__
|
||||||
|
return osx_main(argc, argv);
|
||||||
#else
|
#else
|
||||||
return mpd_main(argc, argv);
|
return mpd_main(argc, argv);
|
||||||
#endif
|
#endif
|
||||||
|
|
11
src/Main.hxx
11
src/Main.hxx
|
@ -75,4 +75,15 @@ win32_app_stopping(void);
|
||||||
|
|
||||||
#endif
|
#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
|
#endif
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue