# HG changeset patch
# User Chris Cannam
# Date 1586965078 -3600
# Node ID 975dd6ac4d2dc323cc4523af62c51eee7a9147a3
# Parent  6b1ded22a288ce2d16773fba80ad58438c87f7c5# Parent  720decd4ceff1beb4e7bae889da512d1e7ef05d8
Merge

diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/azi.n3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/azi.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -0,0 +1,70 @@
+@prefix rdfs:     <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd:      <http://www.w3.org/2001/XMLSchema#> .
+@prefix vamp:     <http://purl.org/ontology/vamp/> .
+@prefix plugbase: <http://vamp-plugins.org/rdf/plugins/azi#> .
+@prefix owl:      <http://www.w3.org/2002/07/owl#> .
+@prefix dc:       <http://purl.org/dc/elements/1.1/> .
+@prefix af:       <http://purl.org/ontology/af/> .
+@prefix foaf:     <http://xmlns.com/foaf/0.1/> .
+@prefix doap:     <http://usefulinc.com/ns/doap#> .
+@prefix cc:       <http://web.resource.org/cc/> .
+@prefix :         <#> .
+
+
+## Properties of this document
+
+<> a vamp:PluginDescription ;
+    foaf:maker         <http://vamp-plugins.org/rdf/template-generator> ;
+    foaf:primaryTopic  <http://vamp-plugins.org/rdf/plugins/azi> .
+
+
+## Maker of the whole plugin library
+
+:library_maker
+    foaf:name  "Chris Cannam" ;
+    foaf:logo <http://vamp-plugins.org/rdf/plugins/makers/qm.png> ;
+    foaf:page <http://c4dm.eecs.qmul.ac.uk/>
+    .
+
+
+## Properties of the plugin library, and references to the plugins it contains
+
+plugbase:library a vamp:PluginLibrary ;
+    vamp:identifier        "azi" ;
+    foaf:maker             :library_maker ; 
+    vamp:available_plugin  plugbase:azi ; 
+    dc:title               "Stereo Plan" ;
+    dc:description         "Azimuth-based stereo plan" ;
+    foaf:page              <http://code.soundsoftware.ac.uk/projects/azi> ;
+    .
+
+
+## Properties of the Stereo Plan plugin
+
+plugbase:azi a vamp:Plugin ;
+    dc:title              "Stereo Plan" ;
+    vamp:name             "Stereo Plan" ;
+    dc:description        """Return a stereo plan decomposition of the audio. The returned feature grid covers the stereo plan from left-channel-only (first bin) to right-channel-only (last bin), with each value indicating what proportion of signal energy is found at that point on the plan at that moment. The input should consist of two channels containing left and right channel signals.""" ;
+    foaf:maker            :library_maker ;
+    dc:rights             """Freely redistributable (BSD license)""" ;
+#   cc:license            <Place plugin license URI here and uncomment> ; 
+    vamp:identifier       "azi" ;
+    vamp:vamp_API_version vamp:api_version_2 ;
+    owl:versionInfo       "1" ;
+    vamp:input_domain     vamp:FrequencyDomain ;
+
+    vamp:output      plugbase:azi_output_plan ;
+    .
+plugbase:azi_output_plan a  vamp:DenseOutput ;
+    vamp:identifier       "plan" ;
+    dc:title              "Plan" ;
+    dc:description        """"""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    vamp:bin_count        259 ;
+    vamp:bin_names        ( "Left" "L 100" "L 099" "L 098" "L 098" "L 097" "L 096" "L 095" "L 095" "L 094" "L 093" "L 092" "L 091" "L 091" "L 090" "L 089" "L 088" "L 088" "L 087" "L 086" "L 085" "L 084" "L 084" "L 083" "L 082" "L 081" "L 080" "L 080" "L 079" "L 078" "L 077" "L 077" "L 076" "L 075" "L 074" "L 073" "L 073" "L 072" "L 071" "L 070" "L 070" "L 069" "L 068" "L 067" "L 066" "L 066" "L 065" "L 064" "L 063" "L 063" "L 062" "L 061" "L 060" "L 059" "L 059" "L 058" "L 057" "L 056" "L 055" "L 055" "L 054" "L 053" "L 052" "L 052" "L 051" "L 050" "L 049" "L 048" "L 048" "L 047" "L 046" "L 045" "L 045" "L 044" "L 043" "L 042" "L 041" "L 041" "L 040" "L 039" "L 038" "L 038" "L 037" "L 036" "L 035" "L 034" "L 034" "L 033" "L 032" "L 031" "L 030" "L 030" "L 029" "L 028" "L 027" "L 027" "L 026" "L 025" "L 024" "L 023" "L 023" "L 022" "L 021" "L 020" "L 020" "L 019" "L 018" "L 017" "L 016" "L 016" "L 015" "L 014" "L 013" "L 013" "L 012" "L 011" "L 010" "L 009" "L 009" "L 008" "L 007" "L 006" "L 005" "L 005" "L 004" "L 003" "L 002" "L 002" "L 001" "Centre" "R 001" "R 002" "R 002" "R 003" "R 004" "R 005" "R 005" "R 006" "R 007" "R 008" "R 009" "R 009" "R 010" "R 011" "R 012" "R 013" "R 013" "R 014" "R 015" "R 016" "R 016" "R 017" "R 018" "R 019" "R 020" "R 020" "R 021" "R 022" "R 023" "R 023" "R 024" "R 025" "R 026" "R 027" "R 027" "R 028" "R 029" "R 030" "R 030" "R 031" "R 032" "R 033" "R 034" "R 034" "R 035" "R 036" "R 037" "R 038" "R 038" "R 039" "R 040" "R 041" "R 041" "R 042" "R 043" "R 044" "R 045" "R 045" "R 046" "R 047" "R 048" "R 048" "R 049" "R 050" "R 051" "R 052" "R 052" "R 053" "R 054" "R 055" "R 055" "R 056" "R 057" "R 058" "R 059" "R 059" "R 060" "R 061" "R 062" "R 063" "R 063" "R 064" "R 065" "R 066" "R 066" "R 067" "R 068" "R 069" "R 070" "R 070" "R 071" "R 072" "R 073" "R 073" "R 074" "R 075" "R 076" "R 077" "R 077" "R 078" "R 079" "R 080" "R 080" "R 081" "R 082" "R 083" "R 084" "R 084" "R 085" "R 086" "R 087" "R 088" "R 088" "R 089" "R 090" "R 091" "R 091" "R 092" "R 093" "R 094" "R 095" "R 095" "R 096" "R 097" "R 098" "R 098" "R 099" "R 100" "Right");
+#   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> ;
+    .
+
diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/bbc-vamp-plugins.n3
--- a/plugins/bbc-vamp-plugins.n3	Wed Apr 15 16:37:06 2020 +0100
+++ b/plugins/bbc-vamp-plugins.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -22,6 +22,7 @@
 plugbase:library a  vamp:PluginLibrary ;
     vamp:identifier "bbc-vamp-plugins"  ; 
     dc:title "BBC Vamp Plugins"  ; 
