changeset 47:00312f7c69e2

Add tempo output, minor build fix
author Chris Cannam <cannam@all-day-breakfast.com>
date Wed, 05 Dec 2012 13:55:21 +0000
parents 29f2764bcb5e
children a89bf6c93ebc
files Makefile vamp-aubio.n3
diffstat 2 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Dec 05 13:50:30 2012 +0000
+++ b/Makefile	Wed Dec 05 13:55:21 2012 +0000
@@ -14,8 +14,7 @@
 
 # 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
 #
--- a/vamp-aubio.n3	Wed Dec 05 13:50:30 2012 +0000
+++ b/vamp-aubio.n3	Wed Dec 05 13:55:21 2012 +0000
@@ -400,6 +400,7 @@
     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 @@
 #   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> ;
+    .