From 76c68cc4fac86829c026cc87d7155a96f41d7172 Mon Sep 17 00:00:00 2001
From: "Charles J. Cliffe" <cj@cubicproductions.com>
Date: Tue, 16 Dec 2014 00:22:33 -0500
Subject: [PATCH] OSX fix-up

---
 src/audio/AudioThread.cpp    | 6 +-----
 src/demod/DemodulatorMgr.cpp | 4 ++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/audio/AudioThread.cpp b/src/audio/AudioThread.cpp
index 205ac9b..3c37055 100644
--- a/src/audio/AudioThread.cpp
+++ b/src/audio/AudioThread.cpp
@@ -56,17 +56,13 @@ void AudioThread::threadMain() {
     parameters.nChannels = 2;
     parameters.firstChannel = 0;
     unsigned int sampleRate = AUDIO_FREQUENCY;
-#ifdef __APPLE__
-    unsigned int bufferFrames = 0;
-#else
     unsigned int bufferFrames = 256;
-#endif
 
     RtAudio::StreamOptions opts;
 //    opts.flags =  RTAUDIO_SCHEDULE_REALTIME | RTAUDIO_MINIMIZE_LATENCY;
 //    opts.flags = RTAUDIO_MINIMIZE_LATENCY;
     opts.streamName = "CubicSDR Audio Output";
-    opts.priority = sched_get_priority_max(SCHED_FIFO);
+//    opts.priority = sched_get_priority_max(SCHED_FIFO);
 
     try {
         dac.openStream(&parameters, NULL, RTAUDIO_FLOAT32, sampleRate, &bufferFrames, &audioCallback, (void *) this, &opts);
diff --git a/src/demod/DemodulatorMgr.cpp b/src/demod/DemodulatorMgr.cpp
index 4a25ed3..7eafd6a 100644
--- a/src/demod/DemodulatorMgr.cpp
+++ b/src/demod/DemodulatorMgr.cpp
@@ -154,7 +154,11 @@ bool DemodulatorInstance::isTerminated() {
             break;
         case DemodulatorThreadCommand::DEMOD_THREAD_CMD_DEMOD_TERMINATED:
             demodulatorThread = NULL;
+#ifdef __APPLE__
+            pthread_join(t_Demod,NULL);
+#else
             t_Demod->join();
+#endif
             demodTerminated = true;
             break;
         default: