* Pull across from main repo: Fix silent channel of output when processing with band-limited transients option; include libresample support. Also update copyright dates.

.hgignore

@@ -0,0 +1,13 @@
+syntax: glob
+Makefile
+autom4te*
+bin/*
+lib/*
+*.a
+*.so
+*.o
+*.orig
+*.log
+*.bak
+config.status
+

CHANGELOG

@@ -1,5 +1,23 @@
 
-Changed in Rubber Band v1.5
+
+Changes in Rubber Band v1.6
+
+ * Add Smoothing option.  This uses a window-presum FFT, introducing
+   time-domain aliasing which is then smoothed using a sinc window.
+   This can be used in combination with any of the existing processing
+   control options.  This will soften transients but the result may
+   still be more pleasant for some material that is not very amenable
+   to being time stretched.
+ * Fix silent channel of output when processing with band-limited
+   transients option
+ * Include libresample support
+
+The library is binary compatible with version 1.5 for forward
+compatibility (values have been added to an existing enum).  Code
+written to use 1.6 is not necessarily compatible with 1.5.
+
+
+Changes in Rubber Band v1.5
 
  * Add a more reliable transient detection mode, and make the mode
    selectable using OptionDetectorXXX flags -- the new method is
@@ -10,8 +28,8 @@ Changed in Rubber Band v1.5
    management during offline stretches
 
 The library is binary compatible with version 1.4 for forward
-compatibility (a function and an enum have been added, but no existing
+compatibility (a function has been added and an enum changed, but no
-entry points have changed).  Code written to use 1.5 is not
+existing entry points have changed).  Code written to use 1.5 is not
 necessarily compatible with 1.4.
 
 

Makefile.in

@@ -1,6 +1,6 @@
 
 CXX		:= @CXX@
-CXXFLAGS	:= -DHAVE_FFTW3 -DFFTW_DOUBLE_ONLY -DNO_THREAD_CHECKS -DNO_TIMING -DNDEBUG @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ -Irubberband -I. -Isrc $(OPTFLAGS)
+CXXFLAGS	:= -DHAVE_LIBSAMPLERATE -DHAVE_FFTW3 -DFFTW_DOUBLE_ONLY -DNO_THREAD_CHECKS -DNO_TIMING -DNDEBUG @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ -Irubberband -I. -Isrc $(OPTFLAGS)
 CFLAGS		:= @CFLAGS@ $(OPTFLAGS)
 LDFLAGS		:= @LDFLAGS@ -lpthread $(LDFLAGS)
 
@@ -176,45 +176,52 @@ depend:
 src/rubberband-c.o: rubberband/rubberband-c.h
 src/rubberband-c.o: rubberband/RubberBandStretcher.h
 src/RubberBandStretcher.o: src/StretcherImpl.h
-src/RubberBandStretcher.o: rubberband/RubberBandStretcher.h src/dsp/Window.h src/dsp/SincWindow.h
+src/RubberBandStretcher.o: rubberband/RubberBandStretcher.h src/dsp/Window.h
-src/RubberBandStretcher.o: src/dsp/FFT.h src/base/RingBuffer.h
+src/RubberBandStretcher.o: src/dsp/SincWindow.h src/dsp/FFT.h
+src/RubberBandStretcher.o: src/dsp/CompoundAudioCurve.h
+src/RubberBandStretcher.o: src/dsp/AudioCurveCalculator.h
+src/RubberBandStretcher.o: src/dsp/PercussiveAudioCurve.h
+src/RubberBandStretcher.o: src/dsp/HighFrequencyAudioCurve.h
+src/RubberBandStretcher.o: src/dsp/SampleFilter.h src/base/RingBuffer.h
 src/RubberBandStretcher.o: src/base/Scavenger.h src/system/Thread.h
-src/RubberBandStretcher.o: src/system/Thread.h src/system/sysutils.h
+src/RubberBandStretcher.o: src/system/sysutils.h
 src/StretcherProcess.o: src/StretcherImpl.h rubberband/RubberBandStretcher.h
-src/StretcherProcess.o: src/dsp/Window.h src/dsp/SincWindow.h src/dsp/FFT.h src/base/RingBuffer.h
+src/StretcherProcess.o: src/dsp/Window.h src/dsp/SincWindow.h src/dsp/FFT.h
-src/StretcherProcess.o: src/base/Scavenger.h src/system/Thread.h
+src/StretcherProcess.o: src/dsp/CompoundAudioCurve.h
-src/StretcherProcess.o: src/system/Thread.h src/system/sysutils.h
-src/StretcherProcess.o: src/dsp/PercussiveAudioCurve.h
 src/StretcherProcess.o: src/dsp/AudioCurveCalculator.h
+src/StretcherProcess.o: src/dsp/PercussiveAudioCurve.h
+src/StretcherProcess.o: src/dsp/HighFrequencyAudioCurve.h
+src/StretcherProcess.o: src/dsp/SampleFilter.h src/base/RingBuffer.h
+src/StretcherProcess.o: src/base/Scavenger.h src/system/Thread.h
+src/StretcherProcess.o: src/system/sysutils.h src/dsp/PercussiveAudioCurve.h
 src/StretcherProcess.o: src/dsp/HighFrequencyAudioCurve.h
 src/StretcherProcess.o: src/dsp/ConstantAudioCurve.h src/StretchCalculator.h
 src/StretcherProcess.o: src/StretcherChannelData.h src/dsp/Resampler.h
 src/StretcherProcess.o: src/base/Profiler.h src/system/VectorOps.h
 src/StretcherProcess.o: src/system/sysutils.h
 src/StretchCalculator.o: src/StretchCalculator.h src/system/sysutils.h
-src/system/Thread.o: src/system/Thread.h
 src/base/Profiler.o: src/base/Profiler.h src/system/sysutils.h
 src/dsp/AudioCurveCalculator.o: src/dsp/AudioCurveCalculator.h
-src/dsp/AudioCurveCalculator.o: src/system/sysutils.h
+src/dsp/CompoundAudioCurve.o: src/dsp/CompoundAudioCurve.h
+src/dsp/CompoundAudioCurve.o: src/dsp/AudioCurveCalculator.h
+src/dsp/CompoundAudioCurve.o: src/dsp/PercussiveAudioCurve.h
+src/dsp/CompoundAudioCurve.o: src/dsp/HighFrequencyAudioCurve.h
+src/dsp/CompoundAudioCurve.o: src/dsp/SampleFilter.h src/dsp/MovingMedian.h
 src/dsp/SpectralDifferenceAudioCurve.o: src/dsp/SpectralDifferenceAudioCurve.h
 src/dsp/SpectralDifferenceAudioCurve.o: src/dsp/AudioCurveCalculator.h
+src/dsp/SpectralDifferenceAudioCurve.o: src/dsp/Window.h
 src/dsp/SpectralDifferenceAudioCurve.o: src/system/sysutils.h
-src/dsp/SpectralDifferenceAudioCurve.o: src/dsp/Window.h src/dsp/SincWindow.h
 src/dsp/SpectralDifferenceAudioCurve.o: src/system/VectorOps.h
 src/dsp/SpectralDifferenceAudioCurve.o: src/system/sysutils.h
 src/dsp/HighFrequencyAudioCurve.o: src/dsp/HighFrequencyAudioCurve.h
 src/dsp/HighFrequencyAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/dsp/HighFrequencyAudioCurve.o: src/system/sysutils.h
 src/dsp/SilentAudioCurve.o: src/dsp/SilentAudioCurve.h
 src/dsp/SilentAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/dsp/SilentAudioCurve.o: src/system/sysutils.h
 src/dsp/ConstantAudioCurve.o: src/dsp/ConstantAudioCurve.h
 src/dsp/ConstantAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/dsp/ConstantAudioCurve.o: src/system/sysutils.h
 src/dsp/PercussiveAudioCurve.o: src/dsp/PercussiveAudioCurve.h
 src/dsp/PercussiveAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/dsp/PercussiveAudioCurve.o: src/system/sysutils.h src/system/VectorOps.h
+src/dsp/PercussiveAudioCurve.o: src/system/VectorOps.h src/system/sysutils.h
-src/dsp/PercussiveAudioCurve.o: src/system/sysutils.h
 src/dsp/Resampler.o: src/dsp/Resampler.h src/system/sysutils.h
 src/dsp/Resampler.o: src/base/Profiler.h
 src/dsp/FFT.o: src/dsp/FFT.h src/system/sysutils.h src/system/Thread.h
@@ -223,20 +230,30 @@ src/dsp/FFT.o: src/system/sysutils.h
 src/system/Allocators.o: src/system/Allocators.h src/system/VectorOps.h
 src/system/Allocators.o: src/system/sysutils.h
 src/system/sysutils.o: src/system/sysutils.h
+src/system/Thread.o: src/system/Thread.h
 src/StretcherChannelData.o: src/StretcherChannelData.h src/StretcherImpl.h
-src/StretcherChannelData.o: rubberband/RubberBandStretcher.h src/dsp/Window.h src/dsp/SincWindow.h
+src/StretcherChannelData.o: rubberband/RubberBandStretcher.h src/dsp/Window.h
-src/StretcherChannelData.o: src/dsp/FFT.h src/base/RingBuffer.h
+src/StretcherChannelData.o: src/dsp/SincWindow.h src/dsp/FFT.h
+src/StretcherChannelData.o: src/dsp/CompoundAudioCurve.h
+src/StretcherChannelData.o: src/dsp/AudioCurveCalculator.h
+src/StretcherChannelData.o: src/dsp/PercussiveAudioCurve.h
+src/StretcherChannelData.o: src/dsp/HighFrequencyAudioCurve.h
+src/StretcherChannelData.o: src/dsp/SampleFilter.h src/base/RingBuffer.h
 src/StretcherChannelData.o: src/base/Scavenger.h src/system/Thread.h
-src/StretcherChannelData.o: src/system/Thread.h src/system/sysutils.h
+src/StretcherChannelData.o: src/system/sysutils.h src/dsp/Resampler.h
-src/StretcherChannelData.o: src/dsp/Resampler.h src/system/Allocators.h
+src/StretcherChannelData.o: src/system/Allocators.h src/system/VectorOps.h
-src/StretcherChannelData.o: src/system/VectorOps.h src/system/sysutils.h
+src/StretcherChannelData.o: src/system/sysutils.h
 src/StretcherImpl.o: src/StretcherImpl.h rubberband/RubberBandStretcher.h
-src/StretcherImpl.o: src/dsp/Window.h src/dsp/SincWindow.h src/dsp/FFT.h src/base/RingBuffer.h
+src/StretcherImpl.o: src/dsp/Window.h src/dsp/SincWindow.h src/dsp/FFT.h
-src/StretcherImpl.o: src/base/Scavenger.h src/system/Thread.h src/system/Thread.h
+src/StretcherImpl.o: src/dsp/CompoundAudioCurve.h
-src/StretcherImpl.o: src/system/sysutils.h src/dsp/PercussiveAudioCurve.h
 src/StretcherImpl.o: src/dsp/AudioCurveCalculator.h
+src/StretcherImpl.o: src/dsp/PercussiveAudioCurve.h
+src/StretcherImpl.o: src/dsp/HighFrequencyAudioCurve.h src/dsp/SampleFilter.h
+src/StretcherImpl.o: src/base/RingBuffer.h src/base/Scavenger.h
+src/StretcherImpl.o: src/system/Thread.h src/system/sysutils.h
+src/StretcherImpl.o: src/dsp/PercussiveAudioCurve.h
 src/StretcherImpl.o: src/dsp/HighFrequencyAudioCurve.h
-src/StretcherImpl.o: src/dsp/SpectralDifferenceAudioCurve.h src/dsp/Window.h src/dsp/SincWindow.h
+src/StretcherImpl.o: src/dsp/SpectralDifferenceAudioCurve.h src/dsp/Window.h
 src/StretcherImpl.o: src/system/VectorOps.h src/system/sysutils.h
 src/StretcherImpl.o: src/dsp/SilentAudioCurve.h src/dsp/ConstantAudioCurve.h
 src/StretcherImpl.o: src/dsp/Resampler.h src/StretchCalculator.h

README.txt

@@ -4,7 +4,7 @@ Rubber Band
 
 An audio time-stretching and pitch-shifting library and utility program.
 
-Copyright 2007-2010 Chris Cannam, cannam@all-day-breakfast.com.
+Copyright 2007-2010 Chris Cannam, chris.cannam@breakfastquay.com.
 
 Distributed under the GNU General Public License.
 
@@ -94,8 +94,7 @@ Rubber Band is supplied with build scripts that have been tested on
 Linux platforms.  It is also possible to build Rubber Band on other
 platforms, including both POSIX platforms such as OS/X and non-POSIX
 platforms such as Win32.  There are some example Makefiles in the misc
-directory, but if you're using a proprietary platform and you get
+directory.
-stuck I'm afraid you're on your own, unless you want to pay us...
 
 To build Rubber Band you will also need libsndfile, libsamplerate,
 FFTW3, the Vamp plugin SDK, the LADSPA plugin header, the pthread
@@ -149,10 +148,10 @@ requires linkage against the C++ standard libraries.  It is not yet
 documented separately from the C++ header.  You should include only
 one of the two headers, not both.
 
-The source code for the command-line utility (src/main.cpp) provides a
+The source code for the command-line utility (main/main.cpp) provides
-good example of how to use Rubber Band in offline mode; the LADSPA
+a good example of how to use Rubber Band in offline mode; the LADSPA
-pitch shifter plugin (src/ladspa/RubberBandPitchShifter.cpp) may be
+pitch shifter plugin (ladspa/RubberBandPitchShifter.cpp) may be used
-used as an example of Rubber Band in real-time mode.
+as an example of Rubber Band in real-time mode.
 
 IMPORTANT: Please ensure you have read and understood the licensing
 terms for Rubber Band before using it in another application.  This

configure.ac

@@ -1,5 +1,5 @@
 
-AC_INIT(RubberBand, 1.2, cannam@all-day-breakfast.com)
+AC_INIT(RubberBand, 1.6, cannam@all-day-breakfast.com)
 
 AC_CONFIG_SRCDIR(src/StretcherImpl.h)
 AC_PROG_CXX

ladspa/RubberBandPitchShifter.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

ladspa/RubberBandPitchShifter.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

ladspa/libmain.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

main/main.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -78,7 +78,7 @@ int main(int argc, char **argv)
     double frequencyshift = 1.0;
     int debug = 0;
     bool realtime = false;
-    bool precise = false;
+    bool precise = true;
     int threading = 0;
     bool lamination = true;
     bool longwin = false;
@@ -123,6 +123,7 @@ int main(int argc, char **argv)
             { "crispness",     1, 0, 'c' },
             { "debug",         1, 0, 'd' },
             { "realtime",      0, 0, 'R' },
+            { "loose",         0, 0, 'L' },
             { "precise",       0, 0, 'P' },
             { "formant",       0, 0, 'F' },
             { "no-threads",    0, 0, '0' },
@@ -142,7 +143,7 @@ int main(int argc, char **argv)
         };
 
         c = getopt_long(argc, argv,
-                        "t:p:d:RPFc:f:T:D:qhVM:",
+                        "t:p:d:RLPFc:f:T:D:qhVM:",
                         longOpts, &optionIndex);
         if (c == -1) break;
 
@@ -156,6 +157,7 @@ int main(int argc, char **argv)
         case 'f': frequencyshift = atof(optarg); haveRatio = true; break;
         case 'd': debug = atoi(optarg); break;
         case 'R': realtime = true; break;
+        case 'L': precise = false; break;
         case 'P': precise = true; break;
 	case 'F': formant = true; break;
         case '0': threading = 1; break;
@@ -185,7 +187,7 @@ int main(int argc, char **argv)
         cerr << endl;
 	cerr << "Rubber Band" << endl;
         cerr << "An audio time-stretching and pitch-shifting library and utility program." << endl;
-	cerr << "Copyright 2010 Chris Cannam.  Distributed under the GNU General Public License." << endl;
+	cerr << "Copyright 2011 Chris Cannam.  Distributed under the GNU General Public License." << endl;
         cerr << endl;
 	cerr << "   Usage: " << argv[0] << " [options] <infile.wav> <outfile.wav>" << endl;
         cerr << endl;
@@ -217,8 +219,9 @@ int main(int argc, char **argv)
         cerr << "crispness parameter are intended to provide the best sounding set of options" << endl;
         cerr << "for most situations.  The default is to use none of these options." << endl;
         cerr << endl;
-        cerr << "  -P,    --precise        Aim for minimal time distortion (implied by -R)" << endl;
+        cerr << "  -L,    --loose          Relax timing in hope of better transient preservation" << endl;
-        cerr << "  -R,    --realtime       Select realtime mode (implies -P --no-threads)" << endl;
+        cerr << "  -P,    --precise        Ignored: The opposite of -L, this is default from 1.6" << endl;
+        cerr << "  -R,    --realtime       Select realtime mode (implies --no-threads)" << endl;
         cerr << "         --no-threads     No extra threads regardless of CPU and channel count" << endl;
         cerr << "         --threads        Assume multi-CPU even if only one CPU is identified" << endl;
         cerr << "         --no-transients  Disable phase resynchronisation at transients" << endl;

misc/Makefile.osx

@@ -1,12 +1,12 @@
 
+# OS/X-specific Makefile for the Rubber Band Library only.
+# Does not build the Vamp plugin, LADSPA plugin, or command-line utility.
+
 CXX		:= g++
-CXXFLAGS	:= -DHAVE_FFTW3 -DNO_THREAD_CHECKS -DNO_TIMING -DNDEBUG -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -O3 -arch i386 -arch ppc -msse -msse2 -ffast-math -ftree-vectorize -I../include -I../vamp-plugin-sdk -I/usr/local/include -Irubberband -I. -Isrc
+CXXFLAGS	:= -DHAVE_FFTW3 -DFFTW_DOUBLE_ONLY -DNO_THREAD_CHECKS -DNO_TIMING -DNDEBUG -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -O3 -arch i386 -arch ppc -msse -msse2 -ffast-math -ftree-vectorize -I../include -I/usr/local/include -Irubberband -I. -Isrc
-LDFLAGS		:= -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -L../lib -L/usr/local/lib -L../vamp-plugin-sdk/vamp-sdk
+LDFLAGS		:= -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -L../lib -L/usr/local/lib
 
-LIBRARY_LIBS		:= -lsamplerate -lfftw3 -lfftw3f -lpthread -lm
+LIBRARY_LIBS		:= -lsamplerate -lfftw3 -lpthread -lm
-PROGRAM_LIBS		:= -lsndfile $(LIBRARY_LIBS)
-VAMP_PLUGIN_LIBS	:= -lvamp-sdk $(LIBRARY_LIBS)
-LADSPA_PLUGIN_LIBS	:= $(LIBRARY_LIBS)
 
 MKDIR			:= mkdir
 AR			:= ar
@@ -14,13 +14,15 @@ AR			:= ar
 DYNAMIC_LDFLAGS 	:= -dynamiclib
 DYNAMIC_EXTENSION	:= .so
 
-PROGRAM_TARGET 		:= bin/rubberband
 STATIC_TARGET  		:= lib/librubberband.a
 DYNAMIC_TARGET 		:= lib/librubberband$(DYNAMIC_EXTENSION)
-VAMP_TARGET    		:= lib/vamp-rubberband$(DYNAMIC_EXTENSION)
-LADSPA_TARGET  		:= lib/ladspa-rubberband$(DYNAMIC_EXTENSION)
 
-all: bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET)
+INSTALL_BINDIR		:= /usr/local/bin
+INSTALL_INCDIR		:= /usr/local/include/rubberband
+INSTALL_LIBDIR		:= /usr/local/lib
+INSTALL_PKGDIR		:= /usr/local/lib/pkgconfig
+
+all: bin lib $(STATIC_TARGET) $(DYNAMIC_TARGET)
 
 PUBLIC_INCLUDES := \
 	rubberband/rubberband-c.h \
@@ -36,13 +38,15 @@ LIBRARY_INCLUDES := \
 	src/base/Scavenger.h \
 	src/dsp/AudioCurveCalculator.h \
 	src/dsp/CompoundAudioCurve.h \
+	src/dsp/ConstantAudioCurve.h \
+	src/dsp/HighFrequencyAudioCurve.h \
+	src/dsp/PercussiveAudioCurve.h \
+	src/dsp/SilentAudioCurve.h \
 	src/dsp/SpectralDifferenceAudioCurve.h \
 	src/dsp/Resampler.h \
-	src/dsp/HighFrequencyAudioCurve.h \
-	src/dsp/SilentAudioCurve.h \
 	src/dsp/FFT.h \
-	src/dsp/PercussiveAudioCurve.h \
+	src/dsp/MovingMedian.h \
-	src/dsp/ConstantAudioCurve.h \
+	src/dsp/SincWindow.h \
 	src/dsp/Window.h \
 	src/system/Allocators.h \
 	src/system/Thread.h \
@@ -70,30 +74,7 @@ LIBRARY_SOURCES := \
 	src/StretcherChannelData.cpp \
 	src/StretcherImpl.cpp
 
-PROGRAM_SOURCES := \
-	main/main.cpp
-
-VAMP_HEADERS := \
-	vamp/RubberBandVampPlugin.h
-
-VAMP_SOURCES := \
-	vamp/RubberBandVampPlugin.cpp \
-	vamp/libmain.cpp
-
-LADSPA_HEADERS := \
-	ladspa/RubberBandPitchShifter.h
-
-LADSPA_SOURCES := \
-	ladspa/RubberBandPitchShifter.cpp \
-	ladspa/libmain.cpp
-
 LIBRARY_OBJECTS := $(LIBRARY_SOURCES:.cpp=.o)
-PROGRAM_OBJECTS := $(PROGRAM_SOURCES:.cpp=.o)
-VAMP_OBJECTS    := $(VAMP_SOURCES:.cpp=.o)
-LADSPA_OBJECTS  := $(LADSPA_SOURCES:.cpp=.o)
-
-$(PROGRAM_TARGET):	$(LIBRARY_OBJECTS) $(PROGRAM_OBJECTS)
-	$(CXX) -o $@ $^ $(PROGRAM_LIBS) $(PROGRAM_LIBS) $(LDFLAGS)
 
 $(STATIC_TARGET):	$(LIBRARY_OBJECTS)
 	$(AR) rsc $@ $^
@@ -101,25 +82,34 @@ $(STATIC_TARGET):	$(LIBRARY_OBJECTS)
 $(DYNAMIC_TARGET):	$(LIBRARY_OBJECTS)
 	$(CXX) $(DYNAMIC_LDFLAGS) $^ -o $@ $(LIBRARY_LIBS) $(LDFLAGS)
 
-$(VAMP_TARGET):		$(LIBRARY_OBJECTS) $(VAMP_OBJECTS)
-	$(CXX) $(DYNAMIC_LDFLAGS) -o $@ $^ $(VAMP_PLUGIN_LIBS) $(LDFLAGS)
-
-$(LADSPA_TARGET):	$(LIBRARY_OBJECTS) $(LADSPA_OBJECTS)
-	$(CXX) $(DYNAMIC_LDFLAGS) -o $@ $^ $(LADSPA_PLUGIN_LIBS) $(LDFLAGS)
-
 bin:
 	$(MKDIR) $@
 lib:
 	$(MKDIR) $@
 
+install:	all
+	$(MKDIR) -p $(DESTDIR)$(INSTALL_BINDIR)
+	$(MKDIR) -p $(DESTDIR)$(INSTALL_INCDIR)
+	$(MKDIR) -p $(DESTDIR)$(INSTALL_LIBDIR)
+	$(MKDIR) -p $(DESTDIR)$(INSTALL_PKGDIR)
+	cp $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR)
+	cp $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)
+	rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION)
+	rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)
+	cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION)
+	test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION)
+	test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)
+	sed "s,%PREFIX%,/usr/local," rubberband.pc.in \
+	  > $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc
+
 clean:
-	rm -f $(LIBRARY_OBJECTS) $(PROGRAM_OBJECTS) $(LADSPA_OBJECTS) $(VAMP_OBJECTS)
+	rm -f $(LIBRARY_OBJECTS)
 
 distclean:	clean
-	rm -f $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET)
+	rm -f $(STATIC_TARGET) $(DYNAMIC_TARGET)
 
 depend:
-	makedepend -Y $(LIBRARY_SOURCES) $(PROGRAM_SOURCES)
+	makedepend -Y $(LIBRARY_SOURCES)
 
 
 # DO NOT DELETE
@@ -127,12 +117,12 @@ depend:
 src/rubberband-c.o: rubberband/rubberband-c.h
 src/rubberband-c.o: rubberband/RubberBandStretcher.h
 src/RubberBandStretcher.o: src/StretcherImpl.h
-src/RubberBandStretcher.o: rubberband/RubberBandStretcher.h src/dsp/Window.h
+src/RubberBandStretcher.o: rubberband/RubberBandStretcher.h src/dsp/Window.h src/dsp/SincWindow.h
 src/RubberBandStretcher.o: src/dsp/FFT.h src/base/RingBuffer.h
 src/RubberBandStretcher.o: src/base/Scavenger.h src/system/Thread.h
 src/RubberBandStretcher.o: src/system/Thread.h src/system/sysutils.h
 src/StretcherProcess.o: src/StretcherImpl.h rubberband/RubberBandStretcher.h
-src/StretcherProcess.o: src/dsp/Window.h src/dsp/FFT.h src/base/RingBuffer.h
+src/StretcherProcess.o: src/dsp/Window.h src/dsp/SincWindow.h src/dsp/FFT.h src/base/RingBuffer.h
 src/StretcherProcess.o: src/base/Scavenger.h src/system/Thread.h
 src/StretcherProcess.o: src/system/Thread.h src/system/sysutils.h
 src/StretcherProcess.o: src/dsp/PercussiveAudioCurve.h
@@ -150,7 +140,7 @@ src/dsp/AudioCurveCalculator.o: src/system/sysutils.h
 src/dsp/SpectralDifferenceAudioCurve.o: src/dsp/SpectralDifferenceAudioCurve.h
 src/dsp/SpectralDifferenceAudioCurve.o: src/dsp/AudioCurveCalculator.h
 src/dsp/SpectralDifferenceAudioCurve.o: src/system/sysutils.h
-src/dsp/SpectralDifferenceAudioCurve.o: src/dsp/Window.h
+src/dsp/SpectralDifferenceAudioCurve.o: src/dsp/Window.h src/dsp/SincWindow.h
 src/dsp/SpectralDifferenceAudioCurve.o: src/system/VectorOps.h
 src/dsp/SpectralDifferenceAudioCurve.o: src/system/sysutils.h
 src/dsp/HighFrequencyAudioCurve.o: src/dsp/HighFrequencyAudioCurve.h
@@ -175,19 +165,19 @@ src/system/Allocators.o: src/system/Allocators.h src/system/VectorOps.h
 src/system/Allocators.o: src/system/sysutils.h
 src/system/sysutils.o: src/system/sysutils.h
 src/StretcherChannelData.o: src/StretcherChannelData.h src/StretcherImpl.h
-src/StretcherChannelData.o: rubberband/RubberBandStretcher.h src/dsp/Window.h
+src/StretcherChannelData.o: rubberband/RubberBandStretcher.h src/dsp/Window.h src/dsp/SincWindow.h
 src/StretcherChannelData.o: src/dsp/FFT.h src/base/RingBuffer.h
 src/StretcherChannelData.o: src/base/Scavenger.h src/system/Thread.h
 src/StretcherChannelData.o: src/system/Thread.h src/system/sysutils.h
 src/StretcherChannelData.o: src/dsp/Resampler.h src/system/Allocators.h
 src/StretcherChannelData.o: src/system/VectorOps.h src/system/sysutils.h
 src/StretcherImpl.o: src/StretcherImpl.h rubberband/RubberBandStretcher.h
-src/StretcherImpl.o: src/dsp/Window.h src/dsp/FFT.h src/base/RingBuffer.h
+src/StretcherImpl.o: src/dsp/Window.h src/dsp/SincWindow.h src/dsp/FFT.h src/base/RingBuffer.h
 src/StretcherImpl.o: src/base/Scavenger.h src/system/Thread.h src/system/Thread.h
 src/StretcherImpl.o: src/system/sysutils.h src/dsp/PercussiveAudioCurve.h
 src/StretcherImpl.o: src/dsp/AudioCurveCalculator.h
 src/StretcherImpl.o: src/dsp/HighFrequencyAudioCurve.h
-src/StretcherImpl.o: src/dsp/SpectralDifferenceAudioCurve.h src/dsp/Window.h
+src/StretcherImpl.o: src/dsp/SpectralDifferenceAudioCurve.h src/dsp/Window.h src/dsp/SincWindow.h
 src/StretcherImpl.o: src/system/VectorOps.h src/system/sysutils.h
 src/StretcherImpl.o: src/dsp/SilentAudioCurve.h src/dsp/ConstantAudioCurve.h
 src/StretcherImpl.o: src/dsp/Resampler.h src/StretchCalculator.h

rubberband/RubberBandStretcher.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -15,9 +15,9 @@
 #ifndef _RUBBERBANDSTRETCHER_H_
 #define _RUBBERBANDSTRETCHER_H_
     
-#define RUBBERBAND_VERSION "1.5.0-gpl"
+#define RUBBERBAND_VERSION "1.6-gpl"
 #define RUBBERBAND_API_MAJOR_VERSION 2
-#define RUBBERBAND_API_MINOR_VERSION 3
+#define RUBBERBAND_API_MINOR_VERSION 4
 
 #include <vector>
 #include <map>

rubberband/rubberband-c.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -19,9 +19,9 @@
 extern "C" {
 #endif
 
-#define RUBBERBAND_VERSION "1.5.0-gpl"
+#define RUBBERBAND_VERSION "1.6-gpl"
 #define RUBBERBAND_API_MAJOR_VERSION 2
-#define RUBBERBAND_API_MINOR_VERSION 3
+#define RUBBERBAND_API_MINOR_VERSION 4
 
 /**
  * This is a C-linkage interface to the Rubber Band time stretcher.

src/RubberBandStretcher.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/StretchCalculator.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/StretchCalculator.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/StretcherChannelData.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -63,30 +63,38 @@ RubberBandStretcher::Impl::ChannelData::construct(const std::set<size_t> &sizes,
     inbuf = new RingBuffer<float>(maxSize);
     outbuf = new RingBuffer<float>(outbufSize);
 
-    mag = allocate<double>(realSize);
+    mag = allocate_and_zero<process_t>(realSize);
-    phase = allocate<double>(realSize);
+    phase = allocate_and_zero<process_t>(realSize);
-    prevPhase = allocate<double>(realSize);
+    prevPhase = allocate_and_zero<process_t>(realSize);
-    prevError = allocate<double>(realSize);
+    prevError = allocate_and_zero<process_t>(realSize);
-    unwrappedPhase = allocate<double>(realSize);
+    unwrappedPhase = allocate_and_zero<process_t>(realSize);
-    envelope = allocate<double>(realSize);
+    envelope = allocate_and_zero<process_t>(realSize);
 
     freqPeak = new size_t[realSize];
 
-    fltbuf = allocate<float>(maxSize);
+    fltbuf = allocate_and_zero<float>(maxSize);
 
-    accumulator = allocate<float>(maxSize);
+    accumulator = allocate_and_zero<float>(maxSize);
-    windowAccumulator = allocate<float>(maxSize);
+    windowAccumulator = allocate_and_zero<float>(maxSize);
-    interpolator = allocate<float>(maxSize);
+    interpolator = allocate_and_zero<float>(maxSize);
     interpolatorScale = 0;
 
     for (std::set<size_t>::const_iterator i = sizes.begin();
          i != sizes.end(); ++i) {
         ffts[*i] = new FFT(*i);
+        if (sizeof(process_t) == sizeof(double)) {
             ffts[*i]->initDouble();
+        } else {
+            ffts[*i]->initFloat();
+        }
     }
     fft = ffts[initialFftSize];
 
-    dblbuf = fft->getDoubleTimeBuffer();
+    if (sizeof(process_t) == sizeof(double)) {
+        dblbuf = (process_t *)fft->getDoubleTimeBuffer();
+    } else {
+        dblbuf = (process_t *)fft->getFloatTimeBuffer();
+    }
 
     resampler = 0;
     resamplebuf = 0;
@@ -132,25 +140,29 @@ RubberBandStretcher::Impl::ChannelData::setSizes(size_t windowSize,
             //!!! this also requires a lock, but it shouldn't occur in
             //RT mode with proper initialisation
             ffts[fftSize] = new FFT(fftSize);
+            if (sizeof(process_t) == sizeof(double)) {
                 ffts[fftSize]->initDouble();
+            } else {
+                ffts[fftSize]->initFloat();
+            }
         }
         
         fft = ffts[fftSize];
 
-        dblbuf = fft->getDoubleTimeBuffer();
+        if (sizeof(process_t) == sizeof(double)) {
-
+            dblbuf = (process_t *)fft->getDoubleTimeBuffer();
-        for (size_t i = 0; i < maxSize; ++i) {
+        } else {
-            dblbuf[i] = 0.0;
+            dblbuf = (process_t *)fft->getFloatTimeBuffer();
         }
 
-        for (size_t i = 0; i < realSize; ++i) {
+        v_zero(dblbuf, maxSize);
-            mag[i] = 0.0;
+
-            phase[i] = 0.0;
+        v_zero(mag, realSize);
-            prevPhase[i] = 0.0;
+        v_zero(phase, realSize);
-            prevError[i] = 0.0;
+        v_zero(prevPhase, realSize);
-            unwrappedPhase[i] = 0.0;
+        v_zero(prevError, realSize);
-            freqPeak[i] = 0;
+        v_zero(unwrappedPhase, realSize);
-        }
+        v_zero(freqPeak, realSize);
 
         return;
     }
@@ -168,29 +180,29 @@ RubberBandStretcher::Impl::ChannelData::setSizes(size_t windowSize,
 
     // We don't want to preserve data in these arrays
 
-    mag = reallocate<double>(mag, oldMax, realSize);
+    mag = reallocate_and_zero<process_t>(mag, oldMax, realSize);
-    phase = reallocate<double>(phase, oldMax, realSize);
+    phase = reallocate_and_zero<process_t>(phase, oldMax, realSize);
-    prevPhase = reallocate<double>(prevPhase, oldMax, realSize);
+    prevPhase = reallocate_and_zero<process_t>(prevPhase, oldMax, realSize);
-    prevError = reallocate<double>(prevError, oldMax, realSize);
+    prevError = reallocate_and_zero<process_t>(prevError, oldMax, realSize);
-    unwrappedPhase = reallocate<double>(unwrappedPhase, oldMax, realSize);
+    unwrappedPhase = reallocate_and_zero<process_t>(unwrappedPhase, oldMax, realSize);
-    envelope = reallocate<double>(envelope, oldMax, realSize);
+    envelope = reallocate_and_zero<process_t>(envelope, oldMax, realSize);
 
     delete[] freqPeak;
     freqPeak = new size_t[realSize];
 
     deallocate(fltbuf);
-    fltbuf = allocate<float>(maxSize);
+    fltbuf = allocate_and_zero<float>(maxSize);
 
     // But we do want to preserve data in these
 
-    float *newAcc = allocate<float>(maxSize);
+    float *newAcc = allocate_and_zero<float>(maxSize);
 
     v_copy(newAcc, accumulator, oldMax);
 
     deallocate(accumulator);
     accumulator = newAcc;
 
-    newAcc = allocate<float>(maxSize);
+    newAcc = allocate_and_zero<float>(maxSize);
 
     v_copy(newAcc, windowAccumulator, oldMax);
 
@@ -201,26 +213,24 @@ RubberBandStretcher::Impl::ChannelData::setSizes(size_t windowSize,
     
     //!!! and resampler?
 
-    for (size_t i = 0; i < realSize; ++i) {
-        freqPeak[i] = 0;
-    }
-
-    for (size_t i = 0; i < maxSize; ++i) {
-        fltbuf[i] = 0.f;
-    }
-
     if (ffts.find(fftSize) == ffts.end()) {
         ffts[fftSize] = new FFT(fftSize);
+        if (sizeof(process_t) == sizeof(double)) {
             ffts[fftSize]->initDouble();
+        } else {
+            ffts[fftSize]->initFloat();
+        }
     }
     
     fft = ffts[fftSize];
 
-    dblbuf = fft->getDoubleTimeBuffer();
+    if (sizeof(process_t) == sizeof(double)) {
-
+        dblbuf = (process_t *)fft->getDoubleTimeBuffer();
-    for (size_t i = 0; i < fftSize; ++i) {
+    } else {
-        dblbuf[i] = 0.0;
+        dblbuf = (process_t *)fft->getFloatTimeBuffer();
     }
+
+    v_zero(dblbuf, fftSize);
 }
 
 void
@@ -244,7 +254,7 @@ RubberBandStretcher::Impl::ChannelData::setOutbufSize(size_t outbufSize)
 void
 RubberBandStretcher::Impl::ChannelData::setResampleBufSize(size_t sz)
 {
-    resamplebuf = reallocate<float>(resamplebuf, resamplebufSize, sz);
+    resamplebuf = reallocate_and_zero<float>(resamplebuf, resamplebufSize, sz);
     resamplebufSize = sz;
 }
 

src/StretcherChannelData.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -92,12 +92,12 @@ public:
     RingBuffer<float> *inbuf;
     RingBuffer<float> *outbuf;
 
-    double *mag;
+    process_t *mag;
-    double *phase;
+    process_t *phase;
 
-    double *prevPhase;
+    process_t *prevPhase;
-    double *prevError;
+    process_t *prevError;
-    double *unwrappedPhase;
+    process_t *unwrappedPhase;
 
     size_t *freqPeak;
 
@@ -108,8 +108,8 @@ public:
     int interpolatorScale;
 
     float *fltbuf;
-    double *dblbuf; // owned by FFT object, only used for time domain FFT i/o
+    process_t *dblbuf; // owned by FFT object, only used for time domain FFT i/o
-    double *envelope; // for cepstral formant shift
+    process_t *envelope; // for cepstral formant shift
     bool unchanged;
 
     size_t prevIncrement; // only used in RT mode

src/StretcherImpl.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/StretcherImpl.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -33,6 +33,8 @@ using namespace RubberBand;
 namespace RubberBand
 {
 
+typedef double process_t;
+
 class AudioCurveCalculator;
 class StretchCalculator;
 
@@ -119,9 +121,9 @@ protected:
     
     size_t roundUp(size_t value); // to next power of two
 
-    template <typename T>
+    template <typename T, typename S>
     void cutShiftAndFold(T *target, int targetSize,
-                         float *src, // destructive to src
+                         S *src, // destructive to src
                          Window<float> *window) {
         window->cut(src);
         const int windowSize = window->getSize();

src/StretcherProcess.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -491,20 +491,30 @@ RubberBandStretcher::Impl::calculateIncrements(size_t &phaseIncrementRtn,
 
     if (m_channels == 1) {
 
-        df = m_phaseResetAudioCurve->processDouble(cd.mag, m_increment);
+        if (sizeof(process_t) == sizeof(double)) {
-        silent = (m_silentAudioCurve->processDouble(cd.mag, m_increment) > 0.f);
+            df = m_phaseResetAudioCurve->processDouble((double *)cd.mag, m_increment);
+            silent = (m_silentAudioCurve->processDouble((double *)cd.mag, m_increment) > 0.f);
+        } else {
+            df = m_phaseResetAudioCurve->processFloat((float *)cd.mag, m_increment);
+            silent = (m_silentAudioCurve->processFloat((float *)cd.mag, m_increment) > 0.f);
+        }
 
     } else {
 
-        double *tmp = (double *)alloca(hs * sizeof(double));
+        process_t *tmp = (process_t *)alloca(hs * sizeof(process_t));
 
         v_zero(tmp, hs);
         for (size_t c = 0; c < m_channels; ++c) {
             v_add(tmp, m_channelData[c]->mag, hs);
         }
 
-        df = m_phaseResetAudioCurve->processDouble(tmp, m_increment);
+        if (sizeof(process_t) == sizeof(double)) {
-        silent = (m_silentAudioCurve->processDouble(tmp, m_increment) > 0.f);
+            df = m_phaseResetAudioCurve->processDouble((double *)tmp, m_increment);
+            silent = (m_silentAudioCurve->processDouble((double *)tmp, m_increment) > 0.f);
+        } else {
+            df = m_phaseResetAudioCurve->processFloat((float *)tmp, m_increment);
+            silent = (m_silentAudioCurve->processFloat((float *)tmp, m_increment) > 0.f);
+        }
     }
 
     int incr = m_stretchCalculator->calculateSingle
@@ -634,16 +644,11 @@ RubberBandStretcher::Impl::analyseChunk(size_t channel)
 {
     Profiler profiler("RubberBandStretcher::Impl::analyseChunk");
 
-    int i;
-
     ChannelData &cd = *m_channelData[channel];
 
-    double *const R__ dblbuf = cd.dblbuf;
+    process_t *const R__ dblbuf = cd.dblbuf;
     float *const R__ fltbuf = cd.fltbuf;
 
-//!!!    int sz = m_fftSize;
-//    int hs = sz / 2;
-
     // cd.fltbuf is known to contain m_aWindowSize samples
 
     if (m_aWindowSize > m_fftSize) {
@@ -668,7 +673,7 @@ RubberBandStretcher::Impl::modifyChunk(size_t channel,
         cerr << "phase reset: leaving phases unmodified" << endl;
     }
 
-    const double rate = m_sampleRate;
+    const process_t rate = m_sampleRate;
     const int count = m_fftSize / 2;
 
     bool unchanged = cd.unchanged && (outputIncrement == m_increment);
@@ -701,15 +706,15 @@ RubberBandStretcher::Impl::modifyChunk(size_t channel,
     if (limit1 < limit0) limit1 = limit0;
     if (limit2 < limit1) limit2 = limit1;
     
-    double prevInstability = 0.0;
+    process_t prevInstability = 0.0;
     bool prevDirection = false;
 
-    double distance = 0.0;
+    process_t distance = 0.0;
-    const double maxdist = 8.0;
+    const process_t maxdist = 8.0;
 
     const int lookback = 1;
 
-    double distacc = 0.0;
+    process_t distacc = 0.0;
 
     for (int i = count; i >= 0; i -= lookback) {
 
@@ -724,24 +729,24 @@ RubberBandStretcher::Impl::modifyChunk(size_t channel,
             }
         }
 
-        double p = cd.phase[i];
+        process_t p = cd.phase[i];
-        double perr = 0.0;
+        process_t perr = 0.0;
-        double outphase = p;
+        process_t outphase = p;
 
-        double mi = maxdist;
+        process_t mi = maxdist;
         if (i <= limit0) mi = 0.0;
         else if (i <= limit1) mi = 1.0;
         else if (i <= limit2) mi = 3.0;
 
         if (!resetThis) {
 
-            double omega = (2 * M_PI * m_increment * i) / (m_fftSize);
+            process_t omega = (2 * M_PI * m_increment * i) / (m_fftSize);
 
-            double pp = cd.prevPhase[i];
+            process_t pp = cd.prevPhase[i];
-            double ep = pp + omega;
+            process_t ep = pp + omega;
             perr = princarg(p - ep);
 
-            double instability = fabs(perr - cd.prevError[i]);
+            process_t instability = fabs(perr - cd.prevError[i]);
             bool direction = (perr > cd.prevError[i]);
 
             bool inherit = false;
@@ -757,10 +762,10 @@ RubberBandStretcher::Impl::modifyChunk(size_t channel,
                 }
             }
 
-            double advance = outputIncrement * ((omega + perr) / m_increment);
+            process_t advance = outputIncrement * ((omega + perr) / m_increment);
 
             if (inherit) {
-                double inherited =
+                process_t inherited =
                     cd.unwrappedPhase[i + lookback] - cd.prevPhase[i + lookback];
                 advance = ((advance * distance) +
                            (inherited * (maxdist - distance)))
@@ -806,18 +811,16 @@ RubberBandStretcher::Impl::formantShiftChunk(size_t channel)
 
     ChannelData &cd = *m_channelData[channel];
 
-    double *const R__ mag = cd.mag;
+    process_t *const R__ mag = cd.mag;
-    double *const R__ envelope = cd.envelope;
+    process_t *const R__ envelope = cd.envelope;
-    double *const R__ dblbuf = cd.dblbuf;
+    process_t *const R__ dblbuf = cd.dblbuf;
 
     const int sz = m_fftSize;
     const int hs = sz / 2;
-    const double factor = 1.0 / sz;
+    const process_t factor = 1.0 / sz;
 
     cd.fft->inverseCepstral(mag, dblbuf);
 
-    v_scale(dblbuf, factor, sz);
-
     const int cutoff = m_sampleRate / 700;
 
 //    cerr <<"cutoff = "<< cutoff << ", m_sampleRate/cutoff = " << m_sampleRate/cutoff << endl;
@@ -829,6 +832,8 @@ RubberBandStretcher::Impl::formantShiftChunk(size_t channel)
         dblbuf[i] = 0.0;
     }
 
+    v_scale(dblbuf, factor, cutoff);
+
     cd.fft->forward(dblbuf, envelope, 0);
 
     v_exp(envelope, hs + 1);
@@ -838,7 +843,7 @@ RubberBandStretcher::Impl::formantShiftChunk(size_t channel)
         // scaling up, we want a new envelope that is lower by the pitch factor
         for (int target = 0; target <= hs; ++target) {
             int source = lrint(target * m_pitchScale);
-            if (source > sz) {
+            if (source > hs) {
                 envelope[target] = 0.0;
             } else {
                 envelope[target] = envelope[source];
@@ -872,7 +877,7 @@ RubberBandStretcher::Impl::synthesiseChunk(size_t channel,
 
     ChannelData &cd = *m_channelData[channel];
 
-    double *const R__ dblbuf = cd.dblbuf;
+    process_t *const R__ dblbuf = cd.dblbuf;
     float *const R__ fltbuf = cd.fltbuf;
     float *const R__ accumulator = cd.accumulator;
     float *const R__ windowAccumulator = cd.windowAccumulator;
@@ -882,8 +887,6 @@ RubberBandStretcher::Impl::synthesiseChunk(size_t channel,
 
     const int wsz = m_sWindowSize;
     
-    int i;
-
     if (!cd.unchanged) {
 
         cd.fft->inversePolar(cd.mag, cd.phase, cd.dblbuf);
@@ -938,8 +941,6 @@ RubberBandStretcher::Impl::writeChunk(size_t channel, size_t shiftIncrement, boo
     const int sz = m_sWindowSize;
     const int si = shiftIncrement;
 
-    int i;
-    
     if (m_debugLevel > 2) {
         cerr << "writeChunk(" << channel << ", " << shiftIncrement << ", " << last << ")" << endl;
     }

src/base/Profiler.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/base/Profiler.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -16,14 +16,17 @@
 #define _PROFILER_H_
 
 //#define NO_TIMING 1
-
 //#define WANT_TIMING 1
 //#define PROFILE_CLOCKS 1
 
+// Define NO_TIMING or NDEBUG to switch off profilers
 #ifdef NDEBUG
-#ifndef WANT_TIMING
 #define NO_TIMING 1
 #endif
+
+// But we always allow WANT_TIMING to switch them back on again
+#ifdef WANT_TIMING
+#undef NO_TIMING
 #endif
 
 #ifndef NO_TIMING

src/base/RingBuffer.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -103,8 +103,13 @@ public:
      * Read n samples from the buffer, for reader R.  If fewer than n
      * are available, the remainder will be zeroed out.  Returns the
      * number of samples actually read.
+     *
+     * This is a template function, taking an argument S for the target
+     * sample type, which is permitted to differ from T if the two
+     * types are compatible for assignment.
      */
