Add volume controls for mic in/speaker out

src/CMakeLists.txt

@@ -36,12 +36,17 @@ set(FREEDV_SOURCES
     sox/effects.c
     sox/effects.h
     sox/effects_i.c
+    sox/effects_i_dsp.c
+    sox/fft4g.c
+    sox/formats.c
     sox/formats_i.c
     sox/libsox.c
     sox/sox.h
     sox/sox_i.h
     sox/soxomp.h
+    sox/util.c
     sox/util.h
+    sox/vol.c
     sox/xmalloc.h
     sox/xmalloc.c
     topFrame.h

src/dlg_filter.h

@@ -24,9 +24,10 @@
 
 #include "main.h"
 
-enum {disableQ = false, enableQ = true};
+enum {disableQ = false, enableQ = true, disableFreq = false, enableFreq = true};
 
 typedef struct { 
+    wxStaticBox  *eqBox;
     wxSlider     *sliderFreq;
     wxStaticText *valueFreq;
     wxSlider     *sliderGain;
@@ -45,24 +46,6 @@ typedef struct {
     float     maxFreqHz;
 } EQ;
 
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
-// Class AuiNotebookNoKbd
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
-class AuiNotebookNoKbd : public wxNotebook
-{
-    // This class inherits from wxNotebook, and the only difference between
-    // it and the wx notebook is functionality to ignore tabbing to it.  This 
-    // is a control with no user input, thus blind hams have no reason to tab
-    // to it.
-public: 
-
-    AuiNotebookNoKbd(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition,
-                     const wxSize &size=wxDefaultSize, long style=0) : 
-                     wxNotebook(parent, id, pos, size, style) {;}
-
-    bool AcceptsFocusFromKeyboard() const { return false; }
-};
-
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
 // Class FilterDlg
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
@@ -72,14 +55,13 @@ class FilterDlg : public wxDialog
     FilterDlg( wxWindow* parent, bool running, bool *newMicInFilter, bool *newSpkOutFilter,
                wxWindowID id = wxID_ANY, const wxString& title = _("Filter"), 
                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-               long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+               long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER );
         ~FilterDlg();
 
-        void    ExchangeData(int inout, bool storePersistent);
+        void    ExchangeData(int inout);
 
     protected:
         // Handlers for events.
-        void    OnCancel(wxCommandEvent& event);
         void    OnOK(wxCommandEvent& event);
         void    OnClose(wxCloseEvent& event);
         void    OnInitDialog(wxInitDialogEvent& event);
@@ -100,6 +82,8 @@ class FilterDlg : public wxDialog
         void    OnMicInMidFreqScroll(wxScrollEvent& event) { sliderToFreq(&m_MicInMid, true); }
         void    OnMicInMidGainScroll(wxScrollEvent& event) { sliderToGain(&m_MicInMid, true); }
         void    OnMicInMidQScroll(wxScrollEvent& event) { sliderToQ(&m_MicInMid, true); }
+        void    OnMicInVolGainScroll(wxScrollEvent& event) { sliderToGain(&m_MicInVol, true); }
+
         void    OnMicInEnable(wxScrollEvent& event);
         void    OnMicInDefault(wxCommandEvent& event);
 
@@ -110,6 +94,8 @@ class FilterDlg : public wxDialog
         void    OnSpkOutMidFreqScroll(wxScrollEvent& event) { sliderToFreq(&m_SpkOutMid, false); }
         void    OnSpkOutMidGainScroll(wxScrollEvent& event) { sliderToGain(&m_SpkOutMid, false); }
         void    OnSpkOutMidQScroll(wxScrollEvent& event) { sliderToQ(&m_SpkOutMid, false); }
+        void    OnSpkOutVolGainScroll(wxScrollEvent& event) { sliderToGain(&m_SpkOutVol, false); }
+
         void    OnSpkOutEnable(wxScrollEvent& event);
         void    OnSpkOutDefault(wxCommandEvent& event);
 
@@ -130,7 +116,6 @@ class FilterDlg : public wxDialog
 
         wxStdDialogButtonSizer* m_sdbSizer5;
         wxButton*     m_sdbSizer5OK;
-        wxButton*     m_sdbSizer5Cancel;
         PlotSpectrum* m_MicInFreqRespPlot;
         PlotSpectrum* m_SpkOutFreqRespPlot;
 
@@ -151,17 +136,17 @@ class FilterDlg : public wxDialog
         void          setGamma(void); // sets slider and static text from m_gamma
         void          setCodec2(void);
 
-        void          newEQControl(wxSlider** slider, wxStaticText** value, wxStaticBoxSizer *bs, wxString controlName);
-        EQ            newEQ(wxSizer *bs, wxString eqName, float maxFreqHz, bool enableQ);
-        void          newLPCPFControl(wxSlider **slider, wxStaticText **stValue, wxSizer *sbs, wxString controlName);
-        AuiNotebookNoKbd *m_auiNotebook;
+        void          newEQControl(wxWindow* parent, wxSlider** slider, wxStaticText** value, wxSizer *sizer, wxString controlName);
+        EQ            newEQ(wxWindow* parent, wxSizer *bs, wxString eqName, float maxFreqHz, bool enableQ, bool enableFreq);
+        void          newLPCPFControl(wxSlider **slider, wxStaticText **stValue, wxWindow* parent, wxSizer *sbs, wxString controlName);
+        wxNotebook    *m_auiNotebook;
         void          setFreq(EQ *eq);
         void          setGain(EQ *eq);
         void          setQ(EQ *eq);
         void          sliderToFreq(EQ *eq, bool micIn);
         void          sliderToGain(EQ *eq, bool micIn);
         void          sliderToQ(EQ *eq, bool micIn);
-        void          plotFilterSpectrum(EQ *eqBass, EQ *eqMid, EQ* eqTreble, PlotSpectrum* freqRespPlot, float *magdB);
+        void          plotFilterSpectrum(EQ *eqBass, EQ *eqMid, EQ* eqTreble, EQ* eqVol, PlotSpectrum* freqRespPlot, float *magdB);
         void          calcFilterSpectrum(float magdB[], int arc, char *argv[]);
         void          plotMicInFilterSpectrum(void);
         void          plotSpkOutFilterSpectrum(void);
@@ -171,10 +156,12 @@ class FilterDlg : public wxDialog
         EQ            m_MicInBass;
         EQ            m_MicInMid;
         EQ            m_MicInTreble;
+        EQ            m_MicInVol;
 
         EQ            m_SpkOutBass;
         EQ            m_SpkOutMid;
         EQ            m_SpkOutTreble;
+        EQ            m_SpkOutVol;
 
         float         limit(float value, float min, float max);
 

src/eq.cpp

@@ -12,12 +12,12 @@ void *MainFrame::designAnEQFilter(const char filterType[], float freqHz, float g
 {
     char  *arg[SBQ_MAX_ARGS];
     char   argstorage[SBQ_MAX_ARGS][80];
-    void  *sbq;
     int    i, argc;
 
     assert((strcmp(filterType, "bass") == 0)   ||
            (strcmp(filterType, "treble") == 0) ||
-           (strcmp(filterType, "equalizer") == 0));
+           (strcmp(filterType, "equalizer") == 0) ||
+           (strcmp(filterType, "vol") == 0));
 
     for(i=0; i<SBQ_MAX_ARGS; i++) {
         arg[i] = &argstorage[i][0];
@@ -39,13 +39,19 @@ void *MainFrame::designAnEQFilter(const char filterType[], float freqHz, float g
         sprintf(arg[argc++], "%f", gaindB+1E-6);
         sprintf(arg[argc++], "%d", sampleRate);
     }
+
+    if (strcmp(filterType, "vol") == 0)
+    {
+        sprintf(arg[argc++], "%s", filterType);
+        sprintf(arg[argc++], "%f", gaindB);
+        sprintf(arg[argc++], "%s", "dB");
+        sprintf(arg[argc++], "%f", 0.05); // to prevent clipping
+        sprintf(arg[argc++], "%d", sampleRate);
+    }
 
     assert(argc <= SBQ_MAX_ARGS);
     // Note - the argc count doesn't include the command!
-    sbq = sox_biquad_create(argc-1, (const char **)arg);
-    assert(sbq != NULL);
-
-    return sbq;
+    return sox_biquad_create(argc-1, (const char **)arg);
 }
 
 void  MainFrame::designEQFilters(paCallBackData *cb, int rxSampleRate, int txSampleRate)
@@ -57,6 +63,10 @@ void  MainFrame::designEQFilters(paCallBackData *cb, int rxSampleRate, int txSam
         cb->sbqMicInBass   = designAnEQFilter("bass", wxGetApp().m_MicInBassFreqHz, wxGetApp().m_MicInBassGaindB, txSampleRate);
         cb->sbqMicInTreble = designAnEQFilter("treble", wxGetApp().m_MicInTrebleFreqHz, wxGetApp().m_MicInTrebleGaindB, txSampleRate);
         cb->sbqMicInMid    = designAnEQFilter("equalizer", wxGetApp().m_MicInMidFreqHz, wxGetApp().m_MicInMidGaindB, wxGetApp().m_MicInMidQ, txSampleRate);
+        cb->sbqMicInVol    = designAnEQFilter("vol", 0, wxGetApp().m_MicInVolInDB, 0, txSampleRate);
+
+        // Note: vol can be a no-op!
+        assert(cb->sbqMicInBass != nullptr && cb->sbqMicInTreble != nullptr && cb->sbqMicInMid != nullptr);
     }
 
     // init Spk Out Equaliser Filters
@@ -68,6 +78,10 @@ void  MainFrame::designEQFilters(paCallBackData *cb, int rxSampleRate, int txSam
         cb->sbqSpkOutBass   = designAnEQFilter("bass", wxGetApp().m_SpkOutBassFreqHz, wxGetApp().m_SpkOutBassGaindB, rxSampleRate);
         cb->sbqSpkOutTreble = designAnEQFilter("treble", wxGetApp().m_SpkOutTrebleFreqHz, wxGetApp().m_SpkOutTrebleGaindB, rxSampleRate);
         cb->sbqSpkOutMid    = designAnEQFilter("equalizer", wxGetApp().m_SpkOutMidFreqHz, wxGetApp().m_SpkOutMidGaindB, wxGetApp().m_SpkOutMidQ, rxSampleRate);
+        cb->sbqSpkOutVol    = designAnEQFilter("vol", 0, wxGetApp().m_SpkOutVolInDB, 0, txSampleRate);
+
+        // Note: vol can be a no-op!
+        assert(cb->sbqSpkOutBass != nullptr && cb->sbqSpkOutTreble != nullptr && cb->sbqSpkOutMid != nullptr);
     }
 
     m_newMicInFilter = false;
@@ -84,9 +98,12 @@ void  MainFrame::deleteEQFilters(paCallBackData *cb)
         sox_biquad_destroy(cb->sbqMicInTreble);
         sox_biquad_destroy(cb->sbqMicInMid);
 
+        if (cb->sbqMicInVol) sox_biquad_destroy(cb->sbqMicInVol);
+
         cb->sbqMicInBass = nullptr;
         cb->sbqMicInTreble = nullptr;
         cb->sbqMicInMid = nullptr;
+        cb->sbqMicInVol = nullptr;
     }
 
     if (m_newSpkOutFilter) 
@@ -96,10 +113,13 @@ void  MainFrame::deleteEQFilters(paCallBackData *cb)
         sox_biquad_destroy(cb->sbqSpkOutBass);    
         sox_biquad_destroy(cb->sbqSpkOutTreble);
         sox_biquad_destroy(cb->sbqSpkOutMid);
+
+        if (cb->sbqSpkOutVol) sox_biquad_destroy(cb->sbqSpkOutVol);
 
         cb->sbqSpkOutBass = nullptr;
         cb->sbqSpkOutTreble = nullptr;
         cb->sbqSpkOutMid = nullptr;
+        cb->sbqSpkOutVol = nullptr;
     }
 }
 

