Compare commits
5 Commits
4e1bb95234
...
build2
| Author | SHA1 | Date | |
|---|---|---|---|
| ae0d81599d | |||
| 3a3acae777 | |||
| 3fb8edb23e | |||
| d0026758c1 | |||
| e47115b94f |
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
[submodule "src/ext/libsndfile"]
|
||||
path = src/ext/libsndfile
|
||||
url = https://github.com/libsndfile/libsndfile.git
|
||||
110
CMakeLists.txt
110
CMakeLists.txt
@@ -1,61 +1,73 @@
|
||||
cmake_minimum_required(VERSION 4.1)
|
||||
cmake_minimum_required(VERSION 3.22.1)
|
||||
project(rubberband)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 20)
|
||||
|
||||
set(CMAKE_CXX_FLAGS "-DUSE_BQRESAMPLER -DHAVE_KISSFFT")
|
||||
# -DNOMINMAX: for MSVCC to avoid defining max() as macro, breaking std::max()
|
||||
# -DHAVE_UNISTD_H: for libsndfile access()
|
||||
# -DUSE_PTHREADS: for Thread.h
|
||||
set(CMAKE_CXX_FLAGS "-DNOMINMAX -DHAVE_UNISTD_H -DUSE_PTHREADS -DUSE_BQRESAMPLER -DHAVE_KISSFFT")
|
||||
|
||||
# TODO: see Android.mk in librubberband and copy options from LOCAL_CFLAGS
|
||||
|
||||
# disable libsndfile tests
|
||||
set(BUILD_TESTING FALSE)
|
||||
|
||||
#include_directories(mpg123/lib/x86_64/include)
|
||||
include_directories(
|
||||
./dotnet/rubberband-dll
|
||||
./ladspa-lv2
|
||||
./rubberband
|
||||
./src/common
|
||||
./src/ext/float_cast
|
||||
./src/ext/getopt
|
||||
./src/ext/kissfft
|
||||
./src/ext/pommier
|
||||
./src/ext/speex
|
||||
./src/faster
|
||||
./src/finer
|
||||
./vamp
|
||||
./rubberband
|
||||
./src/common
|
||||
./src/ext/float_cast
|
||||
./src/ext/kissfft
|
||||
#./src/ext/pommier
|
||||
#./src/ext/speex
|
||||
./src/faster
|
||||
./src/finer
|
||||
)
|
||||
|
||||
add_executable(rubberband
|
||||
./src/ext/getopt/getopt.c
|
||||
./src/ext/getopt/getopt_long.c
|
||||
./src/ext/kissfft/kiss_fft.c
|
||||
./src/ext/kissfft/kiss_fftr.c
|
||||
./src/ext/speex/resample.c
|
||||
./main/main.cpp
|
||||
./src/common/Allocators.cpp
|
||||
./src/common/BQResampler.cpp
|
||||
./src/common/FFT.cpp
|
||||
./src/common/Log.cpp
|
||||
./src/common/mathmisc.cpp
|
||||
./src/common/Profiler.cpp
|
||||
./src/common/Resampler.cpp
|
||||
./src/common/StretchCalculator.cpp
|
||||
./src/common/sysutils.cpp
|
||||
./src/common/Thread.cpp
|
||||
./src/common/VectorOpsComplex.cpp
|
||||
./src/faster/AudioCurveCalculator.cpp
|
||||
./src/faster/CompoundAudioCurve.cpp
|
||||
./src/faster/HighFrequencyAudioCurve.cpp
|
||||
./src/faster/PercussiveAudioCurve.cpp
|
||||
./src/faster/R2Stretcher.cpp
|
||||
./src/faster/SilentAudioCurve.cpp
|
||||
./src/faster/StretcherChannelData.cpp
|
||||
./src/faster/StretcherProcess.cpp
|
||||
./src/finer/R3LiveShifter.cpp
|
||||
./src/finer/R3Stretcher.cpp
|
||||
./src/rubberband-c.cpp
|
||||
./src/RubberBandLiveShifter.cpp
|
||||
./src/RubberBandStretcher.cpp
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
||||
# only for WIN32 target system
|
||||
include_directories(
|
||||
./src/ext/getopt
|
||||
)
|
||||
endif()
|
||||
|
||||
set(RUBBERBAND_SRC
|
||||
#./src/ext/getopt/getopt.c
|
||||
#./src/ext/getopt/getopt_long.c
|
||||
./src/ext/kissfft/kiss_fft.c
|
||||
./src/ext/kissfft/kiss_fftr.c
|
||||
./src/ext/speex/resample.c
|
||||
./main/main.cpp
|
||||
./src/common/Allocators.cpp
|
||||
./src/common/BQResampler.cpp
|
||||
./src/common/FFT.cpp
|
||||
./src/common/Log.cpp
|
||||
./src/common/mathmisc.cpp
|
||||
./src/common/Profiler.cpp
|
||||
./src/common/Resampler.cpp
|
||||
./src/common/StretchCalculator.cpp
|
||||
./src/common/sysutils.cpp
|
||||
./src/common/Thread.cpp
|
||||
./src/common/VectorOpsComplex.cpp
|
||||
./src/faster/AudioCurveCalculator.cpp
|
||||
./src/faster/CompoundAudioCurve.cpp
|
||||
./src/faster/HighFrequencyAudioCurve.cpp
|
||||
./src/faster/PercussiveAudioCurve.cpp
|
||||
./src/faster/R2Stretcher.cpp
|
||||
./src/faster/SilentAudioCurve.cpp
|
||||
./src/faster/StretcherChannelData.cpp
|
||||
./src/faster/StretcherProcess.cpp
|
||||
./src/finer/R3LiveShifter.cpp
|
||||
./src/finer/R3Stretcher.cpp
|
||||
./src/rubberband-c.cpp
|
||||
./src/RubberBandLiveShifter.cpp
|
||||
./src/RubberBandStretcher.cpp
|
||||
)
|
||||
#target_link_directories(rubberband PRIVATE mpg123/lib/x86_64)
|
||||
#target_link_libraries(test_lockstep mpg123-0)
|
||||
#target_link_libraries(rubberband ${CMAKE_SOURCE_DIR}/mpg123/lib/x86_64/libmpg123.dll.a)
|
||||
|
||||
add_executable(rubberband-main ${RUBBERBAND_SRC})
|
||||
|
||||
add_library(rubberband SHARED ${RUBBERBAND_SRC})
|
||||
|
||||
add_subdirectory(src/ext/libsndfile)
|
||||
target_link_libraries(rubberband-main sndfile)
|
||||
target_link_libraries(rubberband sndfile)
|
||||
|
||||
@@ -49,7 +49,6 @@ 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);
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
||||
#define NOMINMAX
|
||||
|
||||
/*
|
||||
Rubber Band Library
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
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"
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
||||
#define NOMINMAX
|
||||
|
||||
/*
|
||||
Rubber Band Library
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
#include "sysutils.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#define NOMINMAX
|
||||
#include <windows.h>
|
||||
#include <fcntl.h>
|
||||
#include <io.h>
|
||||
|
||||
@@ -31,6 +31,8 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if OS_IS_WIN32
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -114,3 +116,5 @@ getopt(nargc, nargv, ostr)
|
||||
}
|
||||
return (optopt); /* dump back option letter */
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -61,6 +61,8 @@
|
||||
# if !defined(GETOPT_API)
|
||||
# define GETOPT_API __declspec(dllimport)
|
||||
# endif
|
||||
#else
|
||||
# define GETOPT_API
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
@@ -37,6 +37,7 @@
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if OS_IS_WIN32
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -549,3 +550,5 @@ getopt_long(nargc, nargv, options, long_options, idx)
|
||||
return retval;
|
||||
}
|
||||
#endif /* !GETOPT_LONG */
|
||||
|
||||
#endif
|
||||
1
src/ext/libsndfile
Submodule
1
src/ext/libsndfile
Submodule
Submodule src/ext/libsndfile added at 68f6c16fe1
@@ -1,7 +1,5 @@
|
||||
/* -*- 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.
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
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"
|
||||
|
||||
@@ -28,9 +27,6 @@
|
||||
#include "../common/Allocators.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
|
||||
using std::max;
|
||||
|
||||
namespace RubberBand
|
||||
{
|
||||
@@ -118,7 +114,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;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
||||
#define NOMINMAX
|
||||
|
||||
/*
|
||||
Rubber Band Library
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
||||
#define NOMINMAX
|
||||
|
||||
/*
|
||||
Rubber Band Library
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
||||
#define NOMINMAX
|
||||
|
||||
/*
|
||||
Rubber Band Library
|
||||
|
||||
Reference in New Issue
Block a user