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

Fixed and working with MSVC 32-bit

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-10-10 01:13:48 -04:00
parent b8cb4f9c9f
commit 2b08c5d248
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
build/
cmake_build/
cmake_build_msvc/
dist/

6
src/AppFrame.cpp
View File

@ -802,8 +802,10 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
if (!demodTuner->HasFocus()) {
demodTuner->SetFocus();
}
} else if (!waterfallCanvas->HasFocus()) {
waterfallCanvas->SetFocus();
} else if (!wxGetApp().isDeviceSelectorOpen()) {
if (!waterfallCanvas->HasFocus()) {
waterfallCanvas->SetFocus();
}
}
scopeCanvas->setPPMMode(demodTuner->isAltDown());

6
src/CubicSDR.cpp
View File

@ -101,9 +101,9 @@ bool CubicSDR::OnInit() {
// t_SDR = new std::thread(&SDRThread::threadMain, sdrThread);
sdrEnum = new SDREnumerator();
t_SDREnum = new std::thread(&SDREnumerator::threadMain, sdrEnum);
appframe = new AppFrame();
t_SDREnum = new std::thread(&SDREnumerator::threadMain, sdrEnum);
//#ifdef __APPLE__
// int main_policy;
@ -499,3 +499,7 @@ std::string CubicSDR::getNotification() {
void CubicSDR::setDeviceSelectorClosed() {
deviceSelectorOpen.store(false);
}
bool CubicSDR::isDeviceSelectorOpen() {
return deviceSelectorOpen.load();
}

1
src/CubicSDR.h
View File

@ -100,6 +100,7 @@ public:
void removeRemote(std::string remoteAddr);
void setDeviceSelectorClosed();
bool isDeviceSelectorOpen();
private:
AppFrame *appframe;