Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
f0be48ff
Commit
f0be48ff
authored
Oct 10, 2014
by
nanotech
Committed by
Max Kellermann
Oct 10, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Main: run the OS X native event loop
parent
bb922d57
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
52 additions
and
0 deletions
+52
-0
Makefile.am
Makefile.am
+1
-0
NEWS
NEWS
+1
-0
Main.cxx
src/Main.cxx
+2
-0
Main.hxx
src/Main.hxx
+11
-0
OSXMain.cxx
src/osx/OSXMain.cxx
+37
-0
No files found.
Makefile.am
View file @
f0be48ff
...
...
@@ -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
\
...
...
NEWS
View file @
f0be48ff
...
...
@@ -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
...
...
src/Main.cxx
View file @
f0be48ff
...
...
@@ -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
...
...
src/Main.hxx
View file @
f0be48ff
...
...
@@ -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
src/osx/OSXMain.cxx
0 → 100644
View file @
f0be48ff
/*
* 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment