mirror of
https://github.com/cjcliffe/CubicSDR.git
synced 2024-11-21 19:31:54 -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/
|
||||||
cmake_build_msvc/
|
cmake_build_msvc/
|
||||||
dist/
|
dist/
|
||||||
|
@ -802,8 +802,10 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
|
|||||||
if (!demodTuner->HasFocus()) {
|
if (!demodTuner->HasFocus()) {
|
||||||
demodTuner->SetFocus();
|
demodTuner->SetFocus();
|
||||||
}
|
}
|
||||||
} else if (!waterfallCanvas->HasFocus()) {
|
} else if (!wxGetApp().isDeviceSelectorOpen()) {
|
||||||
waterfallCanvas->SetFocus();
|
if (!waterfallCanvas->HasFocus()) {
|
||||||
|
waterfallCanvas->SetFocus();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
scopeCanvas->setPPMMode(demodTuner->isAltDown());
|
scopeCanvas->setPPMMode(demodTuner->isAltDown());
|
||||||
|
@ -101,9 +101,9 @@ bool CubicSDR::OnInit() {
|
|||||||
// t_SDR = new std::thread(&SDRThread::threadMain, sdrThread);
|
// t_SDR = new std::thread(&SDRThread::threadMain, sdrThread);
|
||||||
sdrEnum = new SDREnumerator();
|
sdrEnum = new SDREnumerator();
|
||||||
|
|
||||||
t_SDREnum = new std::thread(&SDREnumerator::threadMain, sdrEnum);
|
|
||||||
|
|
||||||
appframe = new AppFrame();
|
appframe = new AppFrame();
|
||||||
|
t_SDREnum = new std::thread(&SDREnumerator::threadMain, sdrEnum);
|
||||||
|
|
||||||
//#ifdef __APPLE__
|
//#ifdef __APPLE__
|
||||||
// int main_policy;
|
// int main_policy;
|
||||||
@ -499,3 +499,7 @@ std::string CubicSDR::getNotification() {
|
|||||||
void CubicSDR::setDeviceSelectorClosed() {
|
void CubicSDR::setDeviceSelectorClosed() {
|
||||||
deviceSelectorOpen.store(false);
|
deviceSelectorOpen.store(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CubicSDR::isDeviceSelectorOpen() {
|
||||||
|
return deviceSelectorOpen.load();
|
||||||
|
}
|
||||||
|
@ -100,6 +100,7 @@ public:
|
|||||||
void removeRemote(std::string remoteAddr);
|
void removeRemote(std::string remoteAddr);
|
||||||
|
|
||||||
void setDeviceSelectorClosed();
|
void setDeviceSelectorClosed();
|
||||||
|
bool isDeviceSelectorOpen();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
AppFrame *appframe;
|
AppFrame *appframe;
|
||||||
|
Loading…
Reference in New Issue
Block a user