From: Chris Cannam <cannam@all-day-breakfast.com>
Date: Wed, 5 Dec 2012 13:55:21 +0000 (+0000)
Subject: Add tempo output, minor build fix
X-Git-Tag: hgimport~3
X-Git-Url: https://git.aubio.org/?p=vamp-aubio-plugins.git;a=commitdiff_plain;h=dbf1b706a6c212f4ed5303aa7b45329ebe1cb4de;hp=04f2dd19165b626fc32b381ca91539a1cde3db83

Add tempo output, minor build fix
---

diff --git a/Makefile b/Makefile
index c50b2eb..d99831c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,7 @@ CXXFLAGS	:= $(CFLAGS)
 
 # Libraries required for the plugins.
 #
-#PLUGIN_LIBS	= -L../inst/lib -lvamp-sdk -laubio 
-PLUGIN_LIBS	= -Wl,-Bstatic -lvamp-sdk -lfftw3f -Wl,-Bdynamic
+PLUGIN_LIBS	= -Wl,-Bstatic -lvamp-sdk -Wl,-Bdynamic
 
 # Flags required to tell the compiler to make a dynamically loadable object
 #
diff --git a/vamp-aubio.n3 b/vamp-aubio.n3
index 79f46b4..f45e713 100644
--- a/vamp-aubio.n3
+++ b/vamp-aubio.n3
@@ -400,6 +400,7 @@ plugbase:aubiotempo a   vamp:Plugin ;
     vamp:parameter   plugbase:aubiotempo_param_silencethreshold ;
 
     vamp:output      plugbase:aubiotempo_output_beats ;
+    vamp:output      plugbase:aubiotempo_output_tempo ;
     .
 plugbase:aubiotempo_param_onsettype a  vamp:QuantizedParameter ;
     vamp:identifier     "onsettype" ;
@@ -444,4 +445,15 @@ plugbase:aubiotempo_output_beats a  vamp:SparseOutput ;
 #   vamp:computes_feature      <Place feature attribute URI here and uncomment> ;
 #   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;
     .
-
+plugbase:aubiotempo_output_tempo a  vamp:DenseOutput ;
+    vamp:identifier       "tempo" ;
+    dc:title              "Tempo" ;
+    dc:description        """"""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "bpm" ;
+    vamp:bin_count        1 ;
+#   vamp:computes_event_type   <Place event type URI here and uncomment> ;
+#   vamp:computes_feature      <Place feature attribute URI here and uncomment> 
+;
+#   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;
+    .