build: add libsamplerate

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "src/ext/libsndfile"]
-	path = src/ext/libsndfile
-	url = https://github.com/libsndfile/libsndfile.git

CMakeLists.txt

@@ -3,7 +3,8 @@ project(rubberband)
 
 set(CMAKE_CXX_STANDARD 20)
 
-set(CMAKE_CXX_FLAGS "-DNOMINMAX -DUSE_BQRESAMPLER -DHAVE_KISSFFT")
+set(BUILD_TESTING FALSE)
+set(CMAKE_CXX_FLAGS "-DUSE_BQRESAMPLER -DHAVE_KISSFFT -DHAVE_LIBSAMPLERATE")
 
 #include_directories(mpg123/lib/x86_64/include)
 include_directories(
@@ -58,4 +59,7 @@ add_executable(rubberband
 #target_link_libraries(rubberband ${CMAKE_SOURCE_DIR}/mpg123/lib/x86_64/libmpg123.dll.a)
 
 add_subdirectory(src/ext/libsndfile)
-target_link_libraries(rubberband sndfile)
+add_subdirectory(src/ext/libsamplerate)
+target_link_libraries(rubberband sndfile samplerate)
+
+target_include_directories(rubberband PRIVATE ${CMAKE_SOURCE_DIR}/src/ext/libsamplerate/include)

main/main.cpp

@@ -49,6 +49,7 @@ using RubberBand::gettimeofday;
 #endif
 
 #ifdef _MSC_VER
+#define NOMINMAX
 #include <windows.h>
 static void usleep(unsigned long usec) {
     ::Sleep(usec == 0 ? 0 : usec < 1000 ? 1 : usec / 1000);

src/RubberBandStretcher.cpp

@@ -1,4 +1,5 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+#define NOMINMAX
 
 /*
     Rubber Band Library

src/common/BQResampler.cpp

@@ -20,6 +20,7 @@
     under terms other than those of the GNU General Public License,
     you must obtain a valid commercial licence before doing so.
 */
+#define NOMINMAX
 
 #include "BQResampler.h"
 

src/common/Resampler.cpp

@@ -1,4 +1,5 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+#define NOMINMAX
 
 /*
     Rubber Band Library

src/common/VectorOpsComplex.cpp

@@ -23,7 +23,7 @@
 
 #include "VectorOpsComplex.h"
 
-#include "system/sysutils.h"
+//#include "system/sysutils.h"
 
 #include <cassert>
 

src/common/sysutils.cpp

@@ -24,6 +24,7 @@
 #include "sysutils.h"
 
 #ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #include <fcntl.h>
 #include <io.h>

src/faster/R2Stretcher.cpp

@@ -1,5 +1,7 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
+#define NOMINMAX
+
 /*
     Rubber Band Library
     An audio time-stretching and pitch-shifting library.

src/faster/StretcherChannelData.cpp

@@ -20,6 +20,7 @@
     under terms other than those of the GNU General Public License,
     you must obtain a valid commercial licence before doing so.
 */
+#define NOMINMAX
 
 #include "StretcherChannelData.h"
 
@@ -27,6 +28,9 @@
 #include "../common/Allocators.h"
 
 #include <algorithm>
+#include <utility>
+
+using std::max;
 
 namespace RubberBand 
 {
@@ -114,7 +118,7 @@ void
 R2Stretcher::ChannelData::setSizes(size_t windowSize,
                                    size_t fftSize)
 {
-    size_t maxSize = 2 * std::max(windowSize, fftSize);
+    size_t maxSize = 2*std::max(windowSize, fftSize);
     size_t realSize = maxSize / 2 + 1;
     size_t oldMax = inbuf->getSize();
     size_t oldReal = oldMax / 2 + 1;

src/faster/StretcherProcess.cpp

@@ -1,4 +1,5 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+#define NOMINMAX
 
 /*
     Rubber Band Library

src/finer/R3LiveShifter.cpp

@@ -1,4 +1,5 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+#define NOMINMAX
 
 /*
     Rubber Band Library

src/finer/R3Stretcher.cpp

@@ -1,4 +1,5 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+#define NOMINMAX
 
 /*
     Rubber Band Library