INSTALL.mingw32: build from current tree

[vamp-aubio-plugins.git] / libmain.cpp

diff --git a/libmain.cpp b/libmain.cpp
index b9159cd..7a97f34 100644 (file)
--- a/libmain.cpp
+++ b/libmain.cpp
@@ -21,19 +21,34 @@
 #include "plugins/Pitch.h"
 #include "plugins/Notes.h"
 #include "plugins/Tempo.h"
+#include "plugins/Silence.h"
+#include "plugins/Mfcc.h"
+#include "plugins/MelEnergy.h"
+#include "plugins/SpecDesc.h"
 
 static Vamp::PluginAdapter<Onset> onsetAdapter;
 static Vamp::PluginAdapter<Pitch> pitchAdapter;
 static Vamp::PluginAdapter<Notes> notesAdapter;
 static Vamp::PluginAdapter<Tempo> tempoAdapter;
+static Vamp::PluginAdapter<Silence> silenceAdapter;
+static Vamp::PluginAdapter<Mfcc> mfccAdapter;
+static Vamp::PluginAdapter<MelEnergy> melenergyAdapter;
+static Vamp::PluginAdapter<SpecDesc> specdescAdapter;
 
-const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int index)
+const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int vampApiVersion,
+                                                    unsigned int index)
 {
+    if (vampApiVersion < 2) return 0;
+
     switch (index) {
     case  0: return onsetAdapter.getDescriptor();
     case  1: return pitchAdapter.getDescriptor();
     case  2: return notesAdapter.getDescriptor();
     case  3: return tempoAdapter.getDescriptor();
+    case  4: return silenceAdapter.getDescriptor();
+    case  5: return mfccAdapter.getDescriptor();
+    case  6: return melenergyAdapter.getDescriptor();
+    case  7: return specdescAdapter.getDescriptor();
     default: return 0;
     }
 }