comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-11-03 13:10:27 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #484 from vsonnier/fixes_on_021alpha_bookmark1

Browse Source 
FIX: wrong directive placement prevent building without HAMLIB
This commit is contained in:
Charles J. Cliffe 2017-01-03 17:36:00 -05:00 committed by GitHub
commit 4919988c7c
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/AppConfig.h
View File

@ -179,9 +179,10 @@ private:
std::atomic<float> spectrumAvgSpeed, mainSplit, visSplit, bookmarkSplit; std::atomic<float> spectrumAvgSpeed, mainSplit, visSplit, bookmarkSplit;
std::atomic_int dbOffset; std::atomic_int dbOffset;
std::vector<SDRManualDef> manualDevices; std::vector<SDRManualDef> manualDevices;
std::atomic_bool bookmarksVisible;
#if USE_HAMLIB #if USE_HAMLIB
std::atomic_int rigModel, rigRate; std::atomic_int rigModel, rigRate;
std::string rigPort; std::string rigPort;
std::atomic_bool rigEnabled, rigFollowMode, rigControlMode, rigCenterLock, rigFollowModem, bookmarksVisible; std::atomic_bool rigEnabled, rigFollowMode, rigControlMode, rigCenterLock, rigFollowModem;
#endif #endif
}; };

6
src/AppFrame.h
View File

@ -189,6 +189,9 @@ private:
bool lowPerfMode; bool lowPerfMode;
wxMenuItem *hideBookmarksItem;
bool saveDisabled;
#ifdef USE_HAMLIB #ifdef USE_HAMLIB
void enableRig(); void enableRig();
void disableRig(); void disableRig();
@ -201,7 +204,7 @@ private:
wxMenuItem *rigCenterLockMenuItem; wxMenuItem *rigCenterLockMenuItem;
wxMenuItem *rigFollowModemMenuItem; wxMenuItem *rigFollowModemMenuItem;
wxMenuItem *sdrIFMenuItem; wxMenuItem *sdrIFMenuItem;
wxMenuItem *hideBookmarksItem;
std::map<int, wxMenuItem *> rigSerialMenuItems; std::map<int, wxMenuItem *> rigSerialMenuItems;
std::map<int, wxMenuItem *> rigModelMenuItems; std::map<int, wxMenuItem *> rigModelMenuItems;
int rigModel; int rigModel;
@ -211,7 +214,6 @@ private:
std::string rigPort; std::string rigPort;
int numRigs; int numRigs;
bool rigInit; bool rigInit;
bool saveDisabled;
#endif #endif
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();

1
src/demod/DemodulatorMgr.cpp
View File

@ -9,6 +9,7 @@
#include <algorithm> #include <algorithm>
#include "DemodulatorMgr.h" #include "DemodulatorMgr.h"
#include "CubicSDR.h"
#if USE_HAMLIB #if USE_HAMLIB
#include "RigThread.h" #include "RigThread.h"