-    int read(T *const R__ destination, int n, int R = 0);
+    template <typename S>
+    int read(S *const R__ destination, int n, int R = 0);
 
     /**
      * Read n samples from the buffer, for reader R, adding them to
@@ -152,8 +157,13 @@ public:
      * Write n samples to the buffer.  If insufficient space is
      * available, not all samples may actually be written.  Returns
      * the number of samples actually written.
+     *
+     * This is a template function, taking an argument S for the source
+     * sample type, which is permitted to differ from T if the two
+     * types are compatible for assignment.
      */
-    int write(const T *const R__ source, int n);
+    template <typename S>
+    int write(const S *const R__ source, int n);
 
     /**
      * Write n zero-value samples to the buffer.  If insufficient
@@ -341,8 +351,9 @@ RingBuffer<T, N>::getWriteSpace() const
 }
 
 template <typename T, int N>
+template <typename S>
 int
-RingBuffer<T, N>::read(T *const R__ destination, int n, int R)
+RingBuffer<T, N>::read(S *const R__ destination, int n, int R)
 {
 #ifdef DEBUG_RINGBUFFER
     std::cerr << "RingBuffer<T," << N << ">[" << this << "]::read(dest, " << n << ", " << R << ")" << std::endl;
@@ -355,7 +366,7 @@ RingBuffer<T, N>::read(T *const R__ destination, int n, int R)
 		  << std::endl;
 #endif
         for (int i = available; i < n; ++i) {
-            destination[i] = 0;
+            destination[i] = S(0);
         }
 	n = available;
     }
@@ -366,10 +377,10 @@ RingBuffer<T, N>::read(T *const R__ destination, int n, int R)
     T *const R__ bufbase = m_buffer + reader;
 
     if (here >= n) {
-        v_copy(destination, bufbase, n);
+        v_convert<T, S>(destination, bufbase, n);
     } else {
-        v_copy(destination, bufbase, here);
+        v_convert<T, S>(destination, bufbase, here);
-        v_copy(destination + here, m_buffer, n - here);
+        v_convert<T, S>(destination + here, m_buffer, n - here);
     }
 
     reader += n;
@@ -522,8 +533,9 @@ RingBuffer<T, N>::skip(int n, int R)
 }
 
 template <typename T, int N>
+template <typename S>
 int
-RingBuffer<T, N>::write(const T *const R__ source, int n)
+RingBuffer<T, N>::write(const S *const R__ source, int n)
 {
 #ifdef DEBUG_RINGBUFFER
     std::cerr << "RingBuffer<T," << N << ">[" << this << "]::write(" << n << ")" << std::endl;
@@ -544,10 +556,10 @@ RingBuffer<T, N>::write(const T *const R__ source, int n)
     T *const R__ bufbase = m_buffer + writer;
 
     if (here >= n) {
-        v_copy(bufbase, source, n);
+        v_convert<S, T>(bufbase, source, n);
     } else {
-        v_copy(bufbase, source, here);
+        v_convert<S, T>(bufbase, source, here);
-        v_copy(m_buffer, source + here, n - here);
+        v_convert<S, T>(m_buffer, source + here, n - here);
     }
 
     writer += n;

src/base/Scavenger.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -17,6 +17,7 @@
 
 #include <vector>
 #include <list>
+#include <utility>
 #include <iostream>
 
 #ifndef WIN32

src/dsp/AudioCurveCalculator.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/AudioCurveCalculator.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/CompoundAudioCurve.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/CompoundAudioCurve.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/ConstantAudioCurve.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/ConstantAudioCurve.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/FFT.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -59,18 +59,22 @@ public:
     virtual void initDouble() = 0;
 
     virtual void forward(const double *R__ realIn, double *R__ realOut, double *R__ imagOut) = 0;
+    virtual void forwardInterleaved(const double *R__ realIn, double *R__ complexOut) = 0;
     virtual void forwardPolar(const double *R__ realIn, double *R__ magOut, double *R__ phaseOut) = 0;
     virtual void forwardMagnitude(const double *R__ realIn, double *R__ magOut) = 0;
 
     virtual void forward(const float *R__ realIn, float *R__ realOut, float *R__ imagOut) = 0;
+    virtual void forwardInterleaved(const float *R__ realIn, float *R__ complexOut) = 0;
     virtual void forwardPolar(const float *R__ realIn, float *R__ magOut, float *R__ phaseOut) = 0;
     virtual void forwardMagnitude(const float *R__ realIn, float *R__ magOut) = 0;
 
     virtual void inverse(const double *R__ realIn, const double *R__ imagIn, double *R__ realOut) = 0;
+    virtual void inverseInterleaved(const double *R__ complexIn, double *R__ realOut) = 0;
     virtual void inversePolar(const double *R__ magIn, const double *R__ phaseIn, double *R__ realOut) = 0;
     virtual void inverseCepstral(const double *R__ magIn, double *R__ cepOut) = 0;
 
     virtual void inverse(const float *R__ realIn, const float *R__ imagIn, float *R__ realOut) = 0;
+    virtual void inverseInterleaved(const float *R__ complexIn, float *R__ realOut) = 0;
     virtual void inversePolar(const float *R__ magIn, const float *R__ phaseIn, float *R__ realOut) = 0;
     virtual void inverseCepstral(const float *R__ magIn, float *R__ cepOut) = 0;
 
@@ -162,10 +166,9 @@ public:
 
     ~D_FFTW() {
         if (m_fplanf) {
+            m_commonMutex.lock();
             bool save = false;
-            m_extantMutex.lock();
             if (m_extantf > 0 && --m_extantf == 0) save = true;
-            m_extantMutex.unlock();
 #ifndef FFTW_DOUBLE_ONLY
             if (save) saveWisdom('f');
 #endif
@@ -176,12 +179,12 @@ public:
 #ifdef FFTW_DOUBLE_ONLY
             if (m_frb) fftw_free(m_frb);
 #endif
+            m_commonMutex.unlock();
         }
         if (m_dplanf) {
+            m_commonMutex.lock();
             bool save = false;
-            m_extantMutex.lock();
             if (m_extantd > 0 && --m_extantd == 0) save = true;
-            m_extantMutex.unlock();
 #ifndef FFTW_FLOAT_ONLY
             if (save) saveWisdom('d');
 #endif
@@ -192,15 +195,15 @@ public:
 #ifdef FFTW_FLOAT_ONLY
             if (m_drb) fftwf_free(m_drb);
 #endif
+            m_commonMutex.unlock();
         }
     }
 
     void initFloat() {
         if (m_fplanf) return;
         bool load = false;
-        m_extantMutex.lock();
+        m_commonMutex.lock();
         if (m_extantf++ == 0) load = true;
-        m_extantMutex.unlock();
 #ifdef FFTW_DOUBLE_ONLY
         if (load) loadWisdom('d');
 #else
@@ -213,14 +216,14 @@ public:
             (m_size, m_fbuf, m_fpacked, FFTW_MEASURE);
         m_fplani = fftwf_plan_dft_c2r_1d
             (m_size, m_fpacked, m_fbuf, FFTW_MEASURE);
+        m_commonMutex.unlock();
     }
 
     void initDouble() {
         if (m_dplanf) return;
         bool load = false;
-        m_extantMutex.lock();
+        m_commonMutex.lock();
         if (m_extantd++ == 0) load = true;
-        m_extantMutex.unlock();
 #ifdef FFTW_FLOAT_ONLY
         if (load) loadWisdom('f');
 #else
@@ -233,6 +236,7 @@ public:
             (m_size, m_dbuf, m_dpacked, FFTW_MEASURE);
         m_dplani = fftw_plan_dft_c2r_1d
             (m_size, m_dpacked, m_dbuf, FFTW_MEASURE);
+        m_commonMutex.unlock();
     }
 
     void loadWisdom(char type) { wisdom(false, type); }
@@ -361,6 +365,20 @@ public:
         unpackDouble(realOut, imagOut);
     }
 
+    void forwardInterleaved(const double *R__ realIn, double *R__ complexOut) {
+        if (!m_dplanf) initDouble();
+        const int sz = m_size;
+        fft_double_type *const R__ dbuf = m_dbuf;
+#ifndef FFTW_FLOAT_ONLY
+        if (realIn != dbuf) 
+#endif
+            for (int i = 0; i < sz; ++i) {
+                dbuf[i] = realIn[i];
+            }
+        fftw_execute(m_dplanf);
+        v_convert(complexOut, (fft_double_type *)m_dpacked, sz + 2);
+    }
+
     void forwardPolar(const double *R__ realIn, double *R__ magOut, double *R__ phaseOut) {
         if (!m_dplanf) initDouble();
         fft_double_type *const R__ dbuf = m_dbuf;
@@ -414,6 +432,20 @@ public:
         unpackFloat(realOut, imagOut);
     }
 
+    void forwardInterleaved(const float *R__ realIn, float *R__ complexOut) {
+        if (!m_fplanf) initFloat();
+        fft_float_type *const R__ fbuf = m_fbuf;
+        const int sz = m_size;
+#ifndef FFTW_DOUBLE_ONLY
+        if (realIn != fbuf)
+#endif
+            for (int i = 0; i < sz; ++i) {
+                fbuf[i] = realIn[i];
+            }
+        fftwf_execute(m_fplanf);
+        v_convert(complexOut, (fft_float_type *)m_fpacked, sz + 2);
+    }
+
     void forwardPolar(const float *R__ realIn, float *R__ magOut, float *R__ phaseOut) {
         if (!m_fplanf) initFloat();
         fft_float_type *const R__ fbuf = m_fbuf;
@@ -467,6 +499,20 @@ public:
             }
     }
 
+    void inverseInterleaved(const double *R__ complexIn, double *R__ realOut) {
+        if (!m_dplanf) initDouble();
+        v_copy((double *)m_dpacked, complexIn, m_size + 2);
+        fftw_execute(m_dplani);
+        const int sz = m_size;
+        fft_double_type *const R__ dbuf = m_dbuf;
+#ifndef FFTW_FLOAT_ONLY
+        if (realOut != dbuf) 
+#endif
+            for (int i = 0; i < sz; ++i) {
+                realOut[i] = dbuf[i];
+            }
+    }
+
     void inversePolar(const double *R__ magIn, const double *R__ phaseIn, double *R__ realOut) {
         if (!m_dplanf) initDouble();
         const int hs = m_size/2;
@@ -523,6 +569,20 @@ public:
             }
     }
 
+    void inverseInterleaved(const float *R__ complexIn, float *R__ realOut) {
+        if (!m_fplanf) initFloat();
+        v_copy((float *)m_fpacked, complexIn, m_size + 2);
+        fftwf_execute(m_fplani);
+        const int sz = m_size;
+        fft_float_type *const R__ fbuf = m_fbuf;
+#ifndef FFTW_DOUBLE_ONLY
+        if (realOut != fbuf)
+#endif
+            for (int i = 0; i < sz; ++i) {
+                realOut[i] = fbuf[i];
+            }
+    }
+
     void inversePolar(const float *R__ magIn, const float *R__ phaseIn, float *R__ realOut) {
         if (!m_fplanf) initFloat();
         const int hs = m_size/2;
@@ -607,7 +667,7 @@ private:
     const int m_size;
     static int m_extantf;
     static int m_extantd;
-    static Mutex m_extantMutex;
+    static Mutex m_commonMutex;
 };
 
 int
@@ -617,7 +677,7 @@ int
 D_FFTW::m_extantd = 0;
 
 Mutex
-D_FFTW::m_extantMutex;
+D_FFTW::m_commonMutex;
 
 #endif /* HAVE_FFTW3 */
 