+    foaf:maker :maker ;
     dc:description "A collection of audio feature extraction algorithms from BBC Research and Development" ;
     foaf:page <https://github.com/bbcrd/bbc-vamp-plugins/blob/master/README.md> ;
     doap:download-page <https://github.com/bbcrd/bbc-vamp-plugins/releases> ;
diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/cepstral-pitchtracker.n3
--- a/plugins/cepstral-pitchtracker.n3	Wed Apr 15 16:37:06 2020 +0100
+++ b/plugins/cepstral-pitchtracker.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -55,11 +55,11 @@
     vamp:min_value    50  ;
     vamp:max_value    900  ;
     vamp:bin_count        1 ;
-#   vamp:computes_event_type   <Place event type URI here and uncomment> ;
+    vamp:computes_event_type   af:Pitch ;
 #   vamp:computes_feature      <Place feature attribute URI here and uncomment> ;
 #   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;
     .
-plugbase:cepstral-pitchtracker_output_notes a  vamp:DenseOutput ;
+plugbase:cepstral-pitchtracker_output_notes a  vamp:SparseOutput ;
     vamp:identifier       "notes" ;
     dc:title              "Notes" ;
     dc:description        """Derived fixed-pitch note frequencies"""  ;
@@ -69,8 +69,6 @@
     vamp:min_value    50  ;
     vamp:max_value    900  ;
     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> ;
+    vamp:computes_event_type   af:Note ;
     .
 
diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/cqvamp.n3
--- a/plugins/cqvamp.n3	Wed Apr 15 16:37:06 2020 +0100
+++ b/plugins/cqvamp.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -40,7 +40,7 @@
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "cqchromavamp" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "1" ;
+    owl:versionInfo       "2" ;
     vamp:input_domain     vamp:TimeDomain ;
 
     vamp:parameter   plugbase:cqchromavamp_param_lowestoct ;
@@ -111,7 +111,7 @@
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "cqvamp" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "1" ;
+    owl:versionInfo       "3" ;
     vamp:input_domain     vamp:TimeDomain ;
 
     vamp:parameter   plugbase:cqvamp_param_minfreq ;
@@ -181,7 +181,7 @@
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "cqvampmidi" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "1" ;
+    owl:versionInfo       "3" ;
     vamp:input_domain     vamp:TimeDomain ;
 
     vamp:parameter   plugbase:cqvampmidi_param_minpitch ;
diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/mvamp.n3
--- a/plugins/mvamp.n3	Wed Apr 15 16:37:06 2020 +0100
+++ b/plugins/mvamp.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -20,6 +20,7 @@
 :mvamp a  vamp:PluginLibrary ;
     vamp:identifier "mvamp"  ;
     dc:title "MARSYAS Vamp plugins" ;
+    foaf:maker :maker ;
     dc:description "Low-level feature extraction plugins containing functionality from the MARSYAS batch feature extractor" ;
     
     vamp:available_plugin plugbase:marsyas_bextract_centroid ; 
diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/nnls-chroma.n3
--- a/plugins/nnls-chroma.n3	Wed Apr 15 16:37:06 2020 +0100
+++ b/plugins/nnls-chroma.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -45,7 +45,7 @@
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "chordino" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "1" ;
+    owl:versionInfo       "5" ;
     vamp:input_domain     vamp:FrequencyDomain ;
 
 
@@ -157,7 +157,7 @@
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "nnls-chroma" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "1" ;
+    owl:versionInfo       "5" ;
     vamp:input_domain     vamp:FrequencyDomain ;
 
 
@@ -305,7 +305,7 @@
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "tuning" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "1" ;
+    owl:versionInfo       "5" ;
     vamp:input_domain     vamp:FrequencyDomain ;
 
 
diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/pyin.n3
--- a/plugins/pyin.n3	Wed Apr 15 16:37:06 2020 +0100
+++ b/plugins/pyin.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -23,12 +23,79 @@
     vamp:identifier "pyin"  ; 
     dc:title "pYIN" ;
     dc:description "pYIN is a modification of the well-loved YIN algorithm for fundamental frequency (F0) estimation in monophonic audio." ;
+    vamp:available_plugin  plugbase:localcandidatepyin ; 
     vamp:available_plugin plugbase:pyin ; 
     vamp:available_plugin plugbase:yin ; 
     foaf:page <http://code.soundsoftware.ac.uk/projects/pyin> ;
     foaf:maker :maker ;
     .
 
+plugbase:localcandidatepyin a vamp:Plugin ;
+    dc:title              "Local Candidate PYIN" ;
+    vamp:name             "Local Candidate PYIN" ;
+    dc:description        """Monophonic pitch and note tracking based on a probabilistic Yin extension.""" ;
+    foaf:maker            :library_maker ;
+    dc:rights             """GPL""" ;
+#   cc:license            <Place plugin license URI here and uncomment> ; 
+    vamp:identifier       "localcandidatepyin" ;
+    vamp:vamp_API_version vamp:api_version_2 ;
+    owl:versionInfo       "3" ;
+    vamp:input_domain     vamp:TimeDomain ;
+    vamp:parameter   plugbase:localcandidatepyin_param_threshdistr ;
+    vamp:parameter   plugbase:localcandidatepyin_param_outputunvoiced ;
+    vamp:parameter   plugbase:localcandidatepyin_param_precisetime ;
+
+    vamp:output      plugbase:localcandidatepyin_output_pitchtrackcandidates ;
+    .
+plugbase:localcandidatepyin_param_threshdistr a  vamp:QuantizedParameter ;
+    vamp:identifier     "threshdistr" ;
+    dc:title            "Yin threshold distribution" ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       7 ;
+    vamp:unit           "" ;
+    vamp:quantize_step   1  ;
+    vamp:default_value   2 ;
+    vamp:value_names     ( "Uniform" "Beta (mean 0.10)" "Beta (mean 0.15)" "Beta (mean 0.20)" "Beta (mean 0.30)" "Single Value 0.10" "Single Value 0.15" "Single Value 0.20");
+    .
+plugbase:localcandidatepyin_param_outputunvoiced a  vamp:QuantizedParameter ;
+    vamp:identifier     "outputunvoiced" ;
+    dc:title            "Output estimates classified as unvoiced?" ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       2 ;
+    vamp:unit           "" ;
+    vamp:quantize_step   1  ;
+    vamp:default_value   0 ;
+    vamp:value_names     ( "No" "Yes" "Yes, as negative frequencies");
+    .
+plugbase:localcandidatepyin_param_precisetime a  vamp:QuantizedParameter ;
+    vamp:identifier     "precisetime" ;
+    dc:title            "Use non-standard precise YIN timing (slow)." ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       1 ;
+    vamp:unit           "" ;
+    vamp:quantize_step   1  ;
+    vamp:default_value   0 ;
+    vamp:value_names     ();
+    .
+plugbase:localcandidatepyin_output_pitchtrackcandidates a  vamp:SparseOutput ;
+    vamp:identifier       "pitchtrackcandidates" ;
+    dc:title              "Pitch track candidates" ;
+    dc:description        """Multiple candidate pitch tracks."""  ;
+    vamp:fixed_bin_count  "false" ;
+    vamp:unit             "Hz" ;
+    a                 vamp:KnownExtentsOutput ;
+    vamp:min_value    40  ;
+    vamp:max_value    500  ;
+    vamp:sample_type      vamp:VariableSampleRate ;
+    vamp:sample_rate      172.266 ;
+#   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> ;
+    .
+
 plugbase:pyin a   vamp:Plugin ;
     dc:title              "pYin" ;
     vamp:name             "pYin" ;
