Remove VAMP plugin support.

.travis.yml

@@ -35,12 +35,10 @@ addons:
       - libtag1-dev
       - libupower-glib-dev
       - libusb-1.0-0-dev
-      - libvamp-hostsdk3
       - libwavpack-dev
       - portaudio19-dev
       - protobuf-compiler
       - scons
-      - vamp-plugin-sdk
 before_install:
   # Virtual X, needed for analyzer waveform tests
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0         ; fi

README

@@ -52,7 +52,6 @@ Mixxx has the following dependencies:
 - libusb-1.0
 - libmp4v2 (optional, m4a support)
 - libfaad (optional, m4a support)
-- vamp-plugin-sdk (optional, internal version included)
 - libchromaprint
 - librubberband
 

SConstruct

@@ -51,7 +51,6 @@ available_features = [features.Mad,
                       features.WavPack,
                       features.ModPlug,
                       features.TestSuite,
-                      features.Vamp,
                       features.AutoDjCrates,
                       features.ColorDiagnostics,
                       features.AddressSanitizer,
@@ -91,18 +90,10 @@ soundsource_plugins = SConscript(
     File('plugins/SConscript'), variant_dir=Dir(build.build_dir + "/plugins"),
     duplicate=0, exports=['build'])
 
-#Build Vamp minimal plugins
-#VariantDir("vamp-plugins", "src", duplicate=0)
-mixxxminimal_depends = [ depends.SoundTouch ]
-mixxxminimal_plugins = SConscript(
-    File('vamp-plugins/SConscript'),
-    variant_dir=Dir(build.build_dir + "/vamp-plugins"),
-    duplicate=0, exports=['build', 'mixxxminimal_depends'])
-
 # Setup and build the "mixxx" executable target. Also sets up our install
 # targets for each platform.
 SConscript(File('src/SConscript'), variant_dir=Dir(build.build_dir), duplicate=0,
-           exports=['build', 'sources', 'soundsource_plugins', 'mixxxminimal_plugins'])
+           exports=['build', 'sources', 'soundsource_plugins'])
 
 #On OS X, if the bundle has been built, copy it up:
 #Command("Mixxx.app", os.path.join(build.build_dir, "Mixxx.app"), Copy("$TARGET", "$SOURCE"))

build/debian/control

@@ -24,7 +24,6 @@ Build-Depends: debhelper (>= 4.0.0),
                libtag1-dev,
                libshout-dev,
                libqtwebkit-dev,
-               vamp-plugin-sdk,
                libprotobuf-dev,
                protobuf-compiler,
                libusb-1.0-0-dev,

build/depends.py

@@ -501,6 +501,58 @@ def configure(self, build, conf, env=None):
                 "Could not find librubberband or its development headers.")
 
 
