comparison libmain.cpp @ 27:3256bfa04ed8

* split out tempo/beat/onset plugin into tempo/beat and onset

 */
 
 #include <vamp/vamp.h>
 #include <vamp-sdk/PluginAdapter.h>
 
-#include "plugins/BeatDetect.h"
+#include "plugins/BeatTrack.h"
+#include "plugins/OnsetDetect.h"
 #include "plugins/ChromagramPlugin.h"
 #include "plugins/ConstantQSpectrogram.h"
 #include "plugins/TonalChangeDetect.h"
 #include "plugins/KeyDetect.h"
 
-static Vamp::PluginAdapter<BeatDetector> beatDetectorAdapter;
+static Vamp::PluginAdapter<BeatTracker> beatTrackerAdapter;
+static Vamp::PluginAdapter<OnsetDetector> onsetDetectorAdapter;
 static Vamp::PluginAdapter<ChromagramPlugin> chromagramPluginAdapter;
 static Vamp::PluginAdapter<ConstantQSpectrogram> constantQAdapter;
 static Vamp::PluginAdapter<TonalChangeDetect> tonalChangeDetectorAdapter;
 static Vamp::PluginAdapter<KeyDetector> keyDetectorAdapter;
 

                                                     unsigned int index)
 {
     if (vampApiVersion < 1) return 0;
 
     switch (index) {
-    case  0: return beatDetectorAdapter.getDescriptor();
-    case  1: return chromagramPluginAdapter.getDescriptor();
-    case  2: return constantQAdapter.getDescriptor();
-    case  3: return tonalChangeDetectorAdapter.getDescriptor();
-    case  4: return keyDetectorAdapter.getDescriptor();
+    case  0: return beatTrackerAdapter.getDescriptor();
+    case  1: return onsetDetectorAdapter.getDescriptor();
+    case  2: return chromagramPluginAdapter.getDescriptor();
+    case  3: return constantQAdapter.getDescriptor();
+    case  4: return tonalChangeDetectorAdapter.getDescriptor();
+    case  5: return keyDetectorAdapter.getDescriptor();
     default: return 0;
     }
 }