comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-06 23:27:53 -04:00
Code Issues Projects Releases Wiki Activity

On second thought, let’s not go to Camelot. ‘Tis a silly place.

Browse Source
This commit is contained in:
Charles J. Cliffe 2016-06-08 21:45:52 -04:00
parent 0067e309d1
commit d7ef86ae10
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/audio/AudioThread.cpp
View File

@ -84,16 +84,11 @@ static int audioCallback(void *outputBuffer, void * /* inputBuffer */, unsigned
} }
srcmix->inputQueue->pop(srcmix->currentInput); srcmix->inputQueue->pop(srcmix->currentInput);
if (srcmix->isTerminated()) { if (srcmix->isTerminated()) {
if (srcmix->currentInput) {
srcmix->currentInput->decRefCount();
}
continue; continue;
} }
continue; continue;
} }
// std::lock_guard < std::mutex > lock(srcmix->currentInput->m_mutex);
if (srcmix->currentInput->sampleRate != src->getSampleRate()) { if (srcmix->currentInput->sampleRate != src->getSampleRate()) {
while (srcmix->inputQueue->size()) { while (srcmix->inputQueue->size()) {
srcmix->inputQueue->pop(srcmix->currentInput); srcmix->inputQueue->pop(srcmix->currentInput);
@ -126,9 +121,6 @@ static int audioCallback(void *outputBuffer, void * /* inputBuffer */, unsigned
} }
srcmix->inputQueue->pop(srcmix->currentInput); srcmix->inputQueue->pop(srcmix->currentInput);
if (srcmix->isTerminated()) { if (srcmix->isTerminated()) {
if (srcmix->currentInput) {
srcmix->currentInput->decRefCount();
}
continue; continue;
} }
} }
@ -150,9 +142,6 @@ static int audioCallback(void *outputBuffer, void * /* inputBuffer */, unsigned
} }
srcmix->inputQueue->pop(srcmix->currentInput); srcmix->inputQueue->pop(srcmix->currentInput);
if (srcmix->isTerminated()) { if (srcmix->isTerminated()) {
if (srcmix->currentInput) {
srcmix->currentInput->decRefCount();
}
break; break;
} }
float srcPeak = srcmix->currentInput->peak * srcmix->gain; float srcPeak = srcmix->currentInput->peak * srcmix->gain;
@ -180,9 +169,6 @@ static int audioCallback(void *outputBuffer, void * /* inputBuffer */, unsigned
} }
srcmix->inputQueue->pop(srcmix->currentInput); srcmix->inputQueue->pop(srcmix->currentInput);
if (srcmix->isTerminated()) { if (srcmix->isTerminated()) {
if (srcmix->currentInput) {
srcmix->currentInput->decRefCount();
}
break; break;
} }
float srcPeak = srcmix->currentInput->peak * srcmix->gain; float srcPeak = srcmix->currentInput->peak * srcmix->gain;
@ -414,6 +400,11 @@ void AudioThread::run() {
ref->decRefCount(); ref->decRefCount();
} }
} }
if (currentInput) {
currentInput->setRefCount(0);
currentInput = nullptr;
}
if (deviceController[parameters.deviceId] != this) { if (deviceController[parameters.deviceId] != this) {
deviceController[parameters.deviceId]->removeThread(this); deviceController[parameters.deviceId]->removeThread(this);