Merge pull request #31 from drowe67/brad-newUSBaudio

Brads USB filtering plus a few other changes
drowe67 · Oct 31, 2019 · 17671cc · 17671cc
2 parents 05cdfaa + f335723
commit 17671cc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,7 +45,7 @@ message(STATUS "Compilation date = XX${DATE_RESULT}XX")
 set(FREEDV_VERSION_MAJOR 1)
 set(FREEDV_VERSION_MINOR 4)
 set(FREEDV_VERSION_PATCH FALSE)
-set(FREEDV_VERSION_SUFFIX FALSE)
+set(FREEDV_VERSION_SUFFIX "devel")
 
 set(FREEDV_VERSION ${FREEDV_VERSION_MAJOR}.${FREEDV_VERSION_MINOR})
 if(FREEDV_VERSION_PATCH)

diff --git a/USER_MANUAL.md b/USER_MANUAL.md
@@ -368,15 +368,15 @@ SNR.
 
 You may encounter the following limitations with FreeDV 2020:
 
+1. It requires a modern (post 2010) Intel CPU with AVX support.  If you 
+   don't have AVX the FreeDV 2020 mode button will be grayed out. 
 1. Some voices may sound very rough.  In early testing
-about 90% of speakers tested work well.
+   about 90% of speakers tested work well.
 1. Like 700D, you must tune within -/+ 60Hz for FreeDV 2020 to sync.
 1. With significant fading, sync may take a few seconds.
 1. There is a 2 second end-end latency.  You are welcome to try tuning
    this (Tools - Options - FIFO size, also see Sound Card Debug
    section below).
-1. It requires a modern (post 2010) Intel CPU with AVX support.  If you 
-   don't have AVX the FreeDV 2020 mode button will be grayed out. 
 
 ### Horus Binary Mode
 

diff --git a/src/dlg_audiooptions.cpp b/src/dlg_audiooptions.cpp
@@ -618,16 +618,18 @@ int AudioOptsDialog::ExchangeData(int inout)
         printf("  g_soundCard2SampleRate: %d\n", g_soundCard2SampleRate);
 
         wxConfigBase *pConfig = wxConfigBase::Get();
-        pConfig->Write(wxT("/Audio/soundCard1InDeviceNum"),       g_soundCard1InDeviceNum);
-        pConfig->Write(wxT("/Audio/soundCard1OutDeviceNum"),      g_soundCard1OutDeviceNum);
-        pConfig->Write(wxT("/Audio/soundCard1SampleRate"),        g_soundCard1SampleRate );
+        if (pConfig != NULL) {
+            pConfig->Write(wxT("/Audio/soundCard1InDeviceNum"),       g_soundCard1InDeviceNum);
+            pConfig->Write(wxT("/Audio/soundCard1OutDeviceNum"),      g_soundCard1OutDeviceNum);
+            pConfig->Write(wxT("/Audio/soundCard1SampleRate"),        g_soundCard1SampleRate );
 
-        pConfig->Write(wxT("/Audio/soundCard2InDeviceNum"),       g_soundCard2InDeviceNum);
-        pConfig->Write(wxT("/Audio/soundCard2OutDeviceNum"),      g_soundCard2OutDeviceNum);
-        pConfig->Write(wxT("/Audio/soundCard2SampleRate"),        g_soundCard2SampleRate );
+            pConfig->Write(wxT("/Audio/soundCard2InDeviceNum"),       g_soundCard2InDeviceNum);
+            pConfig->Write(wxT("/Audio/soundCard2OutDeviceNum"),      g_soundCard2OutDeviceNum);
+            pConfig->Write(wxT("/Audio/soundCard2SampleRate"),        g_soundCard2SampleRate );
 
-        pConfig->Flush();
-        delete wxConfigBase::Set((wxConfigBase *) NULL);
+            pConfig->Flush();
+            delete wxConfigBase::Set((wxConfigBase *) NULL);
+        }
     }
 
     return 0;

diff --git a/src/fdmdv2_main.cpp b/src/fdmdv2_main.cpp
@@ -459,7 +459,7 @@ MainFrame::MainFrame(wxString plugInName, wxWindow *parent) : TopFrame(plugInNam
 
     wxGetApp().m_playFileToMicInPath = pConfig->Read("/File/playFileToMicInPath",   wxT(""));
     wxGetApp().m_recFileFromRadioPath = pConfig->Read("/File/recFileFromRadioPath", wxT(""));
-    wxGetApp().m_recFileFromRadioSecs = pConfig->Read("/File/recFileFromRadioSecs", 30);
+    wxGetApp().m_recFileFromRadioSecs = pConfig->Read("/File/recFileFromRadioSecs", 60);
     wxGetApp().m_recFileFromModulatorPath = pConfig->Read("/File/recFileFromModulatorPath", wxT(""));
     wxGetApp().m_recFileFromModulatorSecs = pConfig->Read("/File/recFileFromModulatorSecs", 10);
     wxGetApp().m_playFileFromRadioPath = pConfig->Read("/File/playFileFromRadioPath", wxT(""));
@@ -1472,7 +1472,7 @@ void MainFrame::OnDeleteConfig(wxCommandEvent&)
     wxConfigBase *pConfig = wxConfigBase::Get();
     if(pConfig->DeleteAll())
     {
-        wxLogMessage(wxT("Config file/registry key successfully deleted."));
+        wxLogMessage(wxT("Config file/registry key successfully deleted.  Please restart FreeDV."));
 
         delete wxConfigBase::Set(NULL);
         wxConfigBase::DontCreateOnDemand();