* Some code rearrangement
* Threading fixes (corrections to condition usage) * Avoid a potential hang when faced with some peculiar stretch factors * More modular calls out to vectorizable functions * Solaris build fixes * Bump version number
This commit is contained in:
Chris Cannam
245
Makefile.in
245
Makefile.in
@@ -1,6 +1,6 @@
|
||||
|
||||
CXX := @CXX@
|
||||
CXXFLAGS := -DHAVE_FFTW3 -DFFTW_DOUBLE_ONLY -DNO_THREAD_CHECKS @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ -Irubberband -Isrc $(OPTFLAGS)
|
||||
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)
|
||||
CFLAGS := @CFLAGS@ $(OPTFLAGS)
|
||||
LDFLAGS := @LDFLAGS@ -lpthread $(LDFLAGS)
|
||||
|
||||
@@ -17,8 +17,8 @@ DYNAMIC_FULL_VERSION := .2.1.0
|
||||
DYNAMIC_ABI_VERSION := .2
|
||||
DYNAMIC_LIBNAME := librubberband$(DYNAMIC_EXTENSION)
|
||||
DYNAMIC_LDFLAGS := -shared -Wl,-Bsymbolic -Wl,-soname=$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION)
|
||||
VAMP_LDFLAGS := -shared -Wl,-Bsymbolic -Wl,--version-script=src/vamp/vamp-plugin.map
|
||||
LADSPA_LDFLAGS := -shared -Wl,-Bsymbolic -Wl,--version-script=src/ladspa/ladspa-plugin.map
|
||||
VAMP_LDFLAGS := -shared -Wl,-Bsymbolic -Wl,--version-script=vamp/vamp-plugin.map
|
||||
LADSPA_LDFLAGS := -shared -Wl,-Bsymbolic -Wl,--version-script=ladspa/ladspa-plugin.map
|
||||
|
||||
PROGRAM_TARGET := bin/rubberband
|
||||
STATIC_TARGET := lib/librubberband.a
|
||||
@@ -48,60 +48,63 @@ PUBLIC_INCLUDES := \
|
||||
rubberband/RubberBandStretcher.h
|
||||
|
||||
LIBRARY_INCLUDES := \
|
||||
src/AudioCurve.h \
|
||||
src/ConstantAudioCurve.h \
|
||||
src/FFT.h \
|
||||
src/HighFrequencyAudioCurve.h \
|
||||
src/PercussiveAudioCurve.h \
|
||||
src/Profiler.h \
|
||||
src/Resampler.h \
|
||||
src/RingBuffer.h \
|
||||
src/Scavenger.h \
|
||||
src/SilentAudioCurve.h \
|
||||
src/SpectralDifferenceAudioCurve.h \
|
||||
src/StretchCalculator.h \
|
||||
src/StretcherImpl.h \
|
||||
src/StretcherChannelData.h \
|
||||
src/Thread.h \
|
||||
src/Window.h \
|
||||
src/sysutils.h
|
||||
src/float_cast/float_cast.h \
|
||||
src/StretcherImpl.h \
|
||||
src/StretchCalculator.h \
|
||||
src/base/Profiler.h \
|
||||
src/base/RingBuffer.h \
|
||||
src/base/Scavenger.h \
|
||||
src/dsp/AudioCurveCalculator.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/ConstantAudioCurve.h \
|
||||
src/dsp/Window.h \
|
||||
src/system/Allocators.h \
|
||||
src/system/Thread.h \
|
||||
src/system/VectorOps.h \
|
||||
src/system/sysutils.h
|
||||
|
||||
LIBRARY_SOURCES := \
|
||||
src/AudioCurve.cpp \
|
||||
src/ConstantAudioCurve.cpp \
|
||||
src/FFT.cpp \
|
||||
src/HighFrequencyAudioCurve.cpp \
|
||||
src/PercussiveAudioCurve.cpp \
|
||||
src/Profiler.cpp \
|
||||
src/Resampler.cpp \
|
||||
src/rubberband-c.cpp \
|
||||
src/RubberBandStretcher.cpp \
|
||||
src/SilentAudioCurve.cpp \
|
||||
src/SpectralDifferenceAudioCurve.cpp \
|
||||
src/StretchCalculator.cpp \
|
||||
src/StretcherImpl.cpp \
|
||||
src/StretcherProcess.cpp \
|
||||
src/StretchCalculator.cpp \
|
||||
src/base/Profiler.cpp \
|
||||
src/dsp/AudioCurveCalculator.cpp \
|
||||
src/dsp/SpectralDifferenceAudioCurve.cpp \
|
||||
src/dsp/HighFrequencyAudioCurve.cpp \
|
||||
src/dsp/SilentAudioCurve.cpp \
|
||||
src/dsp/ConstantAudioCurve.cpp \
|
||||
src/dsp/PercussiveAudioCurve.cpp \
|
||||
src/dsp/Resampler.cpp \
|
||||
src/dsp/FFT.cpp \
|
||||
src/system/Allocators.cpp \
|
||||
src/system/sysutils.cpp \
|
||||
src/system/Thread.cpp \
|
||||
src/StretcherChannelData.cpp \
|
||||
src/Thread.cpp \
|
||||
src/Window.cpp \
|
||||
src/sysutils.cpp
|
||||
src/StretcherImpl.cpp
|
||||
|
||||
PROGRAM_SOURCES := \
|
||||
src/main.cpp
|
||||
main/main.cpp
|
||||
|
||||
VAMP_HEADERS := \
|
||||
src/vamp/RubberBandVampPlugin.h
|
||||
vamp/RubberBandVampPlugin.h
|
||||
|
||||
VAMP_SOURCES := \
|
||||
src/vamp/RubberBandVampPlugin.cpp \
|
||||
src/vamp/libmain.cpp
|
||||
vamp/RubberBandVampPlugin.cpp \
|
||||
vamp/libmain.cpp
|
||||
|
||||
LADSPA_HEADERS := \
|
||||
src/ladspa/RubberBandPitchShifter.h
|
||||
ladspa/RubberBandPitchShifter.h
|
||||
|
||||
LADSPA_SOURCES := \
|
||||
src/ladspa/RubberBandPitchShifter.cpp \
|
||||
src/ladspa/libmain.cpp
|
||||
ladspa/RubberBandPitchShifter.cpp \
|
||||
ladspa/libmain.cpp
|
||||
|
||||
LIBRARY_OBJECTS := $(LIBRARY_SOURCES:.cpp=.o)
|
||||
LIBRARY_OBJECTS := $(LIBRARY_OBJECTS:.c=.o)
|
||||
@@ -160,97 +163,79 @@ clean:
|
||||
distclean: clean
|
||||
rm -f $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET)
|
||||
|
||||
depend:
|
||||
makedepend -Y $(LIBRARY_SOURCES) $(PROGRAM_SOURCES)
|
||||
|
||||
|
||||
# DO NOT DELETE
|
||||
|
||||
src/AudioCurve.o: src/AudioCurve.h src/sysutils.h
|
||||
src/ConstantAudioCurve.o: src/ConstantAudioCurve.h src/AudioCurve.h
|
||||
src/ConstantAudioCurve.o: src/sysutils.h
|
||||
src/FFT.o: src/FFT.h src/sysutils.h src/Thread.h src/Profiler.h
|
||||
src/HighFrequencyAudioCurve.o: src/HighFrequencyAudioCurve.h src/AudioCurve.h
|
||||
src/HighFrequencyAudioCurve.o: src/sysutils.h src/Window.h
|
||||
src/main.o: rubberband/RubberBandStretcher.h rubberband/rubberband-c.h
|
||||
src/main.o: src/sysutils.h src/Profiler.h
|
||||
src/PercussiveAudioCurve.o: src/PercussiveAudioCurve.h src/AudioCurve.h
|
||||
src/PercussiveAudioCurve.o: src/sysutils.h
|
||||
src/Profiler.o: src/Profiler.h src/sysutils.h
|
||||
src/Resampler.o: src/Resampler.h src/sysutils.h src/Profiler.h
|
||||
src/RingBuffer.o: src/RingBuffer.h src/Scavenger.h src/Thread.h
|
||||
src/RingBuffer.o: src/sysutils.h src/Profiler.h
|
||||
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/RubberBandStretcher.o: rubberband/rubberband-c.h src/Window.h
|
||||
src/RubberBandStretcher.o: src/sysutils.h src/Thread.h src/RingBuffer.h
|
||||
src/RubberBandStretcher.o: src/Scavenger.h src/Profiler.h src/FFT.h
|
||||
src/SpectralDifferenceAudioCurve.o: src/SpectralDifferenceAudioCurve.h
|
||||
src/SpectralDifferenceAudioCurve.o: src/AudioCurve.h src/sysutils.h
|
||||
src/SpectralDifferenceAudioCurve.o: src/Window.h
|
||||
src/StretchCalculator.o: src/StretchCalculator.h src/sysutils.h
|
||||
src/StretcherChannelData.o: src/StretcherChannelData.h src/StretcherImpl.h
|
||||
src/StretcherChannelData.o: rubberband/RubberBandStretcher.h
|
||||
src/StretcherChannelData.o: rubberband/rubberband-c.h src/Window.h
|
||||
src/StretcherChannelData.o: src/sysutils.h src/Thread.h src/RingBuffer.h
|
||||
src/StretcherChannelData.o: src/Scavenger.h src/Profiler.h src/FFT.h
|
||||
src/StretcherChannelData.o: src/Resampler.h
|
||||
src/StretcherImpl.o: src/StretcherImpl.h rubberband/RubberBandStretcher.h
|
||||
src/StretcherImpl.o: rubberband/rubberband-c.h src/Window.h src/sysutils.h
|
||||
src/StretcherImpl.o: src/Thread.h src/RingBuffer.h src/Scavenger.h
|
||||
src/StretcherImpl.o: src/Profiler.h src/FFT.h src/PercussiveAudioCurve.h
|
||||
src/StretcherImpl.o: src/AudioCurve.h src/HighFrequencyAudioCurve.h
|
||||
src/StretcherImpl.o: src/SpectralDifferenceAudioCurve.h
|
||||
src/StretcherImpl.o: src/ConstantAudioCurve.h src/StretchCalculator.h
|
||||
src/StretcherImpl.o: src/StretcherChannelData.h src/Resampler.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/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: rubberband/rubberband-c.h src/Window.h
|
||||
src/StretcherProcess.o: src/sysutils.h src/Thread.h src/RingBuffer.h
|
||||
src/StretcherProcess.o: src/Scavenger.h src/Profiler.h src/FFT.h
|
||||
src/StretcherProcess.o: src/PercussiveAudioCurve.h src/AudioCurve.h
|
||||
src/StretcherProcess.o: src/HighFrequencyAudioCurve.h
|
||||
src/StretcherProcess.o: src/ConstantAudioCurve.h src/StretchCalculator.h
|
||||
src/StretcherProcess.o: src/StretcherChannelData.h src/Resampler.h
|
||||
src/sysutils.o: src/sysutils.h
|
||||
src/Thread.o: src/Thread.h
|
||||
src/Window.o: src/Window.h src/sysutils.h
|
||||
rubberband/RubberBandStretcher.o: rubberband/rubberband-c.h
|
||||
src/AudioCurve.o: src/sysutils.h
|
||||
src/ConstantAudioCurve.o: src/AudioCurve.h src/sysutils.h
|
||||
src/FFT.o: src/sysutils.h
|
||||
src/HighFrequencyAudioCurve.o: src/AudioCurve.h src/sysutils.h src/Window.h
|
||||
src/PercussiveAudioCurve.o: src/AudioCurve.h src/sysutils.h
|
||||
src/Profiler.o: src/sysutils.h
|
||||
src/Resampler.o: src/sysutils.h
|
||||
src/RingBuffer.o: src/Scavenger.h src/Thread.h src/sysutils.h src/Profiler.h
|
||||
src/Scavenger.o: src/Thread.h src/sysutils.h
|
||||
src/SpectralDifferenceAudioCurve.o: src/AudioCurve.h src/sysutils.h
|
||||
src/SpectralDifferenceAudioCurve.o: src/Window.h
|
||||
src/StretcherChannelData.o: src/StretcherImpl.h
|
||||
src/StretcherChannelData.o: rubberband/RubberBandStretcher.h
|
||||
src/StretcherChannelData.o: rubberband/rubberband-c.h src/Window.h
|
||||
src/StretcherChannelData.o: src/sysutils.h src/Thread.h src/RingBuffer.h
|
||||
src/StretcherChannelData.o: src/Scavenger.h src/Profiler.h src/FFT.h
|
||||
src/StretcherImpl.o: rubberband/RubberBandStretcher.h
|
||||
src/StretcherImpl.o: rubberband/rubberband-c.h src/Window.h src/sysutils.h
|
||||
src/StretcherImpl.o: src/Thread.h src/RingBuffer.h src/Scavenger.h
|
||||
src/StretcherImpl.o: src/Profiler.h src/FFT.h
|
||||
src/rubberband-c.o: rubberband/RubberBandStretcher.h rubberband/rubberband-c.h
|
||||
src/Window.o: src/sysutils.h
|
||||
src/ladspa/libmain.o: src/ladspa/RubberBandPitchShifter.h
|
||||
src/ladspa/libmain.o: src/RingBuffer.h src/Scavenger.h src/Thread.h
|
||||
src/ladspa/libmain.o: src/sysutils.h src/Profiler.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/ladspa/RubberBandPitchShifter.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/RingBuffer.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/Scavenger.h src/Thread.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/sysutils.h src/Profiler.h
|
||||
src/ladspa/RubberBandPitchShifter.o: rubberband/RubberBandStretcher.h
|
||||
src/ladspa/RubberBandPitchShifter.o: rubberband/rubberband-c.h
|
||||
src/vamp/libmain.o: src/vamp/RubberBandVampPlugin.h
|
||||
src/vamp/libmain.o: rubberband/RubberBandStretcher.h
|
||||
src/vamp/libmain.o: rubberband/rubberband-c.h
|
||||
src/vamp/RubberBandVampPlugin.o: src/vamp/RubberBandVampPlugin.h
|
||||
src/vamp/RubberBandVampPlugin.o: rubberband/RubberBandStretcher.h
|
||||
src/vamp/RubberBandVampPlugin.o: rubberband/rubberband-c.h
|
||||
src/vamp/RubberBandVampPlugin.o: src/StretchCalculator.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/RingBuffer.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/Scavenger.h src/Thread.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/sysutils.h src/Profiler.h
|
||||
src/vamp/RubberBandVampPlugin.o: rubberband/RubberBandStretcher.h
|
||||
src/vamp/RubberBandVampPlugin.o: rubberband/rubberband-c.h
|
||||
src/StretcherProcess.o: src/dsp/Window.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
|
||||
src/StretcherProcess.o: src/dsp/AudioCurveCalculator.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/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/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/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
|
||||
src/dsp/FFT.o: src/base/Profiler.h src/system/VectorOps.h
|
||||
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/StretcherChannelData.o: src/StretcherChannelData.h src/StretcherImpl.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/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/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/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
|
||||
src/StretcherImpl.o: src/StretcherChannelData.h src/base/Profiler.h
|
||||
main/main.o: rubberband/RubberBandStretcher.h src/system/sysutils.h
|
||||
main/main.o: src/base/Profiler.h
|
||||
|
||||
Reference in New Issue
Block a user