From c583b4a79aa6f1e94696600b67eca1b06cd39ab4 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Thu, 18 Dec 2014 20:32:05 -0500 Subject: [PATCH] Windows fix-up --- src/audio/AudioThread.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/audio/AudioThread.h b/src/audio/AudioThread.h index 665278c..e295555 100644 --- a/src/audio/AudioThread.h +++ b/src/audio/AudioThread.h @@ -51,6 +51,8 @@ public: std::atomic audio_queue_ptr; std::atomic underflow_count; std::atomic terminated; + std::atomic active; + float gain; AudioThread(AudioThreadInputQueue *inputQueue, DemodulatorThreadCommandQueue* threadQueueNotify); ~AudioThread(); @@ -63,11 +65,6 @@ public: bool isActive(); void setActive(bool state); -#ifdef __APPLE__ - void bindThread(AudioThread *other); - void removeThread(AudioThread *other); -#endif - private: RtAudio dac; RtAudio::StreamParameters parameters; @@ -76,12 +73,13 @@ private: #ifdef __APPLE__ public: + void bindThread(AudioThread *other); + void removeThread(AudioThread *other); + static std::map deviceController; static std::map deviceThread; static void deviceCleanup(); std::atomic *> boundThreads; - float gain; - std::atomic active; #endif };