aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorcbdev <cb@cbcdn.com>2019-11-06 21:22:09 +0100
committercbdev <cb@cbcdn.com>2019-11-06 21:22:09 +0100
commit20eb48ce4ccffe88b22ecd6a93bc9e097e5aa498 (patch)
treee64b6fdffc06ad845b1d21be5e90ee32af8150ff
parentbe38eb9ddd1b82a87cf26884dd13ccb6dff5eebf (diff)
downloadmidimonster-20eb48ce4ccffe88b22ecd6a93bc9e097e5aa498.tar.gz
midimonster-20eb48ce4ccffe88b22ecd6a93bc9e097e5aa498.tar.bz2
midimonster-20eb48ce4ccffe88b22ecd6a93bc9e097e5aa498.zip
Use default mutex type for OSX
-rw-r--r--README.md2
-rw-r--r--backends/jack.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/README.md b/README.md
index f23e696..def72d6 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Currently, the MIDIMonster supports the following protocols:
| evdev input devices | Linux | Virtual output supported | [`evdev`](backends/evdev.md) |
| Open Lighting Architecture | Linux, OSX | | [`ola`](backends/ola.md) |
| MA Lighting Web Remote | Linux, Windows, OSX | GrandMA and dot2 (incl. OnPC) | [`maweb`](backends/maweb.md) |
-| JACK/LV2 Control Voltage (CV) | Linux | | [`jack`](backends/jack.md) |
+| JACK/LV2 Control Voltage (CV) | Linux, OSX | | [`jack`](backends/jack.md) |
with additional flexibility provided by a [Lua scripting environment](backends/lua.md).
diff --git a/backends/jack.c b/backends/jack.c
index f73ada8..efcd8d5 100644
--- a/backends/jack.c
+++ b/backends/jack.c
@@ -607,7 +607,11 @@ static int mmjack_start(){
//prepare mutex attributes because the initializer macro for adaptive mutexes is a GNU extension...
if(pthread_mutexattr_init(&mutex_attr)
+#ifndef __APPLE__
|| pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_ADAPTIVE_NP)){
+#else
+ }
+#endif
fprintf(stderr, "Failed to initialize mutex attributes\n");
goto bail;
}