Mercurial > hg > constant-q-cpp
changeset 168:0f2edd13ea2d
Feature labels were upside down in the plugin! Oops. Fix it
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Tue, 02 Dec 2014 17:36:41 +0000 |
| parents | 83cd46303dee |
| children | 8a1d240ac542 |
| files | Makefile.inc vamp/CQChromaVamp.cpp vamp/CQVamp.cpp |
| diffstat | 3 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.inc Fri Aug 08 11:52:38 2014 +0100 +++ b/Makefile.inc Tue Dec 02 17:36:41 2014 +0000 @@ -116,7 +116,7 @@ $(AR) cr $@ $^ $(RANLIB) $@ -Test%: Test%.o +$(TEST_DIR)/Test%: $(TEST_DIR)/Test%.o $(CXX) -o $@ $^ $(LIB) $(LIBS) $(TEST_LDFLAGS) clean: @@ -156,14 +156,15 @@ vamp/libmain.o: vamp/CQVamp.h cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h vamp/libmain.o: cq/CQParameters.h cq/CQKernel.h vamp/CQChromaVamp.h vamp/Pitch.o: vamp/Pitch.h +test/TestFFT.o: src/dsp/FFT.h +test/TestMathUtilities.o: src/dsp/MathUtilities.h src/dsp/nan-inf.h +test/TestResampler.o: src/dsp/Resampler.h src/dsp/Window.h src/dsp/FFT.h +test/TestWindow.o: src/dsp/Window.h +test/TestCQKernel.o: cq/CQKernel.h cq/CQParameters.h test/TestCQFrequency.o: cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h test/TestCQFrequency.o: cq/CQParameters.h cq/CQKernel.h src/dsp/Window.h test/TestCQTime.o: cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h test/TestCQTime.o: cq/CQParameters.h cq/CQKernel.h src/dsp/Window.h -test/TestFFT.o: src/dsp/FFT.h -test/TestMathUtilities.o: src/dsp/MathUtilities.h src/dsp/nan-inf.h -test/TestResampler.o: src/dsp/Resampler.h src/dsp/Window.h src/dsp/FFT.h -test/TestWindow.o: src/dsp/Window.h test/processfile.o: cq/ConstantQ.h cq/CQBase.h cq/CQParameters.h test/processfile.o: cq/CQKernel.h cq/CQKernel.o: cq/CQParameters.h
--- a/vamp/CQChromaVamp.cpp Fri Aug 08 11:52:38 2014 +0100 +++ b/vamp/CQChromaVamp.cpp Tue Dec 02 17:36:41 2014 +0000 @@ -282,7 +282,7 @@ if (m_cq) { char name[20]; for (int i = 0; i < (int)d.binCount; ++i) { - float freq = m_cq->getBinFrequency(i); + float freq = m_cq->getBinFrequency(d.binCount - i - 1); int note = Pitch::getPitchForFrequency(freq, 0, m_tuningFrequency); float nearestFreq = Pitch::getFrequencyForPitch(note, 0, m_tuningFrequency);
--- a/vamp/CQVamp.cpp Fri Aug 08 11:52:38 2014 +0100 +++ b/vamp/CQVamp.cpp Tue Dec 02 17:36:41 2014 +0000 @@ -351,7 +351,7 @@ if (m_cq) { char name[20]; for (int i = 0; i < (int)d.binCount; ++i) { - float freq = m_cq->getBinFrequency(i); + float freq = m_cq->getBinFrequency(d.binCount - i - 1); sprintf(name, "%.1f Hz", freq); int note = Pitch::getPitchForFrequency(freq, 0, m_tuningFrequency); float nearestFreq =