@@ -38,11 +105,15 @@
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "pyin" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "1" ;
+    owl:versionInfo       "3" ;
     vamp:input_domain     vamp:TimeDomain ;
 
     vamp:parameter   plugbase:pyin_param_threshdistr ;
     vamp:parameter   plugbase:pyin_param_outputunvoiced ;
+    vamp:parameter   plugbase:pyin_param_precisetime ;
+    vamp:parameter   plugbase:pyin_param_lowampsuppression ;
+    vamp:parameter   plugbase:pyin_param_onsetsensitivity ;
+    vamp:parameter   plugbase:pyin_param_prunethresh ;
 
     vamp:output      plugbase:pyin_output_f0candidates ;
     vamp:output      plugbase:pyin_output_f0probs ;
@@ -73,6 +144,47 @@
     vamp:default_value   0 ;
     vamp:value_names     ( "No" "Yes" "Yes, as negative frequencies");
     .
+plugbase:pyin_param_precisetime a  vamp:QuantizedParameter ;
+    vamp:identifier     "precisetime" ;
+    dc:title            "Use non-standard precise YIN timing (slow)." ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       1 ;
+    vamp:unit           "" ;
+    vamp:quantize_step   1  ;
+    vamp:default_value   0 ;
+    vamp:value_names     ();
+    .
+plugbase:pyin_param_lowampsuppression a  vamp:Parameter ;
+    vamp:identifier     "lowampsuppression" ;
+    dc:title            "Suppress low amplitude pitch estimates." ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       1 ;
+    vamp:unit           ""  ;
+    vamp:default_value   0.1 ;
+    vamp:value_names     ();
+    .
+plugbase:pyin_param_onsetsensitivity a  vamp:Parameter ;
+    vamp:identifier     "onsetsensitivity" ;
+    dc:title            "Onset sensitivity" ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       1 ;
+    vamp:unit           ""  ;
+    vamp:default_value   0.5 ;
+    vamp:value_names     ();
+    .
+plugbase:pyin_param_prunethresh a  vamp:Parameter ;
+    vamp:identifier     "prunethresh" ;
+    dc:title            "Duration pruning threshold." ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       0.2 ;
+    vamp:unit           ""  ;
+    vamp:default_value   0.05 ;
+    vamp:value_names     ();
+    .
 plugbase:pyin_output_f0candidates a  vamp:SparseOutput ;
     vamp:identifier       "f0candidates" ;
     dc:title              "F0 Candidates" ;
@@ -151,9 +263,7 @@
     vamp:bin_count        1 ;
     vamp:sample_type      vamp:VariableSampleRate ;
     vamp:sample_rate      172.266 ;
-#   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> ;
+    vamp:computes_event_type   af:Note ;
     .
 plugbase:yin a   vamp:Plugin ;
     dc:title              "Yin" ;
@@ -164,7 +274,7 @@
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "yin" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "1" ;
+    owl:versionInfo       "3" ;
     vamp:input_domain     vamp:TimeDomain ;
 
     vamp:parameter   plugbase:yin_param_yinThreshold ;
@@ -207,7 +317,7 @@
     vamp:min_value    40  ;
     vamp:max_value    500  ;
     vamp:bin_count        1 ;
-#   vamp:computes_event_type   <Place event type URI here and uncomment> ;
+    vamp:computes_event_type   af:Pitch ;
 #   vamp:computes_feature      <Place feature attribute URI here and uncomment> ;
 #   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;
     .
@@ -227,7 +337,7 @@
     .
 plugbase:yin_output_rms a  vamp:DenseOutput ;
     vamp:identifier       "rms" ;
-    dc:title              "root mean square" ;
+    dc:title              "Root mean square" ;
     dc:description        """Root mean square of the waveform."""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/qm-vamp-plugins.n3
--- a/plugins/qm-vamp-plugins.n3	Wed Apr 15 16:37:06 2020 +0100
+++ b/plugins/qm-vamp-plugins.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -11,13 +11,13 @@
 @prefix :         <#> .
 
 <>  a   vamp:PluginDescription ;
-    foaf:maker          <http://www.vamp-plugins.org/doap.rdf#template-generator> ;
+    foaf:maker          <http://vamp-plugins.org/rdf/template-generator> ;
     foaf:primaryTopic   <http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins> .
 
 :maker
     foaf:name "Queen Mary, University of London" ;
-    foaf:logo <http://vamp-plugins.org/rdf/plugins/makers/qm.png> ;
-    foaf:page <http://c4dm.eecs.qmul.ac.uk/> .
+    foaf:logo <https://vamp-plugins.org/rdf/plugins/makers/qm.png> ;
+    foaf:page <https://c4dm.eecs.qmul.ac.uk/> .
 
 plugbase:library a  vamp:PluginLibrary ;
     vamp:identifier "qm-vamp-plugins"  ; 
@@ -36,7 +36,7 @@
     vamp:available_plugin plugbase:qm-tempotracker ; 
     vamp:available_plugin plugbase:qm-tonalchange ; 
     vamp:available_plugin plugbase:qm-transcription ; 
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html> ;
+    foaf:page <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html> ;
     doap:download-page <https://code.soundsoftware.ac.uk/projects/qm-vamp-plugins/files> ;
     dc:title "Queen Mary plugin set" ;
     dc:description """Plugins from the Centre for Digital Music at Queen Mary, University of London""" .