+class QueenMaryDsp(Dependence):
+    def sources(self, build):
+        return ["#lib/qm-dsp/base/KaiserWindow.cpp",
+                "#lib/qm-dsp/base/Pitch.cpp",
+                "#lib/qm-dsp/base/SincWindow.cpp",
+                "#lib/qm-dsp/dsp/chromagram/CQprecalc.cpp",
+                "#lib/qm-dsp/dsp/chromagram/Chromagram.cpp",
+                "#lib/qm-dsp/dsp/chromagram/ConstantQ.cpp",
+                "#lib/qm-dsp/dsp/keydetection/GetKeyMode.cpp",
+                "#lib/qm-dsp/dsp/mfcc/MFCC.cpp",
+                "#lib/qm-dsp/dsp/onsets/DetectionFunction.cpp",
+                "#lib/qm-dsp/dsp/onsets/PeakPicking.cpp",
+                "#lib/qm-dsp/dsp/phasevocoder/PhaseVocoder.cpp",
+                "#lib/qm-dsp/dsp/rateconversion/Decimator.cpp",
+                "#lib/qm-dsp/dsp/rateconversion/DecimatorB.cpp",
+                "#lib/qm-dsp/dsp/rateconversion/Resampler.cpp",
+                "#lib/qm-dsp/dsp/rhythm/BeatSpectrum.cpp",
+                #"#lib/qm-dsp/dsp/segmentation/ClusterMeltSegmenter.cpp",
+                #"#lib/qm-dsp/dsp/segmentation/Segmenter.cpp",
+                #"#lib/qm-dsp/dsp/segmentation/cluster_melt.c",
+                #"#lib/qm-dsp/dsp/segmentation/cluster_segmenter.c",
+                "#lib/qm-dsp/dsp/signalconditioning/DFProcess.cpp",
+                "#lib/qm-dsp/dsp/signalconditioning/FiltFilt.cpp",
+                "#lib/qm-dsp/dsp/signalconditioning/Filter.cpp",
+                "#lib/qm-dsp/dsp/signalconditioning/Framer.cpp",
+                "#lib/qm-dsp/dsp/tempotracking/DownBeat.cpp",
+                "#lib/qm-dsp/dsp/tempotracking/TempoTrack.cpp",
+                "#lib/qm-dsp/dsp/tempotracking/TempoTrackV2.cpp",
+                "#lib/qm-dsp/dsp/tonal/ChangeDetectionFunction.cpp",
+                "#lib/qm-dsp/dsp/tonal/TCSgram.cpp",
+                "#lib/qm-dsp/dsp/tonal/TonalEstimator.cpp",
+                "#lib/qm-dsp/dsp/transforms/FFT.cpp",
+                "#lib/qm-dsp/dsp/wavelet/Wavelet.cpp",
+                "#lib/qm-dsp/ext/kissfft/kiss_fft.c",
+                "#lib/qm-dsp/ext/kissfft/kiss_fftr.c",
+                #"#lib/qm-dsp/hmm/hmm.c",
+                "#lib/qm-dsp/maths/Correlation.cpp",
+                "#lib/qm-dsp/maths/CosineDistance.cpp",
+                "#lib/qm-dsp/maths/KLDivergence.cpp",
+                "#lib/qm-dsp/maths/MathUtilities.cpp",
+                "#lib/qm-dsp/maths/pca/pca.c",
+                "#lib/qm-dsp/thread/Thread.cpp"
+        ]
+
+    def configure(self, build, conf):
+        build.env.Append(CPPPATH="#lib/qm-dsp")
+        build.env.Append(CPPPATH="#lib/qm-dsp/include")
+        build.env.Append(CPPDEFINES='kiss_fft_scalar=double')
+        if not build.platform_is_windows:
+            build.env.Append(CPPDEFINES='USE_PTHREADS')
+
+
 class TagLib(Dependence):
     def configure(self, build, conf):
         libs = ['tag']
@@ -620,11 +672,13 @@ def sources(self, build):
                    "preferences/dialog/dlgprefsound.cpp",
                    "preferences/dialog/dlgprefsounditem.cpp",
                    "preferences/dialog/dlgprefwaveform.cpp",
+                   'preferences/dialog/dlgprefbeats.cpp',
+                   'preferences/dialog/dlgprefkey.cpp',
                    "preferences/settingsmanager.cpp",
                    "preferences/replaygainsettings.cpp",
                    "preferences/upgrade.cpp",
                    "preferences/dlgpreferencepage.cpp",
-                    
+
 
                    "effects/effectmanifest.cpp",
                    "effects/effectmanifestparameter.cpp",
@@ -715,7 +769,13 @@ def sources(self, build):
                    "analyzer/analyzerqueue.cpp",
                    "analyzer/analyzerwaveform.cpp",
                    "analyzer/analyzergain.cpp",
+                   'analyzer/analyzerbeats.cpp',
+                   'analyzer/analyzerkey.cpp',
                    "analyzer/analyzerebur128.cpp",
+                   "analyzer/plugins/analyzerplugin.cpp",
+                   "analyzer/plugins/analyzersoundtouchbeats.cpp",
+                   "analyzer/plugins/analyzerqueenmarybeats.cpp",
+                   "analyzer/plugins/analyzerqueenmarykey.cpp",
 
                    "controllers/controller.cpp",
                    "controllers/controllerengine.cpp",
