# HG changeset patch
# User Chris Cannam
# Date 1467801151 -3600
# Node ID b453b9f38dbd74dbe1690f62bea2a168c9d5e935
# Parent  a33f5dd9656dad54b812bdfae4fdb82d6f6c9a33
Update Chordino to "good" plugin version 5 (i.e. release 1.1)

diff -r a33f5dd9656d -r b453b9f38dbd audio_chord_estimation/chordino/README.txt
--- a/audio_chord_estimation/chordino/README.txt	Wed Oct 07 17:06:34 2015 +0100
+++ b/audio_chord_estimation/chordino/README.txt	Wed Jul 06 11:32:31 2016 +0100
@@ -1,5 +1,5 @@
 #
-# MIREX 2015 submission
+# MIREX 2016 submission
 #
 # Audio Chord Estimation
 # Contact: Chris Cannam, c.cannam@qmul.ac.uk
@@ -10,7 +10,7 @@
 
 # Dependencies
 
-- Sonic Annotator v1.0
+- Sonic Annotator v1.0 or newer
   http://code.soundsoftware.ac.uk/projects/sonic-annotator/files
 
 - GNU libc 2.15 or newer, GNU libstdc++ 3.4.15 or newer
diff -r a33f5dd9656d -r b453b9f38dbd audio_chord_estimation/chordino/chordino.sh
--- a/audio_chord_estimation/chordino/chordino.sh	Wed Oct 07 17:06:34 2015 +0100
+++ b/audio_chord_estimation/chordino/chordino.sh	Wed Jul 06 11:32:31 2016 +0100
@@ -27,7 +27,8 @@
 # certainly be an N rather than a chord but this will surely be a
 # problem sometimes. What to do about it?
 
-VAMP_PATH="$mydir" sonic-annotator \
+#VAMP_PATH="$mydir"
+VAMP_PATH="/home/cannam/code/nnls-chroma" sonic-annotator \
     -t "$mydir"/chordino.ttl \
     -w csv --csv-stdout --csv-separator ";" \
     "$infile" \
diff -r a33f5dd9656d -r b453b9f38dbd audio_chord_estimation/chordino/chordino.ttl
--- a/audio_chord_estimation/chordino/chordino.ttl	Wed Oct 07 17:06:34 2015 +0100
+++ b/audio_chord_estimation/chordino/chordino.ttl	Wed Jul 06 11:32:31 2016 +0100
@@ -5,33 +5,10 @@
 :transform a vamp:Transform ;
     vamp:plugin <http://vamp-plugins.org/rdf/plugins/nnls-chroma#chordino> ;
     vamp:step_size "2048"^^xsd:int ; 
-    vamp:block_size "16384"^^xsd:int ; 
-    vamp:parameter_binding [
-        vamp:parameter [ vamp:identifier "boostn" ] ;
-        vamp:value "0.1"^^xsd:float ;
-    ] ;
-    vamp:parameter_binding [
-        vamp:parameter [ vamp:identifier "rollon" ] ;
-        vamp:value "0"^^xsd:float ;
-    ] ;
-    vamp:parameter_binding [
-        vamp:parameter [ vamp:identifier "spectralshape" ] ;
-        vamp:value "0"^^xsd:float ;
-    ] ;
-    vamp:parameter_binding [
-        vamp:parameter [ vamp:identifier "tuningmode" ] ;
-        vamp:value "0"^^xsd:float ;
-    ] ;
-    vamp:parameter_binding [
-        vamp:parameter [ vamp:identifier "useNNLS" ] ;
-        vamp:value "1"^^xsd:float ;
-    ] ;
+    vamp:block_size "16384"^^xsd:int ;
+    vamp:plugin_version "5"^^xsd:int ;
     vamp:parameter_binding [
         vamp:parameter [ vamp:identifier "usehartesyntax" ] ;
         vamp:value "1"^^xsd:float ;
     ] ;
-    vamp:parameter_binding [
-        vamp:parameter [ vamp:identifier "whitening" ] ;
-        vamp:value "1"^^xsd:float ;
-    ] ;
     vamp:output <http://vamp-plugins.org/rdf/plugins/nnls-chroma#chordino_output_simplechord> .
diff -r a33f5dd9656d -r b453b9f38dbd audio_chord_estimation/chordino/nnls-chroma.so
Binary file audio_chord_estimation/chordino/nnls-chroma.so has changed