Windows fix-up

This commit is contained in:
Charles J. Cliffe 2014-12-18 20:32:05 -05:00
parent ab82ab182e
commit c583b4a79a

View File

@ -51,6 +51,8 @@ public:
std::atomic<unsigned int> audio_queue_ptr; std::atomic<unsigned int> audio_queue_ptr;
std::atomic<unsigned int> underflow_count; std::atomic<unsigned int> underflow_count;
std::atomic<bool> terminated; std::atomic<bool> terminated;
std::atomic<bool> active;
float gain;
AudioThread(AudioThreadInputQueue *inputQueue, DemodulatorThreadCommandQueue* threadQueueNotify); AudioThread(AudioThreadInputQueue *inputQueue, DemodulatorThreadCommandQueue* threadQueueNotify);
~AudioThread(); ~AudioThread();
@ -63,11 +65,6 @@ public:
bool isActive(); bool isActive();
void setActive(bool state); void setActive(bool state);
#ifdef __APPLE__
void bindThread(AudioThread *other);
void removeThread(AudioThread *other);
#endif
private: private:
RtAudio dac; RtAudio dac;
RtAudio::StreamParameters parameters; RtAudio::StreamParameters parameters;
@ -76,12 +73,13 @@ private:
#ifdef __APPLE__ #ifdef __APPLE__
public: public:
void bindThread(AudioThread *other);
void removeThread(AudioThread *other);
static std::map<int,AudioThread *> deviceController; static std::map<int,AudioThread *> deviceController;
static std::map<int,std::thread *> deviceThread; static std::map<int,std::thread *> deviceThread;
static void deviceCleanup(); static void deviceCleanup();
std::atomic<std::vector<AudioThread *> *> boundThreads; std::atomic<std::vector<AudioThread *> *> boundThreads;
float gain;
std::atomic<bool> active;
#endif #endif
}; };