X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fvamp-plugins%2Fplugins.cpp;h=3093c4c3121328fefb751cabb59daaba731f88e7;hb=ed4909bd59a2bc62b589e51c4faef66118071141;hp=6a040778825323b5472414e8f7255bb6172d09bf;hpb=ea1ccb869a152d7344f498d2a062867f5bcf9d0b;p=ardour.git

diff --git a/libs/vamp-plugins/plugins.cpp b/libs/vamp-plugins/plugins.cpp
index 6a04077882..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
@@ -41,22 +41,42 @@
 #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<OnsetDetector> onsetDetectorAdapter;
+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;
+static Vamp::PluginAdapter<Onset> OnsetAdapter;
 #endif
 
 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version,
@@ -65,15 +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  4: return onsetDetectorAdapter.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  5: return onsetAdapter.getDescriptor();
+    case 14: return OnsetAdapter.getDescriptor();
 #endif
     default: return 0;
     }
 }
-