@@ -48,14 +48,16 @@
     dc:description        """Produce an adaptive spectrogram by adaptive selection from spectrograms at multiple resolutions""" ;
     foaf:maker            :maker ;
     dc:rights             """Plugin by Wen Xue and Chris Cannam.  Copyright (c) 2009 Wen Xue and QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-adaptivespectrogram" ;
     vamp:vamp_API_version vamp:api_version_2 ;
     owl:versionInfo       "1" ;
     vamp:input_domain     vamp:TimeDomain ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-adaptivespectrogram> ;
+    foaf:page             <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-adaptivespectrogram> ;
 
     vamp:parameter   plugbase:qm-adaptivespectrogram_param_n ;
     vamp:parameter   plugbase:qm-adaptivespectrogram_param_w ;
+    vamp:parameter   plugbase:qm-adaptivespectrogram_param_dec ;
     vamp:parameter   plugbase:qm-adaptivespectrogram_param_coarse ;
     vamp:parameter   plugbase:qm-adaptivespectrogram_param_threaded ;
 
@@ -83,6 +85,17 @@
     vamp:default_value   9 ;
     vamp:value_names     ( "2" "4" "8" "16" "32" "64" "128" "256" "512" "1024" "2048" "4096" "8192" "16384");
     .
+plugbase:qm-adaptivespectrogram_param_dec a  vamp:QuantizedParameter ;
+    vamp:identifier     "dec" ;
+    dc:title            "Decimation factor" ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       3 ;
+    vamp:unit           "" ;
+    vamp:quantize_step   1  ;
+    vamp:default_value   0 ;
+    vamp:value_names     ( "No decimation" "2" "4" "8");
+    .
 plugbase:qm-adaptivespectrogram_param_coarse a  vamp:QuantizedParameter ;
     vamp:identifier     "coarse" ;
     dc:title            "Omit alternate resolutions" ;
@@ -118,14 +131,18 @@
     vamp:category	  "Time > Tempo" ;
     dc:description        """Estimate bar and beat locations""" ;
     foaf:maker            :maker ;
-    dc:rights             """Plugin by Matthew Davies, Christian Landone and Chris Cannam.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
+    dc:rights             """Plugin by Matthew Davies, Christian Landone and Chris Cannam.  Copyright (c) 2006-2013 QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-barbeattracker" ;
     vamp:vamp_API_version vamp:api_version_2 ;
     owl:versionInfo       "1" ;
     vamp:input_domain     vamp:TimeDomain ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-barbeattracker> ;
+    foaf:page <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-barbeattracker> ;
 
     vamp:parameter   plugbase:qm-barbeattracker_param_bpb ;
+    vamp:parameter   plugbase:qm-barbeattracker_param_alpha ;
+    vamp:parameter   plugbase:qm-barbeattracker_param_inputtempo ;
+    vamp:parameter   plugbase:qm-barbeattracker_param_constraintempo ;
 
     vamp:output      plugbase:qm-barbeattracker_output_beats ;
     vamp:output      plugbase:qm-barbeattracker_output_bars ;
@@ -143,6 +160,38 @@
     vamp:default_value   4 ;
     vamp:value_names     ();
     .
+plugbase:qm-barbeattracker_param_alpha a  vamp:Parameter ;
+    vamp:identifier     "alpha" ;
+    dc:title            "Alpha" ;
+    dc:format           "" ;
+    vamp:min_value       0.1 ;
+    vamp:max_value       0.99 ;
+    vamp:unit           ""  ;
+    vamp:default_value   0.9 ;
+    vamp:value_names     ();
+    .
+plugbase:qm-barbeattracker_param_inputtempo a  vamp:QuantizedParameter ;
+    vamp:identifier     "inputtempo" ;
+    dc:title            "Tempo Hint" ;
+    dc:format           "BPM" ;
+    vamp:min_value       50 ;
+    vamp:max_value       250 ;
+    vamp:unit           "BPM" ;
+    vamp:quantize_step   1  ;
+    vamp:default_value   120 ;
+    vamp:value_names     ();
+    .
+plugbase:qm-barbeattracker_param_constraintempo a  vamp:QuantizedParameter ;
+    vamp:identifier     "constraintempo" ;
+    dc:title            "Constrain Tempo" ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       1 ;
+    vamp:unit           "" ;
+    vamp:quantize_step   1  ;
+    vamp:default_value   0 ;
+    vamp:value_names     ();
+    .
 plugbase:qm-barbeattracker_output_beats a  vamp:SparseOutput ;
     vamp:identifier       "beats" ;
     dc:title              "Beats" ;
@@ -192,12 +241,13 @@
     vamp:name             "Chromagram" ;
     vamp:category	  "Visualisation" ;
     dc:description        """Extract a series of tonal chroma vectors from the audio""" ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-chromagram> ;
+    foaf:page             <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-chromagram> ;
     foaf:maker            :maker ;
     dc:rights             """Plugin by Chris Cannam and Christian Landone.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-chromagram" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "4" ;
+    owl:versionInfo       "5" ;
     vamp:input_domain     vamp:FrequencyDomain ;
 
 
@@ -267,7 +317,7 @@
 plugbase:qm-chromagram_output_chromagram a  vamp:DenseOutput ;
     vamp:identifier       "chromagram" ;
     dc:title              "Chromagram" ;
-    dc:description        "Output of chromagram, as a single vector per process block"  ;
+    dc:description        """Output of chromagram, as a single vector per process block"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        12 ;
@@ -277,7 +327,7 @@
 plugbase:qm-chromagram_output_chromameans a  vamp:DenseOutput ;
     vamp:identifier       "chromameans" ;
     dc:title              "Chroma Means" ;
-    dc:description        "Mean values of chromagram bins across the duration of the input audio"  ;
+    dc:description        """Mean values of chromagram bins across the duration of the input audio"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        12 ;
@@ -291,12 +341,13 @@
     vamp:name             "Constant-Q Spectrogram" ;
     vamp:category	  "Visualisation" ;
     dc:description        """Extract a spectrogram with constant ratio of centre frequency to resolution from the input audio""" ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-constantq> ;
+    foaf:page             <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-constantq> ;
     foaf:maker            :maker ;
     dc:rights             """Plugin by Chris Cannam and Christian Landone.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-constantq" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "2" ;
+    owl:versionInfo       "4" ;
     vamp:input_domain     vamp:FrequencyDomain ;
 
 
@@ -378,11 +429,12 @@
     dc:description        """Visualisation by scalogram""" ;
     foaf:maker            :maker ;
     dc:rights             """Plugin by Thomas Wilmering.  Copyright (c) 2009 Thomas Wilmering and QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-dwt" ;
     vamp:vamp_API_version vamp:api_version_2 ;
     owl:versionInfo       "1" ;
     vamp:input_domain     vamp:TimeDomain ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-dwt> ;
+    foaf:page             <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-dwt> ;
 
     vamp:parameter   plugbase:qm-dwt_param_scales ;
     vamp:parameter   plugbase:qm-dwt_param_wavelet ;
@@ -448,12 +500,13 @@
     vamp:name             "Key Detector" ;
     vamp:category	  "Key and Tonality" ;
     dc:description        """Estimate the key of the music""" ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-keydetector> ;
+    foaf:page             <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-keydetector> ;
     foaf:maker            :maker ;
-    dc:rights             """Plugin by Katy Noland and Christian Landone.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
+    dc:rights             """Plugin by Katy Noland and Christian Landone.  Copyright (c) 2006-2019 QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-keydetector" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "4" ;
+    owl:versionInfo       "6" ;
     vamp:input_domain     vamp:TimeDomain ;
 
     vamp:parameter   plugbase:qm-keydetector_param_tuning ;
@@ -463,6 +516,7 @@
     vamp:output      plugbase:qm-keydetector_output_mode ;
     vamp:output      plugbase:qm-keydetector_output_key ;
     vamp:output      plugbase:qm-keydetector_output_keystrength ;
+    vamp:output      plugbase:qm-keydetector_output_mergedkeystrength ;
     .
 plugbase:qm-keydetector_param_tuning a  vamp:Parameter ;
     vamp:identifier     "tuning" ;
