Additional warning fixes; run brew update before brew install for hamlib
This commit is contained in:
parent
e75387c25d
commit
c57a123130
|
@ -12,6 +12,7 @@ addons:
|
|||
- freeglut3-dev
|
||||
- libhamlib-dev
|
||||
script:
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install hamlib; fi
|
||||
- bash travis-ci/build_liquiddsp.sh
|
||||
- bash travis-ci/build_soapysdr.sh
|
||||
|
|
|
@ -1301,7 +1301,9 @@ bool AppFrame::actionOnMenuAbout(wxCommandEvent& event) {
|
|||
|
||||
bool AppFrame::actionOnMenuSettings(wxCommandEvent& event) {
|
||||
|
||||
if (event.GetId() >= wxID_ANTENNAS_BASE && event.GetId() < wxID_ANTENNAS_BASE + antennaNames.size()) {
|
||||
int antennaIdMax = wxID_ANTENNAS_BASE + antennaNames.size();
|
||||
|
||||
if (event.GetId() >= wxID_ANTENNAS_BASE && event.GetId() < antennaIdMax) {
|
||||
|
||||
wxGetApp().setAntennaName(antennaNames[event.GetId() - wxID_ANTENNAS_BASE]);
|
||||
|
||||
|
@ -1720,7 +1722,9 @@ bool AppFrame::actionOnMenuRig(wxCommandEvent& event) {
|
|||
bManaged = true;
|
||||
}
|
||||
|
||||
if (event.GetId() >= wxID_RIG_SERIAL_BASE && event.GetId() < wxID_RIG_SERIAL_BASE + rigSerialRates.size()) {
|
||||
int rigSerialIdMax = wxID_RIG_SERIAL_BASE + rigSerialRates.size();
|
||||
|
||||
if (event.GetId() >= wxID_RIG_SERIAL_BASE && event.GetId() < rigSerialIdMax) {
|
||||
int serialIdx = event.GetId() - wxID_RIG_SERIAL_BASE;
|
||||
rigSerialRate = rigSerialRates[serialIdx];
|
||||
resetRig = true;
|
||||
|
|
|
@ -498,8 +498,9 @@ std::string SDRDevicesDialog::getSelectedChoiceOption(wxPGProperty* prop, const
|
|||
int choiceIndex = prop->GetChoiceSelection();
|
||||
|
||||
if (arg.options.size() > 0) {
|
||||
|
||||
if (choiceIndex >= 0 && choiceIndex < arg.options.size()) {
|
||||
int choiceMax = arg.options.size();
|
||||
|
||||
if (choiceIndex >= 0 && choiceIndex < choiceMax) {
|
||||
//normal selection
|
||||
optionName = arg.options[choiceIndex];
|
||||
} else {
|
||||
|
|
|
@ -16,7 +16,7 @@ ModemBase *ModemFSK::factory() {
|
|||
return new ModemFSK;
|
||||
}
|
||||
|
||||
int ModemFSK::checkSampleRate(long long sampleRate, int audioSampleRate) {
|
||||
int ModemFSK::checkSampleRate(long long sampleRate, int /* audioSampleRate */) {
|
||||
double minSps = pow(2.0,bps);
|
||||
double nextSps = (double(sampleRate) / double(sps));
|
||||
if (nextSps < minSps) {
|
||||
|
|
|
@ -286,7 +286,7 @@ void SpectrumVisualProcessor::process() {
|
|||
return;
|
||||
}
|
||||
|
||||
while (resampleBw / SPECTRUM_VZM >= bandwidth) {
|
||||
while (resampleBw / SPECTRUM_VZM >= (long) bandwidth) {
|
||||
resampleBw /= SPECTRUM_VZM;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue