This commit is contained in:
Chris Cannam
2018-05-14 19:31:29 +01:00
parent c2552425fe
commit 4d63c025e2
6 changed files with 36 additions and 28 deletions

View File

@@ -30,6 +30,7 @@ RUBBERBAND_SRC_FILES := \
$(RUBBERBAND_SRC_PATH)/StretcherProcess.cpp \ $(RUBBERBAND_SRC_PATH)/StretcherProcess.cpp \
$(RUBBERBAND_SRC_PATH)/StretchCalculator.cpp \ $(RUBBERBAND_SRC_PATH)/StretchCalculator.cpp \
$(RUBBERBAND_SRC_PATH)/RubberBandStretcher.cpp \ $(RUBBERBAND_SRC_PATH)/RubberBandStretcher.cpp \
$(RUBBERBAND_SRC_PATH)/rubberband-c.cpp \
$(RUBBERBAND_SRC_PATH)/speex/resample.c $(RUBBERBAND_SRC_PATH)/speex/resample.c
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \

View File

@@ -31,7 +31,7 @@ PROJECT_NAME = "Rubber Band Library"
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 1.8.1 PROJECT_NUMBER = 1.8.2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.

View File

@@ -258,6 +258,9 @@ use the Accelerate framework and the Speex resampler. Then run
e.g. "make -f Makefile.osx library" in a terminal window to build. e.g. "make -f Makefile.osx library" in a terminal window to build.
You will need the Xcode command-line tools installed. You will need the Xcode command-line tools installed.
(You probably don't want to use the configure script on macOS -- just
use Makefile.osx directly.)
The following Makefile targets are available: The following Makefile targets are available:
static -- build static libraries only static -- build static libraries only
@@ -338,6 +341,10 @@ interface (i.e. the Android NDK).
The Java side of the interface can be found in The Java side of the interface can be found in
com/breakfastquay/rubberband/RubberBandStretcher.java. com/breakfastquay/rubberband/RubberBandStretcher.java.
See
https://bitbucket.org/breakfastquay/rubberband-android-simple-sample
for a very trivial example of integration with Android Java code.
The supplied .mk file uses KissFFT and the Speex resampler. The supplied .mk file uses KissFFT and the Speex resampler.

34
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for RubberBand 1.8.1. # Generated by GNU Autoconf 2.69 for RubberBand 1.8.2.
# #
# Report bugs to <chris.cannam@breakfastquay.com>. # Report bugs to <chris.cannam@breakfastquay.com>.
# #
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='RubberBand' PACKAGE_NAME='RubberBand'
PACKAGE_TARNAME='rubberband' PACKAGE_TARNAME='rubberband'
PACKAGE_VERSION='1.8.1' PACKAGE_VERSION='1.8.2'
PACKAGE_STRING='RubberBand 1.8.1' PACKAGE_STRING='RubberBand 1.8.2'
PACKAGE_BUGREPORT='chris.cannam@breakfastquay.com' PACKAGE_BUGREPORT='chris.cannam@breakfastquay.com'
PACKAGE_URL='' PACKAGE_URL=''
@@ -1253,7 +1253,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures RubberBand 1.8.1 to adapt to many kinds of systems. \`configure' configures RubberBand 1.8.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1314,7 +1314,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of RubberBand 1.8.1:";; short | recursive ) echo "Configuration of RubberBand 1.8.2:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@@ -1411,7 +1411,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
RubberBand configure 1.8.1 RubberBand configure 1.8.2
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1705,7 +1705,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by RubberBand $as_me 1.8.1, which was It was created by RubberBand $as_me 1.8.2, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@@ -3846,8 +3846,8 @@ $as_echo "no" >&6; }
fi fi
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SRC" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for samplerate" >&5
$as_echo_n "checking for SRC... " >&6; } $as_echo_n "checking for samplerate... " >&6; }
if test -n "$SRC_CFLAGS"; then if test -n "$SRC_CFLAGS"; then
pkg_cv_SRC_CFLAGS="$SRC_CFLAGS" pkg_cv_SRC_CFLAGS="$SRC_CFLAGS"
@@ -3940,8 +3940,8 @@ fi
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sndfile" >&5
$as_echo_n "checking for SNDFILE... " >&6; } $as_echo_n "checking for sndfile... " >&6; }
if test -n "$SNDFILE_CFLAGS"; then if test -n "$SNDFILE_CFLAGS"; then
pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS" pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
@@ -4034,8 +4034,8 @@ fi
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFTW" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw3" >&5
$as_echo_n "checking for FFTW... " >&6; } $as_echo_n "checking for fftw3... " >&6; }
if test -n "$FFTW_CFLAGS"; then if test -n "$FFTW_CFLAGS"; then
pkg_cv_FFTW_CFLAGS="$FFTW_CFLAGS" pkg_cv_FFTW_CFLAGS="$FFTW_CFLAGS"
@@ -4153,8 +4153,8 @@ done
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Vamp" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vamp-sdk" >&5
$as_echo_n "checking for Vamp... " >&6; } $as_echo_n "checking for vamp-sdk... " >&6; }
if test -n "$Vamp_CFLAGS"; then if test -n "$Vamp_CFLAGS"; then
pkg_cv_Vamp_CFLAGS="$Vamp_CFLAGS" pkg_cv_Vamp_CFLAGS="$Vamp_CFLAGS"
@@ -4801,7 +4801,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by RubberBand $as_me 1.8.1, which was This file was extended by RubberBand $as_me 1.8.2, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@@ -4854,7 +4854,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
RubberBand config.status 1.8.1 RubberBand config.status 1.8.2
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

View File

@@ -4,7 +4,7 @@ libdir=${exec_prefix}/lib
includedir=${prefix}/include includedir=${prefix}/include
Name: rubberband Name: rubberband
Version: 1.8.1 Version: 1.8.2
Description: Description:
Libs: -L${libdir} -lrubberband Libs: -L${libdir} -lrubberband
Cflags: -I${includedir} Cflags: -I${includedir}