@@ -488,7 +542,7 @@
 plugbase:qm-keydetector_output_tonic a  vamp:SparseOutput ;
     vamp:identifier       "tonic" ;
     dc:title              "Tonic Pitch" ;
-    dc:description        "Tonic of the estimated key (from C = 1 to B = 12)"  ;
+    dc:description        """Tonic of the estimated key (from C = 1 to B = 12)""" ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     a                     vamp:QuantizedOutput ;
@@ -507,7 +561,7 @@
 plugbase:qm-keydetector_output_mode a  vamp:SparseOutput ;
     vamp:identifier       "mode" ;
     dc:title              "Key Mode" ;
-    dc:description        "Major or minor mode of the estimated key (major = 0, minor = 1)"  ;
+    dc:description        """Major or minor mode of the estimated key (major = 0, minor = 1)"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     a                     vamp:QuantizedOutput ;
@@ -526,7 +580,7 @@
 plugbase:qm-keydetector_output_key a  vamp:SparseOutput ;
     vamp:identifier       "key" ;
     dc:title              "Key" ;
-    dc:description        "Estimated key (from C major = 1 to B major = 12 and C minor = 13 to B minor = 24)"  ;
+    dc:description        """Estimated key (from C major = 1 to B major = 12 and C minor = 13 to B minor = 24)"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     a                     vamp:QuantizedOutput ;
@@ -543,21 +597,30 @@
 plugbase:qm-keydetector_output_keystrength a  vamp:DenseOutput ;
     vamp:identifier       "keystrength" ;
     dc:title              "Key Strength Plot" ;
-    dc:description        "Correlation of the chroma vector with stored key profile for each major and minor key"  ;
+    dc:description        """Correlation of the chroma vector with stored key profile for each major and minor key"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        25 ;
     vamp:bin_names        ( "F# / Gb major" "B major" "E major" "A major" "D major" "G major" "C major" "F major" "Bb major" "Eb major" "Ab major" "Db major" " " "Eb / D# minor" "G# minor" "C# minor" "F# minor" "B minor" "E minor" "A minor" "D minor" "G minor" "C minor" "F minor" "Bb minor");
-#   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;
+    .
+plugbase:qm-keydetector_output_mergedkeystrength a  vamp:DenseOutput ;
+    vamp:identifier       "mergedkeystrength" ;
+    dc:title              "Merged Key Strength Plot" ;
+    dc:description        """Correlation of the chroma vector with stored key profile for each key, with major and minor alternatives merged"""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    vamp:bin_count        12 ;
+    vamp:bin_names        ( "F#/Gb maj / Eb/D# min" "B maj / G# min" "E maj / C# min" "A maj / F# min" "D maj / B min" "G maj / E min" "C maj / A min" "F maj / D min" "Bb maj / G min" "Eb maj / C min" "Ab maj / F min" "Db maj / Bb min");
     .
 plugbase:qm-mfcc a   vamp:Plugin ;
     dc:title              "Mel-Frequency Cepstral Coefficients" ;
     vamp:name             "Mel-Frequency Cepstral Coefficients" ;
     vamp:category	  "Low Level Features" ;
     dc:description        """Calculate a series of MFCC vectors from the audio""" ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-mfcc> ;
+    foaf:page             <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-mfcc> ;
     foaf:maker            :maker ;
     dc:rights             """Plugin by Nicolas Chetry and Chris Cannam.  Copyright (c) 2009 QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-mfcc" ;
     vamp:vamp_API_version vamp:api_version_2 ;
     owl:versionInfo       "1" ;
@@ -606,7 +669,7 @@
 plugbase:qm-mfcc_output_coefficients a  vamp:DenseOutput ;
     vamp:identifier       "coefficients" ;
     dc:title              "Coefficients" ;
-    dc:description        "MFCC values"  ;
+    dc:description        """MFCC values"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        20 ;
@@ -618,7 +681,7 @@
 plugbase:qm-mfcc_output_means a  vamp:DenseOutput ;
     vamp:identifier       "means" ;
     dc:title              "Means of Coefficients" ;
-    dc:description        "Mean values of MFCCs across duration of audio input"  ;
+    dc:description        """Mean values of MFCCs across duration of audio input"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        20 ;
@@ -632,12 +695,13 @@
     vamp:name             "Note Onset Detector" ;
     vamp:category	  "Time > Onsets" ;
     dc:description        """Estimate individual note onset positions""" ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-onsetdetector> ;
+    foaf:page             <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-onsetdetector> ;
     foaf:maker            :maker ;
     dc:rights             """Plugin by Christian Landone, Chris Duxbury and Juan Pablo Bello.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-onsetdetector" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "2" ;
+    owl:versionInfo       "3" ;
     vamp:input_domain     vamp:FrequencyDomain ;
 
 
@@ -685,7 +749,7 @@
 plugbase:qm-onsetdetector_output_onsets a  vamp:SparseOutput ;
     vamp:identifier       "onsets" ;
     dc:title              "Note Onsets" ;
-    dc:description        "Perceived note onset positions"  ;
+    dc:description        """Perceived note onset positions"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        0 ;
@@ -697,7 +761,7 @@
 plugbase:qm-onsetdetector_output_detection_fn a  vamp:DenseOutput ;
     vamp:identifier       "detection_fn" ;
     dc:title              "Onset Detection Function" ;
-    dc:description        "Probability function of note onset likelihood"  ;
+    dc:description        """Probability function of note onset likelihood"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        1 ;
@@ -707,7 +771,7 @@
 plugbase:qm-onsetdetector_output_smoothed_df a  vamp:SparseOutput ;
     vamp:identifier       "smoothed_df" ;
     dc:title              "Smoothed Detection Function" ;
-    dc:description        "Smoothed probability function used for peak-picking"  ;
+    dc:description        """Smoothed probability function used for peak-picking"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        1 ;
@@ -721,12 +785,13 @@
     vamp:name             "Segmenter" ;
     vamp:category	  "Classification" ;
     dc:description        """Divide the track into a sequence of consistent segments""" ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-segmenter> ;
+    foaf:page             <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-segmenter> ;
     foaf:maker            :maker ;
-    dc:rights             """Plugin by Mark Levy.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
+    dc:rights             """Plugin by Mark Levy.  Copyright (c) 2006-2013 QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-segmenter" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "2" ;
+    owl:versionInfo       "3" ;
     vamp:input_domain     vamp:TimeDomain ;
 
     vamp:parameter   plugbase:qm-segmenter_param_nSegmentTypes ;
@@ -771,7 +836,7 @@
 plugbase:qm-segmenter_output_segmentation a  vamp:SparseOutput ;
     vamp:identifier       "segmentation" ;
     dc:title              "Segmentation" ;