@@ -1312,7 +1372,7 @@ def depends(self, build):
         return [SoundTouch, ReplayGain, Ebur128Mit, PortAudio, PortMIDI, Qt, TestHeaders,
                 FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf,
                 Chromaprint, RubberBand, SecurityFramework, CoreServices,
-                QtScriptByteArray, Reverb, FpClassify]
+                QtScriptByteArray, Reverb, FpClassify, QueenMaryDsp]
 
     def post_dependency_check_configure(self, build, conf):
         """Sets up additional things in the Environment that must happen

build/features.py

@@ -369,71 +369,6 @@ def sources(self, build):
         return sources
 
 
-class Vamp(Feature):
-    INTERNAL_LINK = False
-    INTERNAL_VAMP_PATH = '#lib/vamp-2.6'
-
-    def description(self):
-        return "Vamp Analyzer support"
-
-    def enabled(self, build):
-        build.flags['vamp'] = util.get_flags(build.env, 'vamp', 1)
-        if int(build.flags['vamp']):
-            return True
-        return False
-
-    def add_options(self, build, vars):
-        vars.Add('vamp', 'Set to 1 to enable vamp analysers', 1)
-
-    def configure(self, build, conf):
-        if not self.enabled(build):
-            return
-
-        build.env.Append(CPPDEFINES='__VAMP__')
-
-        # If there is no system vamp-hostdk installed, then we'll directly link
-        # the vamp-hostsdk.
-        if not conf.CheckLib(['vamp-hostsdk']):
-            # For header includes
-            build.env.Append(CPPPATH=[self.INTERNAL_VAMP_PATH])
-            self.INTERNAL_LINK = True
-
-        # Needed on Linux at least. Maybe needed elsewhere?
-        if build.platform_is_linux:
-            # Optionally link libdl Required for some distros.
-            conf.CheckLib(['dl', 'libdl'])
-
-        # FFTW3 support
-        have_fftw3_h = conf.CheckHeader('fftw3.h')
-        have_fftw3 = conf.CheckLib('fftw3', autoadd=False)
-        if have_fftw3_h and have_fftw3 and build.platform_is_linux:
-            build.env.Append(CPPDEFINES='HAVE_FFTW3')
-            build.env.ParseConfig(
-                'pkg-config fftw3 --silence-errors --cflags --libs')
-
-    def sources(self, build):
-        sources = ['analyzer/vamp/vampanalyzer.cpp',
-                   'analyzer/vamp/vamppluginloader.cpp',
-                   'analyzer/analyzerbeats.cpp',
-                   'analyzer/analyzerkey.cpp',
-                   'preferences/dialog/dlgprefbeats.cpp',
-                   'preferences/dialog/dlgprefkey.cpp']
-
-        if self.INTERNAL_LINK:
-            hostsdk_src_path = '%s/src/vamp-hostsdk' % self.INTERNAL_VAMP_PATH
-            sources.extend(path % hostsdk_src_path for path in
-                           ['%s/Files.cpp',
-                            '%s/PluginBufferingAdapter.cpp',
-                            '%s/PluginChannelAdapter.cpp',
-                            '%s/PluginHostAdapter.cpp',
-                            '%s/PluginInputDomainAdapter.cpp',
-                            '%s/PluginLoader.cpp',
-                            '%s/PluginSummarisingAdapter.cpp',
-                            '%s/PluginWrapper.cpp',
-                            '%s/RealTime.cpp'])
-        return sources
-
-
 class ModPlug(Feature):
     def description(self):
         return "Modplug module decoder plugin"

build/nsis/Mixxx.nsi

@@ -227,10 +227,6 @@ Section "Mixxx (required)" SecMixxx
   ; Copies both DLLs and PDBs.
   File /nonfatal /r "${BASE_BUILD_DIR}\dist${BITWIDTH}\plugins\soundsource\*"
 
-  SetOutPath $INSTDIR\plugins\vamp
-  ; Copies both DLLs and PDBs.
-  File /nonfatal /r "${BASE_BUILD_DIR}\dist${BITWIDTH}\plugins\vamp\*"
-
   SetOutPath $INSTDIR\keyboard
   File "${BASE_BUILD_DIR}\dist${BITWIDTH}\keyboard\*.kbd.cfg"
 
@@ -333,8 +329,6 @@ Section "Uninstall"
   RMDir "$INSTDIR\fonts"
   Delete $INSTDIR\plugins\soundsource\*
   RMDir "$INSTDIR\plugins\soundsource"
-  Delete $INSTDIR\plugins\vamp\*
-  RMDir "$INSTDIR\plugins\vamp"
   Delete $INSTDIR\plugins\*
   RMDir "$INSTDIR\plugins"
   Delete $INSTDIR\translations\*

lib/qm-dsp/README.txt

@@ -0,0 +1,35 @@
+
+
+QM-DSP library
+==============
+
+This is a C++ library of functions for DSP and Music Informatics
+purposes developed at Queen Mary, University of London.
+It is used by the QM Vamp Plugins (q.v.) amongst other things.
+
+This code is Copyright (c) 2006-2015 Queen Mary, University of London,
+with the following exceptions:
+
+ext/kissfft -- Copyright (c) 2003-2010 Mark Borgerding
+
+maths/pca.c -- Fionn Murtagh, from StatLib; with permission
+
+maths/Polyfit.h -- Allen Miller, David J Taylor and others; also for
+Delphi in the the JEDI Math Library, under the Mozilla Public License
+
+thread/BlockAllocator.h -- derived from FSB Allocator by Juha Nieminen,
+under BSD-style license
+
+See individual files for further authorship details.
+
+
+License
+=======
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.  See the file
+COPYING included with this distribution for more information.
+
+