comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-11 10:18:52 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #398 from vsonnier/thread_clean_3

Browse Source 
thread_clean_3: Multithreading AudioThread hardening, use of try_pop() and more.
This commit is contained in:
Charles J. Cliffe
2016-07-08 21:28:11 -04:00
committed by GitHub
parent 3eed669382 21c8a81c32
commit 4d2ea8d08a
21 changed files with 412 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AppFrame.cpp
+3 -2
View File
@@ -806,11 +806,11 @@ void AppFrame::OnMenu(wxCommandEvent& event) {
#endif
else if (event.GetId() == wxID_SDR_START_STOP) {
if (!wxGetApp().getSDRThread()->isTerminated()) {
wxGetApp().stopDevice(true);
wxGetApp().stopDevice(true, 2000);
} else {
SDRDeviceInfo *dev = wxGetApp().getDevice();
if (dev != nullptr) {
wxGetApp().setDevice(dev);
wxGetApp().setDevice(dev, 0);
}
}
} else if (event.GetId() == wxID_LOW_PERF) {
@@ -1645,6 +1645,7 @@ bool AppFrame::loadSession(std::string fileName) {
}
wxGetApp().getDemodMgr().setActiveDemodulator(nullptr, false);
wxGetApp().getDemodMgr().terminateAll();
try {