From: Chris Cannam <cannam@all-day-breakfast.com>
Date: Tue, 27 Feb 2007 12:49:08 +0000 (+0000)
Subject: * Update to support API versioning
X-Git-Tag: hgimport~36
X-Git-Url: https://git.aubio.org/?p=vamp-aubio-plugins.git;a=commitdiff_plain;h=bb1d9d56aaca2ade7d192d36e7b6fd1447c52d62

* Update to support API versioning
---

diff --git a/libmain.cpp b/libmain.cpp
index b9159cd..9298fe8 100644
--- 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;
 
-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();
diff --git a/plugins/Tempo.cpp b/plugins/Tempo.cpp
index 9d2b708..9ba35a4 100644
--- a/plugins/Tempo.cpp
+++ b/plugins/Tempo.cpp
@@ -22,7 +22,7 @@ using std::vector;
 using std::cerr;
 using std::endl;
 
-#define HAVE_AUBIO_LOCKED_TEMPO_HACK
+//#define HAVE_AUBIO_LOCKED_TEMPO_HACK
 
 Tempo::Tempo(float inputSampleRate) :
     Plugin(inputSampleRate),