src/main.cpp

@@ -372,6 +372,7 @@ void MainFrame::loadConfiguration_()
     wxGetApp().m_MicInMidFreqHz = (float)pConfig->Read(wxT("/Filter/MicInMidFreqHz"),    1);
     wxGetApp().m_MicInMidGaindB = (float)pConfig->Read(wxT("/Filter/MicInMidGaindB"),    (long)0)/10.0;
     wxGetApp().m_MicInMidQ = (float)pConfig->Read(wxT("/Filter/MicInMidQ"),              (long)100)/100.0;
+    wxGetApp().m_MicInVolInDB = (float)pConfig->Read(wxT("/Filter/MicInVolInDB"),    (long)0)/10.0;
 
     bool f = false;
     wxGetApp().m_MicInEQEnable = (float)pConfig->Read(wxT("/Filter/MicInEQEnable"), f);
@@ -383,6 +384,7 @@ void MainFrame::loadConfiguration_()
     wxGetApp().m_SpkOutMidFreqHz = (float)pConfig->Read(wxT("/Filter/SpkOutMidFreqHz"),    1);
     wxGetApp().m_SpkOutMidGaindB = (float)pConfig->Read(wxT("/Filter/SpkOutMidGaindB"),    (long)0)/10.0;
     wxGetApp().m_SpkOutMidQ = (float)pConfig->Read(wxT("/Filter/SpkOutMidQ"),                (long)100)/100.0;
