mirror of
https://github.com/cjcliffe/CubicSDR.git
synced 2024-11-05 00:41:17 -05:00
Fixed and working with MSVC 32-bit
This commit is contained in:
parent
b8cb4f9c9f
commit
2b08c5d248
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
build/
|
||||
cmake_build/
|
||||
cmake_build_msvc/
|
||||
dist/
|
||||
|
@ -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());
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -100,6 +100,7 @@ public:
|
||||
void removeRemote(std::string remoteAddr);
|
||||
|
||||
void setDeviceSelectorClosed();
|
||||
bool isDeviceSelectorOpen();
|
||||
|
||||
private:
|
||||
AppFrame *appframe;
|
||||
|
Loading…
Reference in New Issue
Block a user