X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fvamp-plugins%2Fplugins.cpp;h=6a040778825323b5472414e8f7255bb6172d09bf;hb=266953cb9690c135f79397a14547e30aa7a111e3;hp=25c6e6c0d4319074e500b4b090d5d4945b8aad5f;hpb=9f63ab9931e6478472853bdda58da47ea29ac125;p=ardour.git diff --git a/libs/vamp-plugins/plugins.cpp b/libs/vamp-plugins/plugins.cpp index 25c6e6c0d4..6a04077882 100644 --- a/libs/vamp-plugins/plugins.cpp +++ b/libs/vamp-plugins/plugins.cpp @@ -34,18 +34,30 @@ authorization. */ -#include "vamp/vamp.h" -#include "vamp-sdk/PluginAdapter.h" +#ifdef WAF_BUILD +#include "libvampplugins-config.h" +#endif + +#include +#include #include "ZeroCrossing.h" #include "SpectralCentroid.h" #include "PercussionOnsetDetector.h" #include "AmplitudeFollower.h" +#include "OnsetDetect.h" +#ifdef HAVE_AUBIO +#include "Onset.h" +#endif static Vamp::PluginAdapter zeroCrossingAdapter; static Vamp::PluginAdapter spectralCentroidAdapter; static Vamp::PluginAdapter percussionOnsetAdapter; static Vamp::PluginAdapter amplitudeAdapter; +static Vamp::PluginAdapter onsetDetectorAdapter; +#ifdef HAVE_AUBIO +static Vamp::PluginAdapter onsetAdapter; +#endif const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version, unsigned int index) @@ -57,6 +69,10 @@ const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version, case 1: return spectralCentroidAdapter.getDescriptor(); case 2: return percussionOnsetAdapter.getDescriptor(); case 3: return amplitudeAdapter.getDescriptor(); + case 4: return onsetDetectorAdapter.getDescriptor(); +#ifdef HAVE_AUBIO + case 5: return onsetAdapter.getDescriptor(); +#endif default: return 0; } }