+    wxGetApp().m_SpkOutVolInDB = (float)pConfig->Read(wxT("/Filter/SpkOutVolInDB"),    (long)0)/10.0;
 
     wxGetApp().m_SpkOutEQEnable = (float)pConfig->Read(wxT("/Filter/SpkOutEQEnable"), f);
 
@@ -650,6 +652,11 @@ MainFrame::~MainFrame()
     int w;
     int h;
 
+    if (m_filterDialog != nullptr)
+    {
+        m_filterDialog->Close();
+    }
+
     //fprintf(stderr, "MainFrame::~MainFrame()\n");
     #ifdef FTEST
     fclose(ftest);
@@ -2645,6 +2652,7 @@ void txRxProcessing()
             sox_biquad_filter(cbData->sbqSpkOutBass,   outfreedv, outfreedv, speechOutbufferSize);
             sox_biquad_filter(cbData->sbqSpkOutTreble, outfreedv, outfreedv, speechOutbufferSize);
             sox_biquad_filter(cbData->sbqSpkOutMid,    outfreedv, outfreedv, speechOutbufferSize);
+            if (cbData->sbqSpkOutVol) sox_biquad_filter(cbData->sbqSpkOutVol,    outfreedv, outfreedv, speechOutbufferSize);
         }
         g_mutexProtectingCallbackData.Unlock();
 