-    dc:description        "Segmentation"  ;
+    dc:description        """Segmentation"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "segment-type" ;
     a                     vamp:QuantizedOutput ;
@@ -790,9 +855,10 @@
     vamp:name             "Similarity" ;
     vamp:category	  "Classification" ;
     dc:description        """Return a distance matrix for similarity between the input audio channels""" ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-similarity> ;
+    foaf:page             <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-similarity> ;
     foaf:maker            :maker ;
     dc:rights             """Plugin by Mark Levy, Kurt Jacobson and Chris Cannam.  Copyright (c) 2009 QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-similarity" ;
     vamp:vamp_API_version vamp:api_version_2 ;
     owl:versionInfo       "1" ;
@@ -821,7 +887,7 @@
 plugbase:qm-similarity_output_distancematrix a  vamp:DenseOutput ;
     vamp:identifier       "distancematrix" ;
     dc:title              "Distance Matrix" ;
-    dc:description        "Distance matrix for similarity metric.  Smaller = more similar.  Should be symmetrical."  ;
+    dc:description        """Distance matrix for similarity metric.  Smaller = more similar.  Should be symmetrical."""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        0 ;
@@ -833,7 +899,7 @@
 plugbase:qm-similarity_output_distancevector a  vamp:DenseOutput ;
     vamp:identifier       "distancevector" ;
     dc:title              "Distance from First Channel" ;
-    dc:description        "Distance vector for similarity of each channel to the first channel.  Smaller = more similar."  ;
+    dc:description        """Distance vector for similarity of each channel to the first channel.  Smaller = more similar."""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        0 ;
@@ -845,7 +911,7 @@
 plugbase:qm-similarity_output_sorteddistancevector a  vamp:DenseOutput ;
     vamp:identifier       "sorteddistancevector" ;
     dc:title              "Ordered Distances from First Channel" ;
-    dc:description        "Vector of the order of other channels in similarity to the first, followed by distance vector for similarity of each to the first.  Smaller = more similar."  ;
+    dc:description        """Vector of the order of other channels in similarity to the first, followed by distance vector for similarity of each to the first.  Smaller = more similar."""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        0 ;
@@ -857,7 +923,7 @@
 plugbase:qm-similarity_output_means a  vamp:DenseOutput ;
     vamp:identifier       "means" ;
     dc:title              "Feature Means" ;
-    dc:description        "Means of the feature bins.  Feature time (sec) corresponds to input channel.  Number of bins depends on selected feature type."  ;
+    dc:description        """Means of the feature bins.  Feature time (sec) corresponds to input channel.  Number of bins depends on selected feature type."""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        20 ;
@@ -869,7 +935,7 @@
 plugbase:qm-similarity_output_variances a  vamp:DenseOutput ;
     vamp:identifier       "variances" ;
     dc:title              "Feature Variances" ;
-    dc:description        "Variances of the feature bins.  Feature time (sec) corresponds to input channel.  Number of bins depends on selected feature type."  ;
+    dc:description        """Variances of the feature bins.  Feature time (sec) corresponds to input channel.  Number of bins depends on selected feature type."""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        20 ;
@@ -881,7 +947,7 @@
 plugbase:qm-similarity_output_beatspectrum a  vamp:SparseOutput ;
     vamp:identifier       "beatspectrum" ;
     dc:title              "Beat Spectra" ;
-    dc:description        "Rhythmic self-similarity vectors (beat spectra) for the input channels.  Feature time (sec) corresponds to input channel.  Not returned if rhythm weighting is zero."  ;
+    dc:description        """Rhythmic self-similarity vectors (beat spectra) for the input channels.  Feature time (sec) corresponds to input channel.  Not returned if rhythm weighting is zero."""  ;
     vamp:fixed_bin_count  "false" ;
     vamp:unit             "" ;
     vamp:sample_type      vamp:VariableSampleRate ;
@@ -895,18 +961,22 @@
     vamp:name             "Tempo and Beat Tracker" ;
     vamp:category	  "Time > Tempo" ;
     dc:description        """Estimate beat locations and tempo""" ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-tempotracker> ;
+    foaf:page             <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-tempotracker> ;
     foaf:maker            :maker ;
-    dc:rights             """Plugin by Christian Landone and Matthew Davies.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
+    dc:rights             """Plugin by Christian Landone and Matthew Davies.  Copyright (c) 2006-2013 QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-tempotracker" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "4" ;
+    owl:versionInfo       "6" ;
     vamp:input_domain     vamp:FrequencyDomain ;
 
 
     vamp:parameter   plugbase:qm-tempotracker_param_method ;
     vamp:parameter   plugbase:qm-tempotracker_param_dftype ;
     vamp:parameter   plugbase:qm-tempotracker_param_whiten ;
+    vamp:parameter   plugbase:qm-tempotracker_param_alpha ;
+    vamp:parameter   plugbase:qm-tempotracker_param_inputtempo ;
+    vamp:parameter   plugbase:qm-tempotracker_param_constraintempo ;
 
     vamp:output      plugbase:qm-tempotracker_output_beats ;
     vamp:output      plugbase:qm-tempotracker_output_detection_fn ;
@@ -945,10 +1015,42 @@
     vamp:default_value   0 ;
     vamp:value_names     ();
     .
+plugbase:qm-tempotracker_param_alpha a  vamp:Parameter ;
+    vamp:identifier     "alpha" ;
+    dc:title            "Alpha" ;
+    dc:format           "" ;
+    vamp:min_value       0.1 ;
+    vamp:max_value       0.99 ;
+    vamp:unit           ""  ;
+    vamp:default_value   0.9 ;
+    vamp:value_names     ();
+    .
+plugbase:qm-tempotracker_param_inputtempo a  vamp:QuantizedParameter ;
+    vamp:identifier     "inputtempo" ;
+    dc:title            "Tempo Hint" ;
+    dc:format           "BPM" ;
+    vamp:min_value       50 ;
+    vamp:max_value       250 ;
+    vamp:unit           "BPM" ;
+    vamp:quantize_step   1  ;
+    vamp:default_value   120 ;
+    vamp:value_names     ();
+    .
+plugbase:qm-tempotracker_param_constraintempo a  vamp:QuantizedParameter ;
+    vamp:identifier     "constraintempo" ;
+    dc:title            "Constrain Tempo" ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       1 ;
+    vamp:unit           "" ;
+    vamp:quantize_step   1  ;
+    vamp:default_value   0 ;
+    vamp:value_names     ();
+    .
 plugbase:qm-tempotracker_output_beats a  vamp:SparseOutput ;
     vamp:identifier       "beats" ;
     dc:title              "Beats" ;
-    dc:description        "Estimated metrical beat locations"  ;
+    dc:description        """Estimated metrical beat locations"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        0 ;
@@ -960,7 +1062,7 @@
 plugbase:qm-tempotracker_output_detection_fn a  vamp:DenseOutput ;
     vamp:identifier       "detection_fn" ;
     dc:title              "Onset Detection Function" ;
-    dc:description        "Probability function of note onset likelihood"  ;
+    dc:description        """Probability function of note onset likelihood"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        1 ;
@@ -970,7 +1072,7 @@
 plugbase:qm-tempotracker_output_tempo a  vamp:SparseOutput ;
     vamp:identifier       "tempo" ;
     dc:title              "Tempo" ;
