Merge branch 'master' into ms-rel-v1812

drowe67 · Jun 16, 2023 · 4d10642 · 4d10642
2 parents fa32233 + fd53c75
commit 4d10642
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -592,9 +592,9 @@ elseif(UNIX AND NOT APPLE)
     SET(CPACK_GENERATOR "DEB")
     SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Mooneer Salem <mooneer@gmail.com>") #required
     if(USE_PULSEAUDIO)
-    SET(CPACK_DEBIAN_PACKAGE_DEPENDS "codec2 (>= 1.1.0), lpcnet (>= 0.5.0), libspeexdsp1 (>= 1.2~rc1.2-1+b2), libsamplerate0 (>= 0.1.9-2), libwxgtk3.0-gtk3-0v5  (>= 3.0.4+dfsg-3), libpulse0 (>= 14.2-2), libhamlib2 (>= 3.3-10build1), libasound2 (>= 1.1.8-1), libao4 (>= 1.2.2+20180113-1), libgsm1 (>= 1.0.18-2), libsndfile1 (>= 1.0.28-6)")
+    SET(CPACK_DEBIAN_PACKAGE_DEPENDS "codec2 (>= 1.1.1), lpcnet (>= 0.5.0), libspeexdsp1 (>= 1.2~rc1.2-1+b2), libsamplerate0 (>= 0.1.9-2), libwxgtk3.0-gtk3-0v5  (>= 3.0.4+dfsg-3), libpulse0 (>= 14.2-2), libhamlib2 (>= 3.3-10build1), libasound2 (>= 1.1.8-1), libao4 (>= 1.2.2+20180113-1), libgsm1 (>= 1.0.18-2), libsndfile1 (>= 1.0.28-6)")
     else(USE_PULSEAUDIO)
-    SET(CPACK_DEBIAN_PACKAGE_DEPENDS "codec2 (>= 1.1.0), lpcnet (>= 0.5.0), libspeexdsp1 (>= 1.2~rc1.2-1+b2), libsamplerate0 (>= 0.1.9-2), libwxgtk3.0-gtk3-0v5  (>= 3.0.4+dfsg-3), libportaudio2 (>= 19.6.0-1build1), libhamlib2 (>= 3.3-10build1), libasound2 (>= 1.1.8-1), libao4 (>= 1.2.2+20180113-1), libgsm1 (>= 1.0.18-2), libsndfile1 (>= 1.0.28-6)")
+    SET(CPACK_DEBIAN_PACKAGE_DEPENDS "codec2 (>= 1.1.1), lpcnet (>= 0.5.0), libspeexdsp1 (>= 1.2~rc1.2-1+b2), libsamplerate0 (>= 0.1.9-2), libwxgtk3.0-gtk3-0v5  (>= 3.0.4+dfsg-3), libportaudio2 (>= 19.6.0-1build1), libhamlib2 (>= 3.3-10build1), libasound2 (>= 1.1.8-1), libao4 (>= 1.2.2+20180113-1), libgsm1 (>= 1.0.18-2), libsndfile1 (>= 1.0.28-6)")
     endif(USE_PULSEAUDIO)
 
     SET(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)

diff --git a/USER_MANUAL.md b/USER_MANUAL.md
@@ -865,6 +865,12 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
 
 ## V1.8.12 TBD 2023
 
