X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fvamp-plugins%2Fplugins.cpp;h=6a040778825323b5472414e8f7255bb6172d09bf;hb=456fb789d3adcdb52de3abd863c1bf64c973effa;hp=c45912be9b1d07306718ee5cfdbb175744e499e8;hpb=68e943265edf04e63a8e8b8f62bab20f99d9c637;p=ardour.git

diff --git a/libs/vamp-plugins/plugins.cpp b/libs/vamp-plugins/plugins.cpp
index c45912be9b..6a04077882 100644
--- a/libs/vamp-plugins/plugins.cpp
+++ b/libs/vamp-plugins/plugins.cpp
@@ -34,20 +34,30 @@
     authorization.
 */
 
-#include "vamp/vamp.h"
-#include "vamp-sdk/PluginAdapter.h"
+#ifdef WAF_BUILD
+#include "libvampplugins-config.h"
+#endif
+
+#include <vamp/vamp.h>
+#include <vamp-sdk/PluginAdapter.h>
 
 #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<ZeroCrossing> zeroCrossingAdapter;
 static Vamp::PluginAdapter<SpectralCentroid> spectralCentroidAdapter;
 static Vamp::PluginAdapter<PercussionOnsetDetector> percussionOnsetAdapter;
 static Vamp::PluginAdapter<AmplitudeFollower> amplitudeAdapter;
+static Vamp::PluginAdapter<OnsetDetector> onsetDetectorAdapter;
+#ifdef HAVE_AUBIO
 static Vamp::PluginAdapter<Onset> onsetAdapter;
+#endif
 
 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version,
                                                     unsigned int index)
@@ -59,7 +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 onsetAdapter.getDescriptor();
+    case  4: return onsetDetectorAdapter.getDescriptor();
+#ifdef HAVE_AUBIO
+    case  5: return onsetAdapter.getDescriptor();
+#endif
     default: return 0;
     }
 }