-    dc:description        "Locked tempo estimates"  ;
+    dc:description        """Locked tempo estimates"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "bpm" ;
     vamp:bin_count        1 ;
@@ -984,12 +1086,13 @@
     vamp:name             "Tonal Change" ;
     vamp:category	  "Key and Tonality" ;
     dc:description        """Detect and return the positions of harmonic changes such as chord boundaries""" ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-tonalchange> ;
+    foaf:page             <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-tonalchange> ;
     foaf:maker            :maker ;
     dc:rights             """Plugin by Martin Gasser and Christopher Harte.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-tonalchange" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "1" ;
+    owl:versionInfo       "4" ;
     vamp:input_domain     vamp:TimeDomain ;
 
     vamp:parameter   plugbase:qm-tonalchange_param_smoothingwidth ;
@@ -1047,7 +1150,7 @@
 plugbase:qm-tonalchange_output_tcstransform a  vamp:DenseOutput ;
     vamp:identifier       "tcstransform" ;
     dc:title              "Transform to 6D Tonal Content Space" ;
-    dc:description        ""  ;
+    dc:description        """Representation of content in a six-dimensional tonal space"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     a                 vamp:KnownExtentsOutput ;
@@ -1060,7 +1163,7 @@
 plugbase:qm-tonalchange_output_tcfunction a  vamp:SparseOutput ;
     vamp:identifier       "tcfunction" ;
     dc:title              "Tonal Change Detection Function" ;
-    dc:description        ""  ;
+    dc:description        """Estimate of the likelihood of a tonal change occurring within each spectral frame"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        1 ;
@@ -1072,7 +1175,7 @@
 plugbase:qm-tonalchange_output_changepositions a  vamp:SparseOutput ;
     vamp:identifier       "changepositions" ;
     dc:title              "Tonal Change Positions" ;
-    dc:description        ""  ;
+    dc:description        """Estimated locations of tonal changes"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
     vamp:bin_count        0 ;
@@ -1086,9 +1189,10 @@
     vamp:name             "Polyphonic Transcription" ;
     vamp:category	  "Notes" ;
     dc:description        """Transcribe the input audio to estimated notes""" ;
-    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-transcription> ;
+    foaf:page             <https://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-transcription> ;
     foaf:maker            :maker ;
     dc:rights             """Plugin by Dr. Ruohua Zhou.  Copyright (c) 2008-2009 QMUL - All Rights Reserved""" ;
+    cc:license            <https://www.gnu.org/licenses/old-licenses/gpl-2.0> ;
     vamp:identifier       "qm-transcription" ;
     vamp:vamp_API_version vamp:api_version_2 ;
     owl:versionInfo       "1" ;
diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/segmentino.n3
--- a/plugins/segmentino.n3	Wed Apr 15 16:37:06 2020 +0100
+++ b/plugins/segmentino.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -44,7 +44,7 @@
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "segmentino" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "2" ;
+    owl:versionInfo       "3" ;
     vamp:input_domain     vamp:TimeDomain ;
     vamp:output      plugbase:segmentino_output_segmentation ;
     .
diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/tipic.n3
--- a/plugins/tipic.n3	Wed Apr 15 16:37:06 2020 +0100
+++ b/plugins/tipic.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -51,7 +51,7 @@
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "tipic" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "0" ;
+    owl:versionInfo       "1" ;
     vamp:input_domain     vamp:TimeDomain ;
     vamp:parameter   plugbase:tipic_param_tuning ;
 
diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/tuning-difference.n3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/tuning-difference.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -0,0 +1,152 @@
+@prefix rdfs:     <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd:      <http://www.w3.org/2001/XMLSchema#> .
+@prefix vamp:     <http://purl.org/ontology/vamp/> .
+@prefix plugbase: <http://vamp-plugins.org/rdf/plugins/tuning-difference#> .
+@prefix owl:      <http://www.w3.org/2002/07/owl#> .
+@prefix dc:       <http://purl.org/dc/elements/1.1/> .
+@prefix af:       <http://purl.org/ontology/af/> .
+@prefix foaf:     <http://xmlns.com/foaf/0.1/> .
+@prefix doap:     <http://usefulinc.com/ns/doap#> .
+@prefix cc:       <http://web.resource.org/cc/> .
+@prefix :         <#> .
+
+
+## Properties of this document
+
+<> a vamp:PluginDescription ;
+    foaf:maker         <http://vamp-plugins.org/rdf/template-generator> ;
+    foaf:primaryTopic  <http://vamp-plugins.org/rdf/plugins/tuning-difference> .
+
+
+## Maker of the whole plugin library
+
+:library_maker
+    foaf:name  "Chris Cannam" ;
+    foaf:logo <http://vamp-plugins.org/rdf/plugins/makers/qm.png> ;
+    foaf:page <http://c4dm.eecs.qmul.ac.uk/> .
+
+## Properties of the plugin library, and references to the plugins it contains
+
+plugbase:library a vamp:PluginLibrary ;
+    vamp:identifier        "tuning-difference" ;
+    foaf:maker             :library_maker ; 
+    vamp:available_plugin  plugbase:tuning-difference ; 
+    dc:title               "Tuning Difference" ;
+    dc:description         "Estimate the tuning frequency of a recording, by comparing it to another recording of the same music whose tuning frequency is known" ;
+    foaf:page              <http://code.soundsoftware.ac.uk/projects/tuning-difference> ;
+    doap:download-page     <http://code.soundsoftware.ac.uk/projects/tuning-difference> ;
+    .
+
+
+## Properties of the Tuning Difference plugin
+
+plugbase:tuning-difference a vamp:Plugin ;
+    dc:title              "Tuning Difference" ;
+    vamp:name             "Tuning Difference" ;
+    dc:description        """Estimate the tuning frequency of a recording, by comparing it to another recording of the same music whose tuning frequency is known""" ;
+    foaf:maker            :library_maker ;
+    dc:rights             """GPL""" ;
+    vamp:identifier       "tuning-difference" ;
+    vamp:vamp_API_version vamp:api_version_2 ;
+    owl:versionInfo       "3" ;
+    vamp:input_domain     vamp:TimeDomain ;
+    vamp:parameter   plugbase:tuning-difference_param_maxduration ;
+    vamp:parameter   plugbase:tuning-difference_param_maxrange ;
+    vamp:parameter   plugbase:tuning-difference_param_finetuning ;
+
+    vamp:output      plugbase:tuning-difference_output_cents ;
+    vamp:output      plugbase:tuning-difference_output_tuningfreq ;
+    vamp:output      plugbase:tuning-difference_output_reffeature ;
+    vamp:output      plugbase:tuning-difference_output_otherfeature ;
+    vamp:output      plugbase:tuning-difference_output_rotfeature ;
+    .
+plugbase:tuning-difference_param_maxduration a  vamp:Parameter ;
+    vamp:identifier     "maxduration" ;
+    dc:title            "Maximum duration to analyse" ;
+    dc:format           "s" ;
+    vamp:min_value       0 ;
+    vamp:max_value       3600 ;
+    vamp:unit           "s"  ;
+    vamp:default_value   0 ;
+    vamp:value_names     ();
+    .
+plugbase:tuning-difference_param_maxrange a  vamp:QuantizedParameter ;
+    vamp:identifier     "maxrange" ;
+    dc:title            "Maximum range in semitones" ;
+    dc:format           "semitones" ;
+    vamp:min_value       1 ;
+    vamp:max_value       11 ;
+    vamp:unit           "semitones" ;
+    vamp:quantize_step   1  ;
+    vamp:default_value   4 ;
+    vamp:value_names     ();
+    .
+plugbase:tuning-difference_param_finetuning a  vamp:QuantizedParameter ;
+    vamp:identifier     "finetuning" ;
+    dc:title            "Fine tuning" ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       1 ;
+    vamp:unit           "" ;
+    vamp:quantize_step   1  ;
+    vamp:default_value   1 ;
+    vamp:value_names     ();
+    .
+plugbase:tuning-difference_output_cents a  vamp:SparseOutput ;
+    vamp:identifier       "cents" ;
+    dc:title              "Tuning Difference" ;
+    dc:description        """Difference in averaged frequency profile between channels 1 and 2, in cents. A positive value means channel 2 is higher."""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "cents" ;
+    vamp:bin_count        1 ;
+    vamp:sample_type      vamp:VariableSampleRate ;
+#   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> ;
+    .
+plugbase:tuning-difference_output_tuningfreq a  vamp:SparseOutput ;
+    vamp:identifier       "tuningfreq" ;
+    dc:title              "Relative Tuning Frequency" ;
+    dc:description        """Tuning frequency of channel 2, if channel 1 is assumed to contain the same music as it at a tuning frequency of A=440Hz."""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "hz" ;
+    vamp:bin_count        1 ;
+    vamp:sample_type      vamp:VariableSampleRate ;
+#   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> ;
+    .
+plugbase:tuning-difference_output_reffeature a  vamp:DenseOutput ;
+    vamp:identifier       "reffeature" ;
+    dc:title              "Reference Feature" ;
+    dc:description        """Chroma feature from reference audio."""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    vamp:bin_count        60 ;
+#   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> ;
+    .
+plugbase:tuning-difference_output_otherfeature a  vamp:DenseOutput ;
+    vamp:identifier       "otherfeature" ;
+    dc:title              "Other Feature" ;
+    dc:description        """Chroma feature from other audio, before rotation."""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    vamp:bin_count        60 ;
+#   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> ;
+    .
+plugbase:tuning-difference_output_rotfeature a  vamp:DenseOutput ;
+    vamp:identifier       "rotfeature" ;
+    dc:title              "Other Feature at Rotated Frequency" ;
+    dc:description        """Chroma feature from reference audio calculated with the tuning frequency obtained from rotation matching."""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    vamp:bin_count        60 ;
+#   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> ;
+    .
+
diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/ua-vamp-plugins.n3
--- a/plugins/ua-vamp-plugins.n3	Wed Apr 15 16:37:06 2020 +0100
+++ b/plugins/ua-vamp-plugins.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -36,7 +36,7 @@
     vamp:available_plugin  plugbase:mf0ua ; 
     vamp:available_plugin  plugbase:onsetsua ; 
     dc:title               "University of Alicante Vamp Plugins" ;  
-    dc:description         """The UAPlugins set is a library of VAMP plugins developed in the DRIMS project to perform onset detection and polyphonic transcription. The methods used in this library were developed by Antonio Pertusa and José Manuel Iñesta.""" ; 
+    dc:description         """The UAPlugins set is a library of Vamp plugins developed in the DRIMS project to perform onset detection and polyphonic transcription. The methods used in this library were developed by Antonio Pertusa and José Manuel Iñesta.""" ; 
     foaf:page              <http://grfia.dlsi.ua.es/cm/projects/drims/softwareVAMP.php> ; 
     doap:download-page     <http://grfia.dlsi.ua.es/cm/projects/drims/softwareVAMP.php> ; 
     vamp:has_source true;
diff -r 6b1ded22a288 -r 975dd6ac4d2d plugins/vamp-aubio.n3
--- a/plugins/vamp-aubio.n3	Wed Apr 15 16:37:06 2020 +0100
+++ b/plugins/vamp-aubio.n3	Wed Apr 15 16:37:58 2020 +0100
@@ -523,13 +523,13 @@
     dc:title              "Aubio Mfcc Extractor" ;
     vamp:name             "Aubio Mfcc Extractor" ;
     vamp:category	  "Low Level Features" ;
-    dc:description        """Detect levels below a certain threshold""" ;
+    dc:description        """Extract Mel-Frequency Cepstrum Coefficients""" ;
     foaf:maker :maker ;
     dc:rights             """GPL""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ;
     vamp:identifier       "aubiomfcc" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "4" ;
