comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-29 23:28:39 -05:00
Code Issues Projects Releases Wiki Activity

AudioThread polishing

Browse Source
This commit is contained in:
vsonnier 2017-09-01 06:18:35 +02:00
parent 5460863608
commit 252b6bf9f8
2 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/audio/AudioThread.cpp
View File

@ -509,20 +509,11 @@ AudioThreadCommandQueue *AudioThread::getCommandQueue() {
void AudioThread::setGain(float gain_in) { void AudioThread::setGain(float gain_in) {
std::lock_guard<std::recursive_mutex> lock(m_mutex); if (gain_in < 0.0) {
gain_in = 0.0;
if (gain < 0.0) {
gain = 0.0;
} }
if (gain > 2.0) { if (gain_in > 2.0) {
gain = 2.0; gain_in = 2.0;
} }
gain = gain_in; gain = gain_in;
} }
float AudioThread::getGain() {
std::lock_guard<std::recursive_mutex> lock(m_mutex);
return gain;
}

49
src/audio/AudioThread.h
View File

@ -60,26 +60,19 @@ typedef std::shared_ptr<AudioThreadInputQueue> AudioThreadInputQueuePtr;
typedef std::shared_ptr<AudioThreadCommandQueue> AudioThreadCommandQueuePtr; typedef std::shared_ptr<AudioThreadCommandQueue> AudioThreadCommandQueuePtr;
class AudioThread : public IOThread { class AudioThread : public IOThread {
public: public:
AudioThreadInputPtr currentInput;
AudioThreadInputQueuePtr inputQueue;
std::atomic_uint audioQueuePtr;
std::atomic_uint underflowCount;
std::atomic_bool initialized;
std::atomic_bool active;
std::atomic_int outputDevice;
float gain;
AudioThread(); AudioThread();
~AudioThread(); virtual ~AudioThread();
static void enumerateDevices(std::vector<RtAudio::DeviceInfo> &devs); static void enumerateDevices(std::vector<RtAudio::DeviceInfo> &devs);
void setupDevice(int deviceId);
void setInitOutputDevice(int deviceId, int sampleRate=-1); void setInitOutputDevice(int deviceId, int sampleRate=-1);
int getOutputDevice(); int getOutputDevice();
void setSampleRate(int sampleRate);
int getSampleRate(); int getSampleRate();
virtual void run(); virtual void run();
virtual void terminate(); virtual void terminate();
@ -87,11 +80,31 @@ public:
void setActive(bool state); void setActive(bool state);
void setGain(float gain_in); void setGain(float gain_in);
float getGain();
static std::map<int, int> deviceSampleRate;
AudioThreadCommandQueue *getCommandQueue(); AudioThreadCommandQueue *getCommandQueue();
//give access to the this AudioThread lock
std::recursive_mutex& getMutex();
static void deviceCleanup();
static void setDeviceSampleRate(int deviceId, int sampleRate);
//fields below, only to be used by other AudioThreads !
std::atomic_uint underflowCount;
//protected by m_mutex
std::vector<AudioThread *> boundThreads;
AudioThreadInputQueuePtr inputQueue;
AudioThreadInputPtr currentInput;
std::atomic_uint audioQueuePtr;
std::atomic<float> gain;
private: private:
std::atomic_bool active;
std::atomic_int outputDevice;
RtAudio dac; RtAudio dac;
unsigned int nBufferFrames; unsigned int nBufferFrames;
RtAudio::StreamOptions opts; RtAudio::StreamOptions opts;
@ -102,20 +115,14 @@ private:
//The own m_mutex protecting this AudioThread, in particular boundThreads //The own m_mutex protecting this AudioThread, in particular boundThreads
std::recursive_mutex m_mutex; std::recursive_mutex m_mutex;
public: void setupDevice(int deviceId);
//give access to the this AudioThread lock void setSampleRate(int sampleRate);
std::recursive_mutex& getMutex();
void bindThread(AudioThread *other); void bindThread(AudioThread *other);
void removeThread(AudioThread *other); void removeThread(AudioThread *other);
static std::map<int, AudioThread *> deviceController; static std::map<int, AudioThread *> deviceController;
static std::map<int,int> deviceSampleRate;
static std::map<int,std::thread *> deviceThread;
static void deviceCleanup();
static void setDeviceSampleRate(int deviceId, int sampleRate);
//protected by m_mutex static std::map<int, std::thread *> deviceThread;
std::vector<AudioThread *> boundThreads;
}; };