X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fvamp-plugins%2Fplugins.cpp;h=3093c4c3121328fefb751cabb59daaba731f88e7;hb=47c97ca7e2c14a87f1cb1c30e2d25b746e211ad0;hp=25c6e6c0d4319074e500b4b090d5d4945b8aad5f;hpb=449aab3c465bbbf66d221fac3d7ea559f1720357;p=ardour.git

diff --git a/libs/vamp-plugins/plugins.cpp b/libs/vamp-plugins/plugins.cpp
index 25c6e6c0d4..3093c4c312 100644
--- 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,50 @@
     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 "BarBeatTrack.h"
+#include "BeatTrack.h"
+#include "ChromagramPlugin.h"
+#include "EBUr128.h"
+#include "KeyDetect.h"
+#include "OnsetDetect.h"
+#include "PercussionOnsetDetector.h"
+#include "SimilarityPlugin.h"
+#include "SpectralCentroid.h"
+#include "TonalChangeDetect.h"
+#include "Transcription.h"
+#include "TruePeak.h"
+#include "ZeroCrossing.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<AmplitudeFollower> AmplitudeFollowerAdapter;
+static Vamp::PluginAdapter<BarBeatTracker> BarBeatTrackerAdapter;
+static Vamp::PluginAdapter<BeatTracker> BeatTrackerAdapter;
+static Vamp::PluginAdapter<ChromagramPlugin> ChromagramPluginAdapter;
+static Vamp::PluginAdapter<VampEBUr128> EBUr128Adapter;
+static Vamp::PluginAdapter<KeyDetector> KeyDetectorAdapter;
+static Vamp::PluginAdapter<OnsetDetector> OnsetDetectorAdapter;
+static Vamp::PluginAdapter<PercussionOnsetDetector> PercussionOnsetDetectorAdapter;
+static Vamp::PluginAdapter<SimilarityPlugin> SimilarityPluginAdapter;
+static Vamp::PluginAdapter<SpectralCentroid> SpectralCentroidAdapter;
+static Vamp::PluginAdapter<TonalChangeDetect> TonalChangeDetectAdapter;
+static Vamp::PluginAdapter<Transcription> TranscriptionAdapter;
+static Vamp::PluginAdapter<VampTruePeak> TruePeakAdapter;
+static Vamp::PluginAdapter<ZeroCrossing> ZeroCrossingAdapter;
+
+#ifdef HAVE_AUBIO
+static Vamp::PluginAdapter<Onset> OnsetAdapter;
+#endif
 
 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version,
                                                     unsigned int index)
@@ -53,11 +85,23 @@ const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version,
     if (version < 1) return 0;
 
     switch (index) {
-    case  0: return zeroCrossingAdapter.getDescriptor();
-    case  1: return spectralCentroidAdapter.getDescriptor();
-    case  2: return percussionOnsetAdapter.getDescriptor();
-    case  3: return amplitudeAdapter.getDescriptor();
+    case  0: return AmplitudeFollowerAdapter.getDescriptor();
+    case  1: return BarBeatTrackerAdapter.getDescriptor();
+    case  2: return BeatTrackerAdapter.getDescriptor();
+    case  3: return ChromagramPluginAdapter.getDescriptor();
+    case  4: return EBUr128Adapter.getDescriptor();
+    case  5: return KeyDetectorAdapter.getDescriptor();
+    case  6: return OnsetDetectorAdapter.getDescriptor();
+    case  7: return PercussionOnsetDetectorAdapter.getDescriptor();
+    case  8: return SimilarityPluginAdapter.getDescriptor();
+    case  9: return SpectralCentroidAdapter.getDescriptor();
+    case 10: return TonalChangeDetectAdapter.getDescriptor();
+    case 11: return TranscriptionAdapter.getDescriptor();
+    case 12: return TruePeakAdapter.getDescriptor();
+    case 13: return ZeroCrossingAdapter.getDescriptor();
+#ifdef HAVE_AUBIO
+    case 14: return OnsetAdapter.getDescriptor();
+#endif
     default: return 0;
     }
 }
-