@@ -2749,6 +2757,7 @@ void txRxProcessing()
                 sox_biquad_filter(cbData->sbqMicInBass, infreedv, infreedv, nout);
                 sox_biquad_filter(cbData->sbqMicInTreble, infreedv, infreedv, nout);
                 sox_biquad_filter(cbData->sbqMicInMid, infreedv, infreedv, nout);
+                if (cbData->sbqMicInVol) sox_biquad_filter(cbData->sbqMicInVol, infreedv, infreedv, nout);
             }
             g_mutexProtectingCallbackData.Unlock();
 

src/main.h

@@ -149,6 +149,7 @@ extern int                 g_soundCard2SampleRate;
 #define DS_SYNC_WAIT_TIME 5.0
 
 class MainFrame;
+class FilterDlg;
 
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
 // Class MainApp
@@ -254,6 +255,7 @@ class MainApp : public wxApp
         float               m_MicInMidGaindB;
         float               m_MicInMidQ;
         bool                m_MicInEQEnable;
+        float               m_MicInVolInDB;
 
         // Spk Out Equaliser
         float               m_SpkOutBassFreqHz;
@@ -264,6 +266,7 @@ class MainApp : public wxApp
         float               m_SpkOutMidGaindB;
         float               m_SpkOutMidQ;
         bool                m_SpkOutEQEnable;
+        float               m_SpkOutVolInDB;
 
         // optional vox trigger tone
         bool                m_leftChannelVoxTone;
@@ -371,9 +374,11 @@ typedef struct paCallBackData
         , sbqMicInBass(nullptr)
         , sbqMicInTreble(nullptr)
         , sbqMicInMid(nullptr)
+        , sbqMicInVol(nullptr)
         , sbqSpkOutBass(nullptr)
         , sbqSpkOutTreble(nullptr)
         , sbqSpkOutMid(nullptr)
+        , sbqSpkOutVol(nullptr)
         , micInEQEnable(false)
         , spkOutEQEnable(false)
         , leftChannelVoxTone(false)
@@ -411,9 +416,11 @@ typedef struct paCallBackData
     void           *sbqMicInBass;
     void           *sbqMicInTreble;
     void           *sbqMicInMid;
+    void           *sbqMicInVol;
     void           *sbqSpkOutBass;
     void           *sbqSpkOutTreble;
     void           *sbqSpkOutMid;
+    void           *sbqSpkOutVol;
 
     bool            micInEQEnable;
     bool            spkOutEQEnable;
@@ -477,6 +484,7 @@ class MainFrame : public TopFrame
         MainFrame(wxWindow *parent);
         virtual ~MainFrame();
 
+        FilterDlg*              m_filterDialog;
         PlotSpectrum*           m_panelSpectrum;
         PlotWaterfall*          m_panelWaterfall;
         PlotScatter*            m_panelScatter;

src/ongui.cpp

@@ -72,9 +72,19 @@ void MainFrame::OnToolsAudioUI(wxUpdateUIEvent& event)
 void MainFrame::OnToolsFilter(wxCommandEvent& event)
 {
     wxUnusedVar(event);
-    FilterDlg *dlg = new FilterDlg(NULL, m_RxRunning, &m_newMicInFilter, &m_newSpkOutFilter);
-    dlg->ShowModal();
-    delete dlg;
+
+    if (m_filterDialog == nullptr)
+    {
+         m_filterDialog = new FilterDlg(NULL, m_RxRunning, &m_newMicInFilter, &m_newSpkOutFilter);
+    }
+    else
+    {
+        m_filterDialog->Iconize(false);
+        m_filterDialog->SetFocus();
+        m_filterDialog->Raise();
+    }
+
+    m_filterDialog->Show();
 }
 
 //-------------------------------------------------------------------------