@@ -720,14 +780,18 @@ public:
 
     void forward(const double *R__ realIn, double *R__ realOut, double *R__ imagOut) {
 
-        for (int i = 0; i < m_size; ++i) {
+        v_convert(m_fbuf, realIn, m_size);
-            m_fbuf[i] = float(realIn[i]);
-        }
-
         kiss_fftr(m_fplanf, m_fbuf, m_fpacked);
         unpackDouble(realOut, imagOut);
     }
 
+    void forwardInterleaved(const double *R__ realIn, double *R__ complexOut) {
+
+        v_convert(m_fbuf, realIn, m_size);
+        kiss_fftr(m_fplanf, m_fbuf, m_fpacked);
+        v_convert(complexOut, (float *)m_fpacked, m_size + 2);
+    }
+
     void forwardPolar(const double *R__ realIn, double *R__ magOut, double *R__ phaseOut) {
 
         for (int i = 0; i < m_size; ++i) {
@@ -770,6 +834,11 @@ public:
         unpackFloat(realOut, imagOut);
     }
 
+    void forwardInterleaved(const float *R__ realIn, float *R__ complexOut) {
+
+        kiss_fftr(m_fplanf, realIn, (kiss_fft_cpx *)complexOut);
+    }
+
     void forwardPolar(const float *R__ realIn, float *R__ magOut, float *R__ phaseOut) {
 
         kiss_fftr(m_fplanf, realIn, m_fpacked);
@@ -809,6 +878,17 @@ public:
         }
     }
 
