Compare commits
1 Commits
d0026758c1
...
default
| Author | SHA1 | Date | |
|---|---|---|---|
| 4e1bb95234 |
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -1,3 +0,0 @@
|
|||||||
[submodule "src/ext/libsndfile"]
|
|
||||||
path = src/ext/libsndfile
|
|
||||||
url = https://github.com/libsndfile/libsndfile.git
|
|
||||||
@@ -3,7 +3,7 @@ project(rubberband)
|
|||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
|
|
||||||
set(CMAKE_CXX_FLAGS "-DNOMINMAX -DUSE_BQRESAMPLER -DHAVE_KISSFFT")
|
set(CMAKE_CXX_FLAGS "-DUSE_BQRESAMPLER -DHAVE_KISSFFT")
|
||||||
|
|
||||||
#include_directories(mpg123/lib/x86_64/include)
|
#include_directories(mpg123/lib/x86_64/include)
|
||||||
include_directories(
|
include_directories(
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ using RubberBand::gettimeofday;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
#define NOMINMAX
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
static void usleep(unsigned long usec) {
|
static void usleep(unsigned long usec) {
|
||||||
::Sleep(usec == 0 ? 0 : usec < 1000 ? 1 : usec / 1000);
|
::Sleep(usec == 0 ? 0 : usec < 1000 ? 1 : usec / 1000);
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
||||||
|
#define NOMINMAX
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Rubber Band Library
|
Rubber Band Library
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
under terms other than those of the GNU General Public License,
|
under terms other than those of the GNU General Public License,
|
||||||
you must obtain a valid commercial licence before doing so.
|
you must obtain a valid commercial licence before doing so.
|
||||||
*/
|
*/
|
||||||
|
#define NOMINMAX
|
||||||
|
|
||||||
#include "BQResampler.h"
|
#include "BQResampler.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
||||||
|
#define NOMINMAX
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Rubber Band Library
|
Rubber Band Library
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include "VectorOpsComplex.h"
|
#include "VectorOpsComplex.h"
|
||||||
|
|
||||||
#include "system/sysutils.h"
|
//#include "system/sysutils.h"
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
#include "sysutils.h"
|
#include "sysutils.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
#define NOMINMAX
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
|
|||||||
Submodule src/ext/libsndfile deleted from 68f6c16fe1
@@ -1,5 +1,7 @@
|
|||||||
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
||||||
|
|
||||||
|
#define NOMINMAX
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Rubber Band Library
|
Rubber Band Library
|
||||||
An audio time-stretching and pitch-shifting library.
|
An audio time-stretching and pitch-shifting library.
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
under terms other than those of the GNU General Public License,
|
under terms other than those of the GNU General Public License,
|
||||||
you must obtain a valid commercial licence before doing so.
|
you must obtain a valid commercial licence before doing so.
|
||||||
*/
|
*/
|
||||||
|
#define NOMINMAX
|
||||||
|
|
||||||
#include "StretcherChannelData.h"
|
#include "StretcherChannelData.h"
|
||||||
|
|
||||||
@@ -27,6 +28,9 @@
|
|||||||
#include "../common/Allocators.h"
|
#include "../common/Allocators.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
|
using std::max;
|
||||||
|
|
||||||
namespace RubberBand
|
namespace RubberBand
|
||||||
{
|
{
|
||||||
@@ -114,7 +118,7 @@ void
|
|||||||
R2Stretcher::ChannelData::setSizes(size_t windowSize,
|
R2Stretcher::ChannelData::setSizes(size_t windowSize,
|
||||||
size_t fftSize)
|
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 realSize = maxSize / 2 + 1;
|
||||||
size_t oldMax = inbuf->getSize();
|
size_t oldMax = inbuf->getSize();
|
||||||
size_t oldReal = oldMax / 2 + 1;
|
size_t oldReal = oldMax / 2 + 1;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
||||||
|
#define NOMINMAX
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Rubber Band Library
|
Rubber Band Library
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
||||||
|
#define NOMINMAX
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Rubber Band Library
|
Rubber Band Library
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
||||||
|
#define NOMINMAX
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Rubber Band Library
|
Rubber Band Library
|
||||||
|
|||||||
Reference in New Issue
Block a user