globally remove all trailing whitespace from .cpp and .hpp files missed by previous...

[ardour.git] / libs / vamp-plugins / plugins.cpp

diff --git a/libs/vamp-plugins/plugins.cpp b/libs/vamp-plugins/plugins.cpp
index 25c6e6c0d4319074e500b4b090d5d4945b8aad5f..d7db2d90c0cfb2ee47fcac7c93ed8d5662e6590b 100644 (file)
--- a/libs/vamp-plugins/plugins.cpp
+++ b/libs/vamp-plugins/plugins.cpp
@@ -7,7 +7,7 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     Copyright 2006 Chris Cannam.
-  
+
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation
     files (the "Software"), to deal in the Software without
@@ -34,18 +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)
@@ -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;
     }
 }