Remove VAMP plugin support.

.travis.yml

@@ -38,15 +38,13 @@ addons:
       - libtag1-dev
       - libupower-glib-dev
       - libusb-1.0-0-dev
-      - libvamp-hostsdk3
       - libwavpack-dev
       - portaudio19-dev
       - protobuf-compiler
       - qt5-default
       - qtscript5-dev
       - libqt5x11extras5-dev
       - scons
-      - vamp-plugin-sdk
       - qtkeychain-dev
       - liblilv-dev
 before_install:

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
 

SConscript

@@ -27,7 +27,6 @@ plugins = []
 # Grab these from the SConstruct above us
 Import('build')
 Import('sources')
-Import('mixxxminimal_plugins')
 
 env = build.env
 flags = build.flags
@@ -93,11 +92,6 @@ elif build.platform_is_osx:
 else:
         mixxx_bin = env.Program('mixxx', [mixxx_main, mixxx_qrc])
 
-# Make sure mixxxminimal plugins are built before
-# mixxx_bin. This fixes a race where when building with multiple threads the
-# packaging step starts before the plugins are built.
-Depends(mixxx_bin, mixxxminimal_plugins)
-
 # For convenience, copy the Mixxx binary out of the build directory to the
 # root. Don't do it on windows because the binary can't run on its own and needs
 # the DLLs present with it.
@@ -266,9 +260,6 @@ if test_bin is not None:
 if build.bundle_pdbs:
         binary_files.append(env.SideEffect('mixxx.pdb', mixxx_bin))
 
-#VAMP beat tracking and key detection plugin
-libmixxxminimal_vamp_plugin = mixxxminimal_plugins
-
 #Skins
 skin_files = Glob('#res/skins/*')
 
@@ -380,9 +371,6 @@ if build.platform_is_linux or build.platform_is_bsd:
                 binary = env.Install(unix_bin_path, binary_files)
                 skins = env.Install(os.path.join(unix_share_path, 'mixxx', 'skins'), skin_files)
                 fonts = env.Install(os.path.join(unix_share_path, 'mixxx', 'fonts'), font_files)
-                vamp_plugin =  env.Install(
-                    os.path.join(unix_lib_path, 'mixxx', 'plugins', 'vampqt5'),
-                    libmixxxminimal_vamp_plugin)
                 controllermappings = env.Install(os.path.join(unix_share_path, 'mixxx', 'controllers'), controllermappings_files)
                 translations = env.Install(os.path.join(unix_share_path, 'mixxx', 'translations'), translation_files)
                 keyboardmappings = env.Install(os.path.join(unix_share_path, 'mixxx', 'keyboard'), keyboardmappings_files)
@@ -407,7 +395,6 @@ if build.platform_is_linux or build.platform_is_bsd:
                 env.Alias('install', dotdesktop)
                 env.Alias('install', dotappstream)
                 env.Alias('install', icon)
-                env.Alias('install', vamp_plugin)
 
                 if not building_debian_package and os.access(udev_root, os.W_OK):
                         env.Alias('install', hidudev)
@@ -436,9 +423,6 @@ if build.platform_is_osx and 'bundle' in COMMAND_LINE_TARGETS:
                 [("styles", "libqmacstyle.dylib")]
         )
 
-        for x in mixxxminimal_plugins:
-                plugins.append(x.get_abspath())
-
         resource_map = {}
         for tfile in translation_files:
                 resource_map[str(tfile)] = 'translations'
@@ -535,8 +519,6 @@ if build.platform_is_windows:
         docs = env.Install(os.path.join(base_dist_dir, "doc/"), docs_files)
         #icon = env.Install(base_dist_dir+"", icon_files)
         dlls = env.Install(base_dist_dir+"/", dll_files)
-        vamp_plugins = env.Install(os.path.join(base_dist_dir, "plugins", "vamp/"),
-                                   libmixxxminimal_vamp_plugin)
         binary = env.Install(base_dist_dir+"/", binary_files)
 
         #Always trigger these install builders when compiling on Windows
@@ -547,11 +529,10 @@ if build.platform_is_windows:
         env.Alias('mixxx', keyboardmappings)
         env.Alias('mixxx', docs)
         env.Alias('mixxx', dlls)
-        env.Alias('mixxx', vamp_plugins)
         #env.Alias('mixxx', icon)
         env.Alias('mixxx', binary)
 
-        binaries_to_codesign = [binary, dlls, vamp_plugins]
+        binaries_to_codesign = [binary, dlls]
 
         # imageformats DLL
         if imgfmtdll_files:

SConstruct