+1. Bugfixes:
+    * Clear audio plots when recording or playback starts. (PR #439)
+    * Clear button now clears the callsign list. (PR #436)
+2. Build system:
+    * Bump Codec2 version to v1.1.1. (PR #437)
+
 ## V1.8.11 June 2023
 
 1. Bugfixes:

diff --git a/build_linux.sh b/build_linux.sh
@@ -21,7 +21,7 @@ export CODEC2DIR=$FREEDVGUIDIR/codec2
 export LPCNETDIR=$FREEDVGUIDIR/LPCNet
 
 # change this when working on combined codec2/freedv-gui changes
-CODEC2_BRANCH=v1.1.0
+CODEC2_BRANCH=v1.1.1
 LPCNET_BRANCH=v0.5
 
 # OK, build and test LPCNet

diff --git a/build_osx.sh b/build_osx.sh
@@ -48,7 +48,7 @@ cd $FREEDVGUIDIR
 if [ ! -d codec2 ]; then
     git clone https://github.com/drowe67/codec2.git
 fi
-cd codec2 && git checkout v1.1.0 && git pull && git checkout $CODEC2_BRANCH
+cd codec2 && git checkout v1.1.1 && git pull && git checkout $CODEC2_BRANCH
 mkdir -p build_osx && cd build_osx && rm -Rf * && cmake -DLPCNET_BUILD_DIR=$LPCNETDIR/build_osx -DBUILD_OSX_UNIVERSAL=1 .. && make VERBOSE=1 -j4
 
 # sanity check test

diff --git a/build_windows.sh b/build_windows.sh
@@ -22,8 +22,8 @@ export FREEDVGUIDIR=${PWD}
 export CODEC2DIR=$FREEDVGUIDIR/codec2
 export LPCNETDIR=$FREEDVGUIDIR/LPCNet
 
-CODEC2_BRANCH=master
-LPCNET_BRANCH=master
+CODEC2_BRANCH=v1.1.1
+LPCNET_BRANCH=v0.5
 
 # OK, build and test LPCNet
 cd $FREEDVGUIDIR

diff --git a/cmake/BuildCodec2.cmake b/cmake/BuildCodec2.cmake
@@ -18,7 +18,7 @@ ExternalProject_Add(build_codec2
    SOURCE_DIR codec2_src
    BINARY_DIR codec2_build
    GIT_REPOSITORY https://github.com/drowe67/codec2.git
-   GIT_TAG v1.1.0
+   GIT_TAG v1.1.1
    CMAKE_ARGS ${CODEC2_CMAKE_ARGS}
    CMAKE_CACHE_ARGS -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
    INSTALL_COMMAND ""

diff --git a/src/dlg_audiooptions.cpp b/src/dlg_audiooptions.cpp
@@ -812,6 +812,12 @@ void AudioOptsDialog::plotDeviceInputForAFewSecs(wxString devName, PlotScalar *p
         FIFO               *fifo, *callbackFifo;
         int src_error;
 
+        // Reset plot before starting.
+        CallAfter([&]() {
+            ps->clearSamples();
+            ps->Refresh();
+        });
+
         fifo = codec2_fifo_create((int)(DT*TEST_WAVEFORM_PLOT_FS*2)); assert(fifo != NULL);
         src = src_new(SRC_SINC_FASTEST, 1, &src_error); assert(src != NULL);
 
@@ -940,6 +946,12 @@ void AudioOptsDialog::plotDeviceOutputForAFewSecs(wxString devName, PlotScalar *
         FIFO               *fifo, *callbackFifo;
         int src_error, n = 0;
 
+        // Reset plot before starting.
+        CallAfter([&]() {
+            ps->clearSamples();
+            ps->Refresh();
+        });
+
         fifo = codec2_fifo_create((int)(DT*TEST_WAVEFORM_PLOT_FS*2)); assert(fifo != NULL);
         src = src_new(SRC_SINC_FASTEST, 1, &src_error); assert(src != NULL);
 

diff --git a/src/ongui.cpp b/src/ongui.cpp
@@ -578,6 +578,9 @@ void MainFrame::OnCallSignReset(wxCommandEvent& event)
     wxString s;
     s.Printf("%s", m_callsign);
     m_txtCtrlCallSign->SetValue(s);
+
+    m_lastReportedCallsignListView->DeleteAllItems();
+    m_cboLastReportedCallsigns->SetText(_(""));
 }
 
 

diff --git a/src/plot_scalar.cpp b/src/plot_scalar.cpp
@@ -339,6 +339,11 @@ void PlotScalar::drawGraticule(wxGraphicsContext* ctx)
 
 }
 
+void PlotScalar::clearSamples()
+{
+    memset(m_mem, 0, sizeof(float) * m_samples);
+}
+
 //----------------------------------------------------------------
 // OnSize()
 //----------------------------------------------------------------

diff --git a/src/plot_scalar.h b/src/plot_scalar.h
@@ -50,6 +50,8 @@ class PlotScalar: public PlotPanel
          void setBarGraph(int bar_graph) { m_bar_graph = bar_graph; }
          void setLogY(int logy) { m_logy = logy; }
 
+         void clearSamples();
+
     protected:
 
          int      m_channels;