+    owl:versionInfo       "3" ;
     vamp:input_domain     vamp:TimeDomain ;
 
     vamp:parameter   plugbase:aubiomfcc_param_nfilters ;
@@ -559,15 +559,13 @@
     vamp:default_value   13 ;
     vamp:value_names     ();
     .
-plugbase:aubiomfcc_output_silencelevel a  vamp:DenseOutput ;
+plugbase:aubiomfcc_output_mfcc a  vamp:DenseOutput ;
     vamp:identifier       "mfcc" ;
     dc:title              "Mel-Frequency Cepstrum Coefficients" ;
     dc:description        """List of detected Mel-Frequency Cepstrum Coefficients""" ;
-    dc:description        """"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
-    a                     vamp:QuantizedOutput ;
-    vamp:bin_count        1 ;
+    vamp:bin_count        0 ;
     .
 plugbase:aubiomelenergy a   vamp:Plugin ;
     dc:title              "Aubio Mel-Frequency Bands Extractor" ;
@@ -579,7 +577,7 @@
 #   cc:license            <Place plugin license URI here and uncomment> ;
     vamp:identifier       "aubiomelenergy" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "4" ;
+    owl:versionInfo       "3" ;
     vamp:input_domain     vamp:TimeDomain ;
 
     vamp:parameter   plugbase:aubiomelenergy_param_nfilters ;
@@ -601,11 +599,9 @@
     vamp:identifier       "melenergy" ;
     dc:title              "Mel-Frequency Cepstrum Coefficients" ;
     dc:description        """List of measured energy in each Mel-frequency bands""" ;
-    dc:description        """"""  ;
     vamp:fixed_bin_count  "true" ;
     vamp:unit             "" ;
-    a                     vamp:QuantizedOutput ;
-    vamp:bin_count        1 ;
+    vamp:bin_count        0 ;
     .
 plugbase:aubiospecdesc a   vamp:Plugin ;
     dc:title              "Aubio Spectral Descriptor" ;
@@ -617,7 +613,7 @@
 #   cc:license            <Place plugin license URI here and uncomment> ;
     vamp:identifier       "aubiospecdesc" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "4" ;
+    owl:versionInfo       "2" ;
     vamp:input_domain     vamp:TimeDomain ;
 
     vamp:parameter   plugbase:aubiospecdesc_param_specdesctype ;