+    void inverseInterleaved(const double *R__ complexIn, double *R__ realOut) {
+
+        v_convert((float *)m_fpacked, complexIn, m_size + 2);
+
+        kiss_fftri(m_fplani, m_fpacked, m_fbuf);
+
+        for (int i = 0; i < m_size; ++i) {
+            realOut[i] = m_fbuf[i];
+        }
+    }
+
     void inversePolar(const double *R__ magIn, const double *R__ phaseIn, double *R__ realOut) {
 
         const int hs = m_size/2;
@@ -847,6 +927,12 @@ public:
         kiss_fftri(m_fplani, m_fpacked, realOut);
     }
 
+    void inverseInterleaved(const float *R__ complexIn, float *R__ realOut) {
+
+        v_copy((float *)m_fpacked, complexIn, m_size + 2);
+        kiss_fftri(m_fplani, m_fpacked, realOut);
+    }
+
     void inversePolar(const float *R__ magIn, const float *R__ phaseIn, float *R__ realOut) {
 
         const int hs = m_size/2;
@@ -952,6 +1038,13 @@ public:
         }
     }
 
+    void forwardInterleaved(const double *R__ realIn, double *R__ complexOut) {
+        basefft(false, realIn, 0, m_c, m_d);
+        const int hs = m_size/2;
+        for (int i = 0; i <= hs; ++i) complexOut[i*2] = m_c[i];
+        for (int i = 0; i <= hs; ++i) complexOut[i*2+1] = m_d[i];
+    }
+
     void forwardPolar(const double *R__ realIn, double *R__ magOut, double *R__ phaseOut) {
         basefft(false, realIn, 0, m_c, m_d);
         const int hs = m_size/2;
@@ -979,6 +1072,14 @@ public:
         }
     }
 
