X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fvamp-plugins%2Fplugins.cpp;h=3093c4c3121328fefb751cabb59daaba731f88e7;hb=2f1899d5dd120e613671eded3c6ad9cedeb06598;hp=d7db2d90c0cfb2ee47fcac7c93ed8d5662e6590b;hpb=4178db5f632721eefb58c42d684fc10f8f4fb9da;p=ardour.git diff --git a/libs/vamp-plugins/plugins.cpp b/libs/vamp-plugins/plugins.cpp index d7db2d90c0..3093c4c312 100644 --- a/libs/vamp-plugins/plugins.cpp +++ b/libs/vamp-plugins/plugins.cpp @@ -41,22 +41,42 @@ #include #include -#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 zeroCrossingAdapter; -static Vamp::PluginAdapter spectralCentroidAdapter; -static Vamp::PluginAdapter percussionOnsetAdapter; -static Vamp::PluginAdapter amplitudeAdapter; -static Vamp::PluginAdapter onsetDetectorAdapter; +static Vamp::PluginAdapter AmplitudeFollowerAdapter; +static Vamp::PluginAdapter BarBeatTrackerAdapter; +static Vamp::PluginAdapter BeatTrackerAdapter; +static Vamp::PluginAdapter ChromagramPluginAdapter; +static Vamp::PluginAdapter EBUr128Adapter; +static Vamp::PluginAdapter KeyDetectorAdapter; +static Vamp::PluginAdapter OnsetDetectorAdapter; +static Vamp::PluginAdapter PercussionOnsetDetectorAdapter; +static Vamp::PluginAdapter SimilarityPluginAdapter; +static Vamp::PluginAdapter SpectralCentroidAdapter; +static Vamp::PluginAdapter TonalChangeDetectAdapter; +static Vamp::PluginAdapter TranscriptionAdapter; +static Vamp::PluginAdapter TruePeakAdapter; +static Vamp::PluginAdapter ZeroCrossingAdapter; + #ifdef HAVE_AUBIO -static Vamp::PluginAdapter onsetAdapter; +static Vamp::PluginAdapter 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; } } -