* Update to support API versioning

diff --git a/libmain.cpp b/libmain.cpp
index b9159cd..9298fe8 100644 (file)
--- a/libmain.cpp
+++ b/libmain.cpp
@@ -27,8 +27,11 @@ static Vamp::PluginAdapter<Pitch> pitchAdapter;
 static Vamp::PluginAdapter<Notes> notesAdapter;
 static Vamp::PluginAdapter<Tempo> tempoAdapter;
 
 static Vamp::PluginAdapter<Notes> notesAdapter;
 static Vamp::PluginAdapter<Tempo> tempoAdapter;
 

-const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int index)
+const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int vampApiVersion,
+                                                    unsigned int index)

 {
 {

+    if (vampApiVersion < 1) return 0;
+

     switch (index) {
     case  0: return onsetAdapter.getDescriptor();
     case  1: return pitchAdapter.getDescriptor();
     switch (index) {
     case  0: return onsetAdapter.getDescriptor();
     case  1: return pitchAdapter.getDescriptor();

diff --git a/plugins/Tempo.cpp b/plugins/Tempo.cpp
index 9d2b708..9ba35a4 100644 (file)
--- a/plugins/Tempo.cpp
+++ b/plugins/Tempo.cpp
@@ -22,7 +22,7 @@ using std::vector;
 using std::cerr;
 using std::endl;
 
 using std::cerr;
 using std::endl;
 

-#define HAVE_AUBIO_LOCKED_TEMPO_HACK
+//#define HAVE_AUBIO_LOCKED_TEMPO_HACK

 
 Tempo::Tempo(float inputSampleRate) :
     Plugin(inputSampleRate),
 
 Tempo::Tempo(float inputSampleRate) :
     Plugin(inputSampleRate),