Resample into lib-math; Audacity doesn't use libsoxr directly

cmake-proxies/CMakeLists.txt

@@ -160,7 +160,6 @@ set_conan_vars_to_parent()
 #
 #       directory          option      symbol      req   chk   version
 addlib( libsndfile         sndfile     SNDFILE     YES   YES   "sndfile >= 1.0.28" )
-addlib( libsoxr            soxr        SOXR        YES   YES   "soxr >= 0.1.1" )
 addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "" )
 addlib( sqlite             sqlite      SQLITE      YES   YES   "sqlite3 >= 3.32.0" )
 

libraries/lib-math/CMakeLists.txt

@@ -2,6 +2,8 @@
 A library of mathematical utilities and manipulation of samples
 ]]#
 
+addlib( libsoxr            soxr        SOXR        YES   YES   "soxr >= 0.1.1" )
+
 set( SOURCES
    Dither.cpp
    Dither.h
@@ -13,6 +15,8 @@ set( SOURCES
    Matrix.h
    RealFFTf.cpp
    RealFFTf.h
+   Resample.cpp
+   Resample.h
    SampleCount.cpp
    SampleCount.h
    SampleFormat.cpp
@@ -22,6 +26,7 @@ set( SOURCES
    float_cast.h
 )
 set( LIBRARIES
+   libsoxr
    lib-preferences-interface
    PRIVATE
    wxBase

libraries/lib-math/Resample.h

@@ -12,8 +12,6 @@
 #ifndef __AUDACITY_RESAMPLE_H__
 #define __AUDACITY_RESAMPLE_H__
 
-
-
 #include "SampleFormat.h"
 
 template< typename Enum > class EnumSetting;
@@ -25,7 +23,7 @@ struct soxr_deleter {
 };
 using soxrHandle = std::unique_ptr<soxr, soxr_deleter>;
 
-class AUDACITY_DLL_API Resample final
+class MATH_API Resample final
 {
  public:
    /// Resamplers may have more than one method, offering a

src/CMakeLists.txt

@@ -228,8 +228,6 @@ list( APPEND SOURCES
       Registrar.h
       Registry.cpp
       Registry.h
-      Resample.cpp
-      Resample.h
       RingBuffer.cpp
       RingBuffer.h
       SampleBlock.cpp
@@ -1074,7 +1072,6 @@ list( APPEND LIBRARIES
       expat::expat
       libmp3lame::libmp3lame
       libsndfile
-      libsoxr
       portaudio-v19
       sqlite
       $<$<BOOL:${${_OPT}has_crashreports}>:crashreports>

src/effects/ChangeSpeed.cpp

@@ -25,7 +25,7 @@
 
 #include "../LabelTrack.h"
 #include "Prefs.h"
-#include "../Resample.h"
+#include "Resample.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../widgets/NumericTextCtrl.h"

src/prefs/QualityPrefs.cpp

@@ -26,7 +26,7 @@
 #include "../AudioIOBase.h"
 #include "Dither.h"
 #include "Prefs.h"
-#include "../Resample.h"
+#include "Resample.h"
 #include "../ShuttleGui.h"
 
 #define ID_SAMPLE_RATE_CHOICE           7001