@@ -51,7 +51,6 @@ available_features = [features.Mad,
                       features.WavPack,
                       features.ModPlug,
                       features.TestSuite,
-                      features.Vamp,
                       features.ColorDiagnostics,
                       features.Sanitizers,
                       features.LocaleCompare,
@@ -103,7 +102,7 @@ mixxxminimal_plugins = SConscript(
 # Setup and build the "mixxx" executable target. Also sets up our install
 # targets for each platform.
 SConscript('SConscript', variant_dir=build.build_dir, duplicate=0,
-           exports=['build', 'sources', 'mixxxminimal_plugins'])
+           exports=['build', 'sources'])
 
 #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

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

build/depends.py

@@ -539,6 +539,59 @@ 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']
@@ -672,6 +725,8 @@ def sources(self, build):
                    "src/preferences/dialog/dlgprefsound.cpp",
                    "src/preferences/dialog/dlgprefsounditem.cpp",
                    "src/preferences/dialog/dlgprefwaveform.cpp",
+                   "src/preferences/dialog/dlgprefbeats.cpp",
+                   "src/preferences/dialog/dlgprefkey.cpp",
                    "src/preferences/settingsmanager.cpp",
                    "src/preferences/replaygainsettings.cpp",
                    "src/preferences/broadcastsettings.cpp",
@@ -779,7 +834,12 @@ def sources(self, build):
                    "src/analyzer/analyzerqueue.cpp",
                    "src/analyzer/analyzerwaveform.cpp",
                    "src/analyzer/analyzergain.cpp",
+                   "src/analyzer/analyzerbeats.cpp",
+                   "src/analyzer/analyzerkey.cpp",
                    "src/analyzer/analyzerebur128.cpp",
+                   "src/analyzer/plugins/analyzersoundtouchbeats.cpp",
+                   "src/analyzer/plugins/analyzerqueenmarybeats.cpp",
+                   "src/analyzer/plugins/analyzerqueenmarykey.cpp",
 
                    "src/controllers/controller.cpp",
                    "src/controllers/controllerdebug.cpp",
@@ -1439,7 +1499,8 @@ def depends(self, build):
         return [SoundTouch, ReplayGain, Ebur128Mit, PortAudio, PortMIDI, Qt, TestHeaders,
                 FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf,
                 Chromaprint, RubberBand, SecurityFramework, CoreServices, IOKit,
-                QtScriptByteArray, Reverb, FpClassify, PortAudioRingBuffer, LAME]
+                QtScriptByteArray, Reverb, FpClassify, PortAudioRingBuffer, LAME,
+                QueenMaryDsp]
 
     def post_dependency_check_configure(self, build, conf):
         """Sets up additional things in the Environment that must happen

build/features.py

@@ -329,80 +329,6 @@ def sources(self, build):
         return sources
 
 
-class Vamp(Feature):
-    INTERNAL_LINK = False
-    INTERNAL_VAMP_PATH = 'lib/vamp'
-
-    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__')
-        build.env.Append(CPPDEFINES='kiss_fft_scalar=double')
-
-        # If there is no system vamp-hostsdk is installed or if the version
-        # of the installed vamp-hostsdk is less than the bundled version,
-        # then we'll directly link the bundled vamp-hostsdk
-        # Note: We're adding vamp-hostsdk to LIBS in sources(), so
-        # don't add it now in order to prevent duplication.
-        if not conf.CheckLib('vamp-hostsdk', autoadd=False) or not conf.CheckForPKG('vamp-plugin-sdk', '2.7.1'):
-            self.INTERNAL_LINK = True
-            build.env.Append(CPPPATH=['#' + self.INTERNAL_VAMP_PATH])
-
-        # Needed on Linux at least. Maybe needed elsewhere?
-        if build.platform_is_linux:
-            # Optionally link libdl Required for some distros.
-            # Note: We can't add dl to LIBS here because it needs to be added after vamp-hostsdk.
-            # See: https://bugs.launchpad.net/mixxx/+bug/1804411
-            conf.CheckLib(['dl', 'libdl'], autoadd=False)
-
-        # 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):
-        if self.INTERNAL_LINK:
-            # Clone our main environment so we don't change any settings in the
-            # Mixxx environment.
-            env = build.env.Clone()
-            vamp_dir = env.Dir(self.INTERNAL_VAMP_PATH)
-            SCons.Export('env')
-            SCons.Export('build')
-            env.SConscript(env.File('SConscript', vamp_dir))
-
-            build.env.Append(LIBPATH=self.INTERNAL_VAMP_PATH)
-
-        # Add this here unconditionally because we're not adding it in configure().
-        build.env.Append(LIBS=['vamp-hostsdk'])
-
-        # Ubuntu requires dl to be specified after vamp-hostsdk.
-        if build.platform_is_linux:
-            build.env.Append(LIBS=['dl'])
-
-        return ['src/analyzer/vamp/vampanalyzer.cpp',
-                'src/analyzer/vamp/vamppluginadapter.cpp',
-                'src/analyzer/analyzerbeats.cpp',
-                'src/analyzer/analyzerkey.cpp',
-                'src/preferences/dialog/dlgprefbeats.cpp',
-                'src/preferences/dialog/dlgprefkey.cpp']
-
-
 class ModPlug(Feature):
     def description(self):
         return "Modplug module decoder plugin"

build/wix/mixxx.wxs

@@ -332,9 +332,6 @@
           <!-- fonts. Files defined in fonts.wxs generated by heat -->
           <Directory Id="fontsDir" Name="fonts" />
 
-          <!-- plugins. Files defined in plugins.wxs generated by heat -->
-          <Directory Id="pluginsDir" Name="plugins" />
-
           <!-- keyboard. Files defined in keyboard.wxs generated by heat -->
           <Directory Id="keyboardDir" Name="keyboard" />
 
@@ -398,7 +395,6 @@
         <ComponentGroupRef Id='imageformatsComp' />
       <?endif?>
       <ComponentGroupRef Id='fontsComp' />
-      <ComponentGroupRef Id='pluginsComp' />
       <ComponentGroupRef Id='keyboardComp' />
       <ComponentGroupRef Id='controllersComp' />
       <ComponentGroupRef Id='skinsComp' />

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.
+
+