diff --git a/.travis.yml b/.travis.yml index f0f86dd..fc0e343 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ addons: - freeglut3-dev - libhamlib-dev script: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install hamlib; done + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install hamlib; fi - bash travis-ci/build_liquiddsp.sh - bash travis-ci/build_soapysdr.sh - bash travis-ci/build_wxwidgets.sh diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp index 0248d64..a89a70a 100644 --- a/src/AppFrame.cpp +++ b/src/AppFrame.cpp @@ -2405,7 +2405,7 @@ void AppFrame::OnUnSplit(wxSplitterEvent& event) event.Veto(); } -void AppFrame::OnAboutDialogClose(wxCommandEvent& event) { +void AppFrame::OnAboutDialogClose(wxCommandEvent& /* event */) { aboutDlg->Destroy(); aboutDlg = nullptr; } diff --git a/src/ModemProperties.cpp b/src/ModemProperties.cpp index 4fa02df..1c2c8c0 100644 --- a/src/ModemProperties.cpp +++ b/src/ModemProperties.cpp @@ -73,17 +73,17 @@ void ModemProperties::initDefaultProperties() { i++; } - int defaultDevice = 0; - int dc = 0; + // int defaultDevice = 0; + // int dc = 0; for (auto mdevices_i : audioOutputDevices) { outputOpts.push_back(std::to_string(mdevices_i.first)); outputOptNames.push_back(mdevices_i.second.name); - if (mdevices_i.second.isDefaultOutput) { - defaultDevice = dc; - } - dc++; + // if (mdevices_i.second.isDefaultOutput) { + // defaultDevice = dc; + // } + // dc++; } outputArg.key ="._audio_output"; @@ -261,11 +261,11 @@ void ModemProperties::OnChange(wxPropertyGridEvent &event) { } } -void ModemProperties::OnCollapse(wxPropertyGridEvent &event) { +void ModemProperties::OnCollapse(wxPropertyGridEvent & /* event */) { collapsed = true; } -void ModemProperties::OnExpand(wxPropertyGridEvent &event) { +void ModemProperties::OnExpand(wxPropertyGridEvent &/* event */) { collapsed = false; } diff --git a/src/audio/AudioSinkFileThread.cpp b/src/audio/AudioSinkFileThread.cpp index e49b57b..d8953d9 100644 --- a/src/audio/AudioSinkFileThread.cpp +++ b/src/audio/AudioSinkFileThread.cpp @@ -75,7 +75,7 @@ void AudioSinkFileThread::sink(AudioThreadInputPtr input) { audioFileHandler->writeToFile(input); } -void AudioSinkFileThread::inputChanged(AudioThreadInput oldProps, AudioThreadInputPtr newProps) { +void AudioSinkFileThread::inputChanged(AudioThreadInput /* oldProps */, AudioThreadInputPtr /* newProps */) { // close, set new parameters, adjust file name sequence and re-open? if (!audioFileHandler) { return; diff --git a/src/forms/Bookmark/BookmarkView.cpp b/src/forms/Bookmark/BookmarkView.cpp index 7933c26..8c5dbdb 100644 --- a/src/forms/Bookmark/BookmarkView.cpp +++ b/src/forms/Bookmark/BookmarkView.cpp @@ -689,7 +689,7 @@ void BookmarkView::refreshLayout() { } -wxButton *BookmarkView::makeButton(wxWindow *parent, std::string labelVal, wxObjectEventFunction handler) { +wxButton *BookmarkView::makeButton(wxWindow * /* parent */, std::string labelVal, wxObjectEventFunction handler) { wxButton *nButton = new wxButton( m_buttonPanel, wxID_ANY, labelVal); nButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, handler, nullptr, this); @@ -1553,7 +1553,7 @@ void BookmarkView::onSearchTextFocus( wxMouseEvent& event ) { } -void BookmarkView::onSearchText( wxCommandEvent& event ) { +void BookmarkView::onSearchText( wxCommandEvent& /* event */ ) { std::wstring searchText = m_searchText->GetValue().Trim().Lower().ToStdWstring(); diff --git a/src/forms/Dialog/ActionDialog.cpp b/src/forms/Dialog/ActionDialog.cpp index b4745e5..0f27ae3 100644 --- a/src/forms/Dialog/ActionDialog.cpp +++ b/src/forms/Dialog/ActionDialog.cpp @@ -36,7 +36,7 @@ void ActionDialog::setActiveDialog(ActionDialog *dlg) { } -void ActionDialog::onClickCancel( wxCommandEvent& event ) { +void ActionDialog::onClickCancel( wxCommandEvent& /* event */ ) { ActionDialog *dlg = activeDialog; ActionDialog::setActiveDialog(nullptr); dlg->EndModal(0); @@ -45,7 +45,7 @@ void ActionDialog::onClickCancel( wxCommandEvent& event ) { } -void ActionDialog::onClickOK( wxCommandEvent& event ) { +void ActionDialog::onClickOK( wxCommandEvent& /* event */ ) { ActionDialog *dlg = activeDialog; ActionDialog::setActiveDialog(nullptr); dlg->EndModal(0); diff --git a/src/forms/Dialog/PortSelectorDialog.cpp b/src/forms/Dialog/PortSelectorDialog.cpp index 74d31ab..73cad81 100644 --- a/src/forms/Dialog/PortSelectorDialog.cpp +++ b/src/forms/Dialog/PortSelectorDialog.cpp @@ -21,7 +21,7 @@ PortSelectorDialog::PortSelectorDialog( wxWindow* parent, wxWindowID id, std::st m_portSelection->SetValue(defaultPort); } -void PortSelectorDialog::onListSelect( wxCommandEvent& event ) { +void PortSelectorDialog::onListSelect( wxCommandEvent& /* event */ ) { int pSelect = m_portList->GetSelection(); if (pSelect != -1) { m_portSelection->SetValue(m_portList->GetString(pSelect)); @@ -29,11 +29,11 @@ void PortSelectorDialog::onListSelect( wxCommandEvent& event ) { } -void PortSelectorDialog::onCancelButton( wxCommandEvent& event ) { +void PortSelectorDialog::onCancelButton( wxCommandEvent& /* event */ ) { wxGetApp().getAppFrame()->dismissRigControlPortDialog(); } -void PortSelectorDialog::onOKButton( wxCommandEvent& event ) { +void PortSelectorDialog::onOKButton( wxCommandEvent& /* event */ ) { wxGetApp().getAppFrame()->setRigControlPort(m_portSelection->GetValue().ToStdString()); } diff --git a/src/forms/DigitalConsole/DigitalConsole.cpp b/src/forms/DigitalConsole/DigitalConsole.cpp index 8238335..cc73bb5 100644 --- a/src/forms/DigitalConsole/DigitalConsole.cpp +++ b/src/forms/DigitalConsole/DigitalConsole.cpp @@ -14,16 +14,16 @@ DigitalConsole::~DigitalConsole() { doParent->setDialog(nullptr); } -void DigitalConsole::OnClose( wxCloseEvent& event ) { +void DigitalConsole::OnClose( wxCloseEvent& /* event */ ) { doParent->setDialog(nullptr); } -void DigitalConsole::OnCopy( wxCommandEvent& event ) { +void DigitalConsole::OnCopy( wxCommandEvent& /* event */ ) { m_dataView->SelectAll(); m_dataView->Copy(); } -void DigitalConsole::OnPause( wxCommandEvent& event ) { +void DigitalConsole::OnPause( wxCommandEvent& /* event */ ) { if (streamPaused.load()) { m_pauseButton->SetLabel("Stop"); streamPaused.store(false); @@ -37,7 +37,7 @@ void DoRefresh( wxTimerEvent& event ) { event.Skip(); } -void DigitalConsole::DoRefresh( wxTimerEvent& event ) { +void DigitalConsole::DoRefresh( wxTimerEvent& /* event */ ) { if (streamWritten.load()) { stream_busy.lock(); m_dataView->AppendText(streamBuf.str()); @@ -47,7 +47,7 @@ void DigitalConsole::DoRefresh( wxTimerEvent& event ) { } } -void DigitalConsole::OnClear( wxCommandEvent& event ) { +void DigitalConsole::OnClear( wxCommandEvent& /* event */ ) { m_dataView->Clear(); } diff --git a/src/modules/modem/digital/ModemAPSK.cpp b/src/modules/modem/digital/ModemAPSK.cpp index 2533e91..997756a 100644 --- a/src/modules/modem/digital/ModemAPSK.cpp +++ b/src/modules/modem/digital/ModemAPSK.cpp @@ -97,7 +97,7 @@ void ModemAPSK::updateDemodulatorCons(int cons) { } } -void ModemAPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { +void ModemAPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodAPSK, input); diff --git a/src/modules/modem/digital/ModemASK.cpp b/src/modules/modem/digital/ModemASK.cpp index 766eec9..d0b494c 100644 --- a/src/modules/modem/digital/ModemASK.cpp +++ b/src/modules/modem/digital/ModemASK.cpp @@ -102,7 +102,7 @@ void ModemASK::updateDemodulatorCons(int cons) { } } -void ModemASK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { +void ModemASK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodASK, input); diff --git a/src/modules/modem/digital/ModemBPSK.cpp b/src/modules/modem/digital/ModemBPSK.cpp index eef810c..cd7cbca 100644 --- a/src/modules/modem/digital/ModemBPSK.cpp +++ b/src/modules/modem/digital/ModemBPSK.cpp @@ -19,7 +19,7 @@ std::string ModemBPSK::getName() { return "BPSK"; } -void ModemBPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { +void ModemBPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodBPSK, input); diff --git a/src/modules/modem/digital/ModemDPSK.cpp b/src/modules/modem/digital/ModemDPSK.cpp index f8dbbaa..38f43ed 100644 --- a/src/modules/modem/digital/ModemDPSK.cpp +++ b/src/modules/modem/digital/ModemDPSK.cpp @@ -103,7 +103,7 @@ void ModemDPSK::updateDemodulatorCons(int cons) { } } -void ModemDPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { +void ModemDPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodDPSK, input); diff --git a/src/modules/modem/digital/ModemFSK.cpp b/src/modules/modem/digital/ModemFSK.cpp index d152a8e..37c6816 100644 --- a/src/modules/modem/digital/ModemFSK.cpp +++ b/src/modules/modem/digital/ModemFSK.cpp @@ -128,7 +128,7 @@ ModemFSK::~ModemFSK() { } -void ModemFSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { +void ModemFSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { ModemKitFSK *dkit = (ModemKitFSK *)kit; digitalStart(dkit, nullptr, input); diff --git a/src/modules/modem/digital/ModemGMSK.cpp b/src/modules/modem/digital/ModemGMSK.cpp index c1a79fb..b94932d 100644 --- a/src/modules/modem/digital/ModemGMSK.cpp +++ b/src/modules/modem/digital/ModemGMSK.cpp @@ -23,7 +23,7 @@ ModemBase *ModemGMSK::factory() { return new ModemGMSK; } -int ModemGMSK::checkSampleRate(long long sampleRate, int audioSampleRate) { +int ModemGMSK::checkSampleRate(long long sampleRate, int /* audioSampleRate */) { if (sampleRate < MIN_BANDWIDTH) { return MIN_BANDWIDTH; } @@ -115,7 +115,7 @@ void ModemGMSK::disposeKit(ModemKit *kit) { delete dkit; } -void ModemGMSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { +void ModemGMSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { ModemKitGMSK *dkit = (ModemKitGMSK *)kit; unsigned int sym_out; diff --git a/src/modules/modem/digital/ModemOOK.cpp b/src/modules/modem/digital/ModemOOK.cpp index fce95a6..2366a42 100644 --- a/src/modules/modem/digital/ModemOOK.cpp +++ b/src/modules/modem/digital/ModemOOK.cpp @@ -19,14 +19,14 @@ ModemBase *ModemOOK::factory() { return new ModemOOK; } -int ModemOOK::checkSampleRate(long long sampleRate, int audioSampleRate) { +int ModemOOK::checkSampleRate(long long sampleRate, int /* audioSampleRate */) { if (sampleRate < 100) { return 100; } return (int)sampleRate; } -void ModemOOK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { +void ModemOOK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodOOK, input); diff --git a/src/modules/modem/digital/ModemPSK.cpp b/src/modules/modem/digital/ModemPSK.cpp index 05ac291..c2e99a1 100644 --- a/src/modules/modem/digital/ModemPSK.cpp +++ b/src/modules/modem/digital/ModemPSK.cpp @@ -104,7 +104,7 @@ void ModemPSK::updateDemodulatorCons(int cons) { } } -void ModemPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { +void ModemPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodPSK, input); diff --git a/src/modules/modem/digital/ModemQAM.cpp b/src/modules/modem/digital/ModemQAM.cpp index e2c500d..e516e70 100644 --- a/src/modules/modem/digital/ModemQAM.cpp +++ b/src/modules/modem/digital/ModemQAM.cpp @@ -97,7 +97,7 @@ void ModemQAM::updateDemodulatorCons(int cons) { } } -void ModemQAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { +void ModemQAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodQAM, input); diff --git a/src/modules/modem/digital/ModemQPSK.cpp b/src/modules/modem/digital/ModemQPSK.cpp index 2b35994..c9e805c 100644 --- a/src/modules/modem/digital/ModemQPSK.cpp +++ b/src/modules/modem/digital/ModemQPSK.cpp @@ -19,7 +19,7 @@ std::string ModemQPSK::getName() { return "QPSK"; } -void ModemQPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { +void ModemQPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodQPSK, input); diff --git a/src/modules/modem/digital/ModemSQAM.cpp b/src/modules/modem/digital/ModemSQAM.cpp index 20dc445..a6f255c 100644 --- a/src/modules/modem/digital/ModemSQAM.cpp +++ b/src/modules/modem/digital/ModemSQAM.cpp @@ -67,7 +67,7 @@ void ModemSQAM::updateDemodulatorCons(int cons) { } } -void ModemSQAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { +void ModemSQAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodSQAM, input); diff --git a/src/modules/modem/digital/ModemST.cpp b/src/modules/modem/digital/ModemST.cpp index 409a1a7..2285e86 100644 --- a/src/modules/modem/digital/ModemST.cpp +++ b/src/modules/modem/digital/ModemST.cpp @@ -19,7 +19,7 @@ ModemST::~ModemST() { modem_destroy(demodST); } -void ModemST::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { +void ModemST::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodST, input); diff --git a/src/rig/RigThread.cpp b/src/rig/RigThread.cpp index 29ba0aa..6d082df 100644 --- a/src/rig/RigThread.cpp +++ b/src/rig/RigThread.cpp @@ -32,7 +32,7 @@ RigList &RigThread::enumerate() { return RigThread::rigCaps; } -int RigThread::add_hamlib_rig(const struct rig_caps *rc, void* f) +int RigThread::add_hamlib_rig(const struct rig_caps *rc, void* /* f */) { rigCaps.push_back(rc); return 1; diff --git a/src/visual/ImagePanel.cpp b/src/visual/ImagePanel.cpp index b67e62e..041220c 100644 --- a/src/visual/ImagePanel.cpp +++ b/src/visual/ImagePanel.cpp @@ -10,7 +10,7 @@ ImagePanel::ImagePanel(wxPanel * parent, wxString file, wxBitmapType format) : image.LoadFile(file, format); } -void ImagePanel::paintEvent(wxPaintEvent & evt) { +void ImagePanel::paintEvent(wxPaintEvent & /* evt */) { wxPaintDC dc(this); render(dc); } diff --git a/src/visual/TuningCanvas.cpp b/src/visual/TuningCanvas.cpp index b250238..4303524 100644 --- a/src/visual/TuningCanvas.cpp +++ b/src/visual/TuningCanvas.cpp @@ -250,7 +250,7 @@ void TuningCanvas::StepTuner(ActiveState state, int exponent, bool up) { } } -void TuningCanvas::OnIdle(wxIdleEvent &event) { +void TuningCanvas::OnIdle(wxIdleEvent & /* event */) { if (mouseTracker.mouseDown()) { if (downState != TUNING_HOVER_NONE) { dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX(); diff --git a/src/visual/WaterfallCanvas.cpp b/src/visual/WaterfallCanvas.cpp index 515d3cf..6f7cfe0 100644 --- a/src/visual/WaterfallCanvas.cpp +++ b/src/visual/WaterfallCanvas.cpp @@ -483,7 +483,7 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) { } } -void WaterfallCanvas::OnIdle(wxIdleEvent &event) { +void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) { processInputQueue(); Refresh(); }