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

AudioThread: rollback deviceCleanup() to only doing terminate + TEST: apply to all platforms

Browse Source
This commit is contained in:
vsonnier 2018-01-22 06:49:42 +01:00
parent 36224defd7
commit fc1c1c3b4d
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CubicSDR.cpp
View File

@ -486,9 +486,8 @@ int CubicSDR::OnExit() {
std::cout << "Application termination complete." << std::endl << std::flush; std::cout << "Application termination complete." << std::endl << std::flush;
#ifdef __APPLE__ //TODO ?
AudioThread::deviceCleanup(); AudioThread::deviceCleanup();
#endif
return wxApp::OnExit(); return wxApp::OnExit();
} }

22
src/audio/AudioThread.cpp
View File

@ -81,24 +81,10 @@ void AudioThread::removeThread(AudioThread *other) {
void AudioThread::deviceCleanup() { void AudioThread::deviceCleanup() {
std::lock_guard<std::recursive_mutex> lock(m_device_mutex); std::lock_guard<std::recursive_mutex> lock(m_device_mutex);
// only notify, let the thread die by itself.
auto it = deviceController.begin(); for (auto i = deviceController.begin(); i != deviceController.end(); i++) {
i->second->terminate();
std::cout << "Final audio management cleanup, terminating " << deviceController.size() << " device controllers..." << std::endl << std::flush;
while (it != deviceController.end()) {
//notify termination...
it->second->terminate();
//deletion of it->second will take care of the controllerThread:
delete it->second;
//next device
it++;
} }
std::cout << "Final audio management cleanup complete..." << std::endl << std::flush;
} }
static int audioCallback(void *outputBuffer, void * /* inputBuffer */, unsigned int nBufferFrames, double /* streamTime */, RtAudioStreamStatus status, static int audioCallback(void *outputBuffer, void * /* inputBuffer */, unsigned int nBufferFrames, double /* streamTime */, RtAudioStreamStatus status,
@ -428,9 +414,7 @@ void AudioThread::setupDevice(int deviceId) {
deviceController[parameters.deviceId] = new AudioThread(); deviceController[parameters.deviceId] = new AudioThread();
deviceController[parameters.deviceId]->setInitOutputDevice(parameters.deviceId, sampleRate); deviceController[parameters.deviceId]->setInitOutputDevice(parameters.deviceId, sampleRate);
// BEWARE: the controller add itself to the list of boundThreads !
deviceController[parameters.deviceId]->bindThread(this); deviceController[parameters.deviceId]->bindThread(this);
deviceController[parameters.deviceId]->attachControllerThread(new std::thread(&AudioThread::threadMain, deviceController[parameters.deviceId])); deviceController[parameters.deviceId]->attachControllerThread(new std::thread(&AudioThread::threadMain, deviceController[parameters.deviceId]));
} else if (deviceController[parameters.deviceId] == this) { } else if (deviceController[parameters.deviceId] == this) {

1
src/audio/AudioThread.h
View File

@ -8,7 +8,6 @@
#include <map> #include <map>
#include <string> #include <string>
#include <atomic> #include <atomic>
#include <algorithm>
#include <memory> #include <memory>
#include "ThreadBlockingQueue.h" #include "ThreadBlockingQueue.h"
#include "RtAudio.h" #include "RtAudio.h"