+    void forwardInterleaved(const float *R__ realIn, float *R__ complexOut) {
+        for (int i = 0; i < m_size; ++i) m_a[i] = realIn[i];
+        basefft(false, m_a, 0, m_c, m_d);
+        const int hs = m_size/2;
+        for (int i = 0; i <= hs; ++i) complexOut[i*2] = m_c[i];
+        for (int i = 0; i <= hs; ++i) complexOut[i*2+1] = m_d[i];
+    }
+
     void forwardPolar(const float *R__ realIn, float *R__ magOut, float *R__ phaseOut) {
         for (int i = 0; i < m_size; ++i) m_a[i] = realIn[i];
         basefft(false, m_a, 0, m_c, m_d);
@@ -1013,6 +1114,21 @@ public:
         basefft(true, m_a, m_b, realOut, m_d);
     }
 
+    void inverseInterleaved(const double *R__ complexIn, double *R__ realOut) {
+        const int hs = m_size/2;
+        for (int i = 0; i <= hs; ++i) {
+            double real = complexIn[i*2];
+            double imag = complexIn[i*2+1];
+            m_a[i] = real;
+            m_b[i] = imag;
+            if (i > 0) {
+                m_a[m_size-i] = real;
+                m_b[m_size-i] = -imag;
+            }
+        }
+        basefft(true, m_a, m_b, realOut, m_d);
+    }
+
     void inversePolar(const double *R__ magIn, const double *R__ phaseIn, double *R__ realOut) {
         const int hs = m_size/2;
         for (int i = 0; i <= hs; ++i) {
@@ -1058,6 +1174,22 @@ public:
         for (int i = 0; i < m_size; ++i) realOut[i] = m_c[i];
     }
 
+    void inverseInterleaved(const float *R__ complexIn, float *R__ realOut) {
+        const int hs = m_size/2;
+        for (int i = 0; i <= hs; ++i) {
+            float real = complexIn[i*2];
+            float imag = complexIn[i*2+1];
+            m_a[i] = real;
+            m_b[i] = imag;
+            if (i > 0) {
+                m_a[m_size-i] = real;
+                m_b[m_size-i] = -imag;
+            }
+        }
+        basefft(true, m_a, m_b, m_c, m_d);
+        for (int i = 0; i < m_size; ++i) realOut[i] = m_c[i];
+    }
+
     void inversePolar(const float *R__ magIn, const float *R__ phaseIn, float *R__ realOut) {
         const int hs = m_size/2;
         for (int i = 0; i <= hs; ++i) {
@@ -1327,6 +1459,12 @@ FFT::forward(const double *R__ realIn, double *R__ realOut, double *R__ imagOut)
     d->forward(realIn, realOut, imagOut);
 }
 
+void
+FFT::forwardInterleaved(const double *R__ realIn, double *R__ complexOut)
+{
+    d->forwardInterleaved(realIn, complexOut);
+}
+
 void
 FFT::forwardPolar(const double *R__ realIn, double *R__ magOut, double *R__ phaseOut)
 {
@@ -1345,6 +1483,12 @@ FFT::forward(const float *R__ realIn, float *R__ realOut, float *R__ imagOut)
     d->forward(realIn, realOut, imagOut);
 }
 
+void
+FFT::forwardInterleaved(const float *R__ realIn, float *R__ complexOut)
+{
+    d->forwardInterleaved(realIn, complexOut);
+}
+
 void
 FFT::forwardPolar(const float *R__ realIn, float *R__ magOut, float *R__ phaseOut)
 {
@@ -1363,6 +1507,12 @@ FFT::inverse(const double *R__ realIn, const double *R__ imagIn, double *R__ rea
     d->inverse(realIn, imagIn, realOut);
 }
 
+void
+FFT::inverseInterleaved(const double *R__ complexIn, double *R__ realOut)
+{
+    d->inverseInterleaved(complexIn, realOut);
+}
+
 void
 FFT::inversePolar(const double *R__ magIn, const double *R__ phaseIn, double *R__ realOut)
 {
@@ -1381,6 +1531,12 @@ FFT::inverse(const float *R__ realIn, const float *R__ imagIn, float *R__ realOu
     d->inverse(realIn, imagIn, realOut);
 }
 
+void
+FFT::inverseInterleaved(const float *R__ complexIn, float *R__ realOut)
+{
+    d->inverseInterleaved(complexIn, realOut);
+}
+
 void
 FFT::inversePolar(const float *R__ magIn, const float *R__ phaseIn, float *R__ realOut)
 {

src/dsp/FFT.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -30,11 +30,14 @@ class FFTImpl;
  * complex conjugates half is omitted), so the "complex" arrays need
  * room for size/2+1 elements.
  *
- * Not thread safe: use a separate instance per thread, or use a mutex.
+ * The "interleaved" functions use the format sometimes called CCS --
+ * size/2+1 real+imaginary pairs.  So, the array elements at indices 1
+ * and size+1 will always be zero (since the signal is real).
+ *
+ * This class is reentrant but not thread safe: use a separate
+ * instance per thread, or use a mutex.
  */
 
-//!!! it would be nice if we could redefine forwardMagnitude as forwardPower (i.e. square of magnitude)
-
 class FFT
 {
 public:
@@ -44,18 +47,22 @@ public:
     ~FFT();
 
     void forward(const double *R__ realIn, double *R__ realOut, double *R__ imagOut);
+    void forwardInterleaved(const double *R__ realIn, double *R__ complexOut);
     void forwardPolar(const double *R__ realIn, double *R__ magOut, double *R__ phaseOut);
     void forwardMagnitude(const double *R__ realIn, double *R__ magOut);
 
     void forward(const float *R__ realIn, float *R__ realOut, float *R__ imagOut);
+    void forwardInterleaved(const float *R__ realIn, float *R__ complexOut);
     void forwardPolar(const float *R__ realIn, float *R__ magOut, float *R__ phaseOut);
     void forwardMagnitude(const float *R__ realIn, float *R__ magOut);
 
     void inverse(const double *R__ realIn, const double *R__ imagIn, double *R__ realOut);
+    void inverseInterleaved(const double *R__ complexIn, double *R__ realOut);
     void inversePolar(const double *R__ magIn, const double *R__ phaseIn, double *R__ realOut);
     void inverseCepstral(const double *R__ magIn, double *R__ cepOut);
 
     void inverse(const float *R__ realIn, const float *R__ imagIn, float *R__ realOut);
+    void inverseInterleaved(const float *R__ complexIn, float *R__ realOut);
     void inversePolar(const float *R__ magIn, const float *R__ phaseIn, float *R__ realOut);
     void inverseCepstral(const float *R__ magIn, float *R__ cepOut);
 

src/dsp/HighFrequencyAudioCurve.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/HighFrequencyAudioCurve.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/MovingMedian.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/PercussiveAudioCurve.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/PercussiveAudioCurve.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/Resampler.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -23,9 +23,20 @@
 #include "system/Allocators.h"
 
 
+#ifdef HAVE_LIBSAMPLERATE
 #include <samplerate.h>
+#endif
+
+#ifdef HAVE_LIBRESAMPLE
+#include <libresample.h>
+#endif
 
 
+#ifndef HAVE_LIBSAMPLERATE
+#ifndef HAVE_LIBRESAMPLE
+#error No resampler implementation selected!
+#endif
+#endif
 
 namespace RubberBand {
 
@@ -54,6 +65,7 @@ public:
 namespace Resamplers {
 
 
+#ifdef HAVE_LIBSAMPLERATE
 
 class D_SRC : public ResamplerImpl
 {
@@ -130,8 +142,8 @@ D_SRC::D_SRC(Resampler::Quality quality, int channels, int maxBufferSize,
 D_SRC::~D_SRC()
 {
     src_delete(m_src);
-    deallocate<float>(m_iin);
+    deallocate(m_iin);
-    deallocate<float>(m_iout);
+    deallocate(m_iout);
 }
 
 int
@@ -222,6 +234,195 @@ D_SRC::reset()
     src_reset(m_src);
 }
 
+#endif /* HAVE_LIBSAMPLERATE */
+
+#ifdef HAVE_LIBRESAMPLE
+
+class D_Resample : public ResamplerImpl
+{
+public:
+    D_Resample(Resampler::Quality quality, int channels, int maxBufferSize,
+          int m_debugLevel);
+    ~D_Resample();
+
+    int resample(const float *const R__ *const R__ in,
+                 float *const R__ *const R__ out,
+                 int incount,
+                 float ratio,
+                 bool final);
+
+    int resampleInterleaved(const float *const R__ in,
+                            float *const R__ out,
+                            int incount,
+                            float ratio,
+                            bool final);
+
+    int getChannelCount() const { return m_channels; }
+
+    void reset();
+
+protected:
+    void *m_src;
+    float *m_iin;
+    float *m_iout;
+    float m_lastRatio;
+    int m_channels;
+    int m_iinsize;
+    int m_ioutsize;
+    int m_debugLevel;
+};
+
+D_Resample::D_Resample(Resampler::Quality quality, int channels, int maxBufferSize,
+             int debugLevel) :
+    m_src(0),
+    m_iin(0),
+    m_iout(0),
+    m_lastRatio(1.f),
+    m_channels(channels),
+    m_iinsize(0),
+    m_ioutsize(0),
+    m_debugLevel(debugLevel)
+{
+    if (m_debugLevel > 0) {
+        std::cerr << "Resampler::Resampler: using libresample implementation"
+                  << std::endl;
+    }
+
+    float min_factor = 0.125f;
+    float max_factor = 8.0f;
+
+    m_src = resample_open(quality == Resampler::Best ? 1 : 0, min_factor, max_factor);
+
+    if (!m_src) {
+        std::cerr << "Resampler::Resampler: failed to create libresample resampler: " 
+                  << std::endl;
+        throw Resampler::ImplementationError; //!!! of course, need to catch this!
+    }
+
+    if (maxBufferSize > 0 && m_channels > 1) {
+        m_iinsize = maxBufferSize * m_channels;
+        m_ioutsize = maxBufferSize * m_channels * 2;
+        m_iin = allocate<float>(m_iinsize);
+        m_iout = allocate<float>(m_ioutsize);
+    }
+
+    reset();
+}
+
+D_Resample::~D_Resample()
+{
+    resample_close(m_src);
+    if (m_iinsize > 0) {
+        deallocate(m_iin);
+    }
+    if (m_ioutsize > 0) {
+        deallocate(m_iout);
+    }
+}
+
+int
+D_Resample::resample(const float *const R__ *const R__ in,
+                     float *const R__ *const R__ out,
+                     int incount,
+                     float ratio,
+                     bool final)
+{
+    float *data_in;
+    float *data_out;
+    int input_frames, output_frames, end_of_input, source_used;
+    float src_ratio;
+
+    int outcount = lrintf(ceilf(incount * ratio));
+
+    if (m_channels == 1) {
+        data_in = const_cast<float *>(*in); //!!!???
+        data_out = *out;
+    } else {
+        if (incount * m_channels > m_iinsize) {
+            m_iin = reallocate<float>(m_iin, m_iinsize, incount * m_channels);
+            m_iinsize = incount * m_channels;
+        }
+        if (outcount * m_channels > m_ioutsize) {
+            m_iout = reallocate<float>(m_iout, m_ioutsize, outcount * m_channels);
+            m_ioutsize = outcount * m_channels;
+        }
+        v_interleave(m_iin, in, m_channels, incount);
+        data_in = m_iin;
+        data_out = m_iout;
+    }
+
+    input_frames = incount;
+    output_frames = outcount;
+    src_ratio = ratio;
+    end_of_input = (final ? 1 : 0);
+
+    int output_frames_gen = resample_process(m_src,
+                                             src_ratio,
+                                             data_in,
+                                             input_frames,
+                                             end_of_input,
+                                             &source_used,
+                                             data_out,
+                                             output_frames);
+
+    if (output_frames_gen < 0) {
+        std::cerr << "Resampler::process: libresample error: "
+                  << std::endl;
+        throw Resampler::ImplementationError; //!!! of course, need to catch this!
+    }
+
+    if (m_channels > 1) {
+        v_deinterleave(out, m_iout, m_channels, output_frames_gen);
+    }
+
+    m_lastRatio = ratio;
+
+    return output_frames_gen;
+}
+
+int
+D_Resample::resampleInterleaved(const float *const R__ in,
+                                float *const R__ out,
+                                int incount,
+                                float ratio,
+                                bool final)
+{
+    int input_frames, output_frames, end_of_input, source_used;
+    float src_ratio;
+
+    int outcount = lrintf(ceilf(incount * ratio));
+
+    input_frames = incount;
+    output_frames = outcount;
+    src_ratio = ratio;
+    end_of_input = (final ? 1 : 0);
+
+    int output_frames_gen = resample_process(m_src,
+                                             src_ratio,
+                                             const_cast<float *>(in),
+                                             input_frames,
+                                             end_of_input,
+                                             &source_used,
+                                             out,
+                                             output_frames);
+
+    if (output_frames_gen < 0) {
+        std::cerr << "Resampler::process: libresample error: "
+                  << std::endl;
+        throw Resampler::ImplementationError; //!!! of course, need to catch this!
+    }
+
+    m_lastRatio = ratio;
+
+    return output_frames_gen;
+}
+
+void
+D_Resample::reset()
+{
+}
+
+#endif /* HAVE_LIBRESAMPLE */
 
 
 } /* end namespace Resamplers */
@@ -234,15 +435,30 @@ Resampler::Resampler(Resampler::Quality quality, int channels,
     switch (quality) {
 
     case Resampler::Best:
+#ifdef HAVE_LIBRESAMPLE
+        m_method = 3;
+#endif
+#ifdef HAVE_LIBSAMPLERATE
         m_method = 1;
+#endif
         break;
 
     case Resampler::FastestTolerable:
+#ifdef HAVE_LIBRESAMPLE
+        m_method = 3;
+#endif
+#ifdef HAVE_LIBSAMPLERATE
         m_method = 1;
+#endif
         break;
 
     case Resampler::Fastest:
+#ifdef HAVE_LIBRESAMPLE
+        m_method = 3;
+#endif
+#ifdef HAVE_LIBSAMPLERATE
         m_method = 1;
+#endif
         break;
     }
 
@@ -262,7 +478,14 @@ Resampler::Resampler(Resampler::Quality quality, int channels,
         break;
 
     case 1:
+#ifdef HAVE_LIBSAMPLERATE
         d = new Resamplers::D_SRC(quality, channels, maxBufferSize, debugLevel);
+#else
+        std::cerr << "Resampler::Resampler(" << quality << ", " << channels
+                  << ", " << maxBufferSize << "): No implementation available!"
+                  << std::endl;
+        abort();
+#endif
         break;
 
     case 2:
@@ -271,6 +494,17 @@ Resampler::Resampler(Resampler::Quality quality, int channels,
                   << std::endl;
         abort();
         break;
+
+    case 3:
+#ifdef HAVE_LIBRESAMPLE
+        d = new Resamplers::D_Resample(quality, channels, maxBufferSize, debugLevel);
+#else
+        std::cerr << "Resampler::Resampler(" << quality << ", " << channels
+                  << ", " << maxBufferSize << "): No implementation available!"
+                  << std::endl;
+        abort();
+#endif
+        break;
     }
 }
 

src/dsp/Resampler.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/SampleFilter.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/SilentAudioCurve.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/SilentAudioCurve.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/SincWindow.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/SpectralDifferenceAudioCurve.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/SpectralDifferenceAudioCurve.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/dsp/Window.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
 #define _RUBBERBAND_WINDOW_H_
 
 #include <cmath>
-#include <iostream>
 #include <cstdlib>
 #include <map>
 
@@ -81,7 +80,6 @@ public:
             total += m_cache[i] * m_cache[i];
         }
         T rms = sqrt(total / m_size);
-        std::cerr << "rms = " << rms << std::endl;
         return rms;
     }
 

src/rubberband-c.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/system/Allocators.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/system/Allocators.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -87,6 +87,14 @@ T *reallocate(T *ptr, size_t oldcount, size_t count)
     return newptr;
 }
 	
+template <typename T>
+T *reallocate_and_zero(T *ptr, size_t oldcount, size_t count)
+{
+    ptr = reallocate(ptr, oldcount, count);
+    v_zero(ptr, count);
+    return ptr;
+}
+
 template <typename T>
 T **allocate_channels(size_t channels, size_t count)
 {

src/system/Thread.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/system/Thread.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/system/VectorOps.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -298,12 +298,26 @@ inline void v_interleave(T *const R__ dst,
                          const int count)
 {
     int idx = 0;
+    switch (channels) {
+    case 2:
+        // common case, may be vectorized by compiler if hardcoded
+        for (int i = 0; i < count; ++i) {
+            for (int j = 0; j < 2; ++j) {
+                dst[idx++] = src[j][i];
+            }
+        }
+        return;
+    case 1:
+        v_copy(dst, src[0], count);
+        return;
+    default:
         for (int i = 0; i < count; ++i) {
             for (int j = 0; j < channels; ++j) {
                 dst[idx++] = src[j][i];
             }
         }
     }
+}
 
 
 template<typename T>
@@ -313,12 +327,26 @@ inline void v_deinterleave(T *const R__ *const R__ dst,
                            const int count)
 {
     int idx = 0;
+    switch (channels) {
+    case 2:
+        // common case, may be vectorized by compiler if hardcoded
+        for (int i = 0; i < count; ++i) {
+            for (int j = 0; j < 2; ++j) {
+                dst[j][i] = src[idx++];
+            }
+        }
+        return;
+    case 1:
+        v_copy(dst[0], src, count);
+        return;
+    default:
         for (int i = 0; i < count; ++i) {
             for (int j = 0; j < channels; ++j) {
                 dst[j][i] = src[idx++];
             }
         }
     }
+}
 
 
 template<typename T>
@@ -333,6 +361,30 @@ inline void v_fftshift(T *const R__ ptr,
     }
 }
 
+template<typename T>
+inline T v_mean(const T *const R__ ptr, const int count)
+{
+    T t = T(0);
+    for (int i = 0; i < count; ++i) {
+        t += ptr[i];
+    }
+    t /= T(count);
+    return t;
+}
+
+template<typename T>
+inline T v_mean_channels(const T *const R__ *const R__ ptr,
+                         const int channels,
+                         const int count)
+{
+    T t = T(0);
+    for (int c = 0; c < channels; ++c) {
+        t += v_mean(ptr[c], count);
+    }
+    t /= T(channels);
+    return t;
+}
+
 }
 
 #endif

src/system/sysutils.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

src/system/sysutils.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -26,6 +26,8 @@
 
 #ifdef __MINGW32__
 #include <malloc.h>
+#else
+#include <alloca.h>
 #endif
 
 

vamp/RubberBandVampPlugin.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -18,6 +18,7 @@
 #include "system/sysutils.h"
 
 #include <cmath>
+#include <cstdio>
 
 using std::string;
 using std::vector;

vamp/RubberBandVampPlugin.h

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as

vamp/libmain.cpp

@@ -3,7 +3,7 @@
 /*
     Rubber Band
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2010 Chris Cannam.
+    Copyright 2007-2011 Chris Cannam.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as