# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1497445125 -3600
# Node ID 4d450d496793c17f999f3d42f2c4bd52ea6cccb8
# Parent  1c1bad814d027b41c9c0ed4b61def4d9e2055965
Update .cpp main files with metadata from generator

diff -r 1c1bad814d02 -r 4d450d496793 cepstral-pitchtracker/cepstral-pitchtracker.cpp
--- a/cepstral-pitchtracker/cepstral-pitchtracker.cpp	Thu Mar 30 16:30:04 2017 +0100
+++ b/cepstral-pitchtracker/cepstral-pitchtracker.cpp	Wed Jun 14 13:58:45 2017 +0100
@@ -1,4 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
 #include "PiperExport.h"
 
@@ -7,9 +6,21 @@
 using piper_vamp_js::PiperAdapter;
 using piper_vamp_js::PiperPluginLibrary;
 
-static std::string soname("cepstral-pitchtracker");
+static std::string libname("cepstral-pitchtracker");
 
-static PiperAdapter<CepstralPitchTracker> cepstralPitchTrackerAdapter(soname);
+static PiperAdapter<CepstralPitchTracker>
+cepstralPitchTrackerAdapter(
+    libname,
+    { "Notes" },
+    {
+        { "f0",
+            { "http://purl.org/ontology/af/Pitch" }
+        },
+        { "notes",
+            { "http://purl.org/ontology/af/Note" }
+        }
+    }
+    );
 
 static PiperPluginLibrary library({
     &cepstralPitchTrackerAdapter
diff -r 1c1bad814d02 -r 4d450d496793 constant-q-cpp/cqvamp.cpp
--- a/constant-q-cpp/cqvamp.cpp	Thu Mar 30 16:30:04 2017 +0100
+++ b/constant-q-cpp/cqvamp.cpp	Wed Jun 14 13:58:45 2017 +0100
@@ -1,24 +1,38 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
 #include "PiperExport.h"
+
 #include "CQVamp.h"
 #include "CQChromaVamp.h"
 
-static std::string soname("cqvamp");
+using piper_vamp_js::PiperAdapter;
+using piper_vamp_js::PiperAdapterBase;
+using piper_vamp_js::PiperPluginLibrary;
 
-class CQVampMIDIParamsAdapter : public piper_vamp_js::PiperAdapterBase<CQVamp>
+static std::string libname("cqvamp");
+
+piper_vamp::StaticOutputInfo cqStaticOutputInfo {
+    { "constantq",
+        { "http://purl.org/ontology/af/Spectrogram" }
+    }
+};
+
+class CQVampMIDIParamsAdapter : public PiperAdapterBase<CQVamp>
 {
 public:
-    CQVampMIDIParamsAdapter() : PiperAdapterBase<CQVamp>(soname) { }
+    CQVampMIDIParamsAdapter() : PiperAdapterBase<CQVamp>(libname,
+                                                         { "Visualisation" },
+                                                         cqStaticOutputInfo) { }
     virtual Vamp::Plugin *createPlugin(float inputSampleRate) const override {
         return new CQVamp(inputSampleRate, true);
     }
 };
 
-class CQVampHzParamsAdapter : public piper_vamp_js::PiperAdapterBase<CQVamp>
+class CQVampHzParamsAdapter : public PiperAdapterBase<CQVamp>
 {
 public:
-    CQVampHzParamsAdapter() : PiperAdapterBase<CQVamp>(soname) { }
+    CQVampHzParamsAdapter() : PiperAdapterBase<CQVamp>(libname,
+                                                       { "Visualisation" },
+                                                       cqStaticOutputInfo) { }
     virtual Vamp::Plugin *createPlugin(float inputSampleRate) const override {
         return new CQVamp(inputSampleRate, false);
     }
@@ -27,12 +41,22 @@
 static CQVampMIDIParamsAdapter cqVampMIDIParamsAdapter;
 static CQVampHzParamsAdapter   cqVampHzParamsAdapter;
 
-static piper_vamp_js::PiperAdapter<CQChromaVamp> cqChromaVampAdapter(soname);
+static PiperAdapter<CQChromaVamp>
+cqChromaVampAdapter(
+    libname,
+    { "Visualisation" },
+    {
+        { "chromagram",
+            { "http://purl.org/ontology/af/Chromagram" }
+        }
+    }
+    );
 
-static piper_vamp_js::PiperPluginLibrary library({
-        &cqVampMIDIParamsAdapter,
-        &cqVampHzParamsAdapter,
-        &cqChromaVampAdapter
-    });
+static PiperPluginLibrary library({
+    &cqVampMIDIParamsAdapter,
+    &cqVampHzParamsAdapter,
+    &cqChromaVampAdapter
+});
 
 PIPER_EXPORT_LIBRARY(library);
+
diff -r 1c1bad814d02 -r 4d450d496793 match-vamp-plugin/match-vamp-plugin.cpp
--- a/match-vamp-plugin/match-vamp-plugin.cpp	Thu Mar 30 16:30:04 2017 +0100
+++ b/match-vamp-plugin/match-vamp-plugin.cpp	Wed Jun 14 13:58:45 2017 +0100
@@ -3,7 +3,8 @@
 #include "MatchVampPlugin.h"
 
 std::string soname("match-vamp-plugin");
-piper_vamp_js::PiperAdapter<MatchVampPlugin> adapter(soname);
+piper_vamp_js::PiperAdapter<MatchVampPlugin> adapter(soname,
+                                                     { "Time", "Alignment" });
 piper_vamp_js::PiperPluginLibrary library({ &adapter });
 
 PIPER_EXPORT_LIBRARY(library);
diff -r 1c1bad814d02 -r 4d450d496793 nnls-chroma/nnls-chroma.cpp
--- a/nnls-chroma/nnls-chroma.cpp	Thu Mar 30 16:30:04 2017 +0100
+++ b/nnls-chroma/nnls-chroma.cpp	Wed Jun 14 13:58:45 2017 +0100
@@ -1,4 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
 #include "PiperExport.h"
 
@@ -6,14 +5,75 @@
 #include "Chordino.h"
 #include "Tuning.h"
 
-std::string soname("nnls-chroma");
+using piper_vamp_js::PiperAdapter;
+using piper_vamp_js::PiperPluginLibrary;
 
-piper_vamp_js::PiperAdapter<NNLSChroma> chromaAdapter(soname);
-piper_vamp_js::PiperAdapter<Chordino> chordinoAdapter(soname);
-piper_vamp_js::PiperAdapter<Tuning> tuningAdapter(soname);
+static std::string libname("nnls-chroma");
 
-piper_vamp_js::PiperPluginLibrary library({
-        &chromaAdapter, &chordinoAdapter, &tuningAdapter
+static PiperAdapter<NNLSChroma>
+nnlsChromaAdapter(
+    libname,
+    { "Visualisation" },
+    {
+        { "logfreqspec",
+            { "http://purl.org/ontology/af/Spectrogram" }
+        },
+        { "tunedlogfreqspec",
+            { "http://purl.org/ontology/af/Spectrogram" }
+        },
+        { "semitonespectrum",
+            { "http://purl.org/ontology/af/Spectrogram" }
+        },
+        { "chroma",
+            { "http://purl.org/ontology/af/Chromagram" }
+        },
+        { "basschroma",
+            { "http://purl.org/ontology/af/Chromagram" }
+        },
+        { "bothchroma",
+            { "http://purl.org/ontology/af/Chromagram" }
+        }
+    }
+    );
+
+static PiperAdapter<Chordino>
+chordinoAdapter(
+    libname,
+    { "Notes" },
+    {
+        { "simplechord",
+            { "http://purl.org/ontology/af/ChordSegment" }
+        },
+        { "chordnotes",
+            { "" }
+        },
+        { "harmonicchange",
+            { "http://purl.org/ontology/af/TonalChangeDetectionFunction" }
+        },
+        { "loglikelihood",
+            { "" }
+        }
+    }
+    );
+
+static PiperAdapter<Tuning>
+tuningAdapter(
+    libname,
+    { "Key and Tonality" },
+    {
+        { "tuning",
+            { "http://purl.org/ontology/af/MusicSegment" }
+        },
+        { "localtuning",
+            { "" }
+        }
+    }
+    );
+
+static PiperPluginLibrary library({
+    &nnlsChromaAdapter,
+    &chordinoAdapter,
+    &tuningAdapter
 });
 
 PIPER_EXPORT_LIBRARY(library);
diff -r 1c1bad814d02 -r 4d450d496793 pyin/pyin.cpp
--- a/pyin/pyin.cpp	Thu Mar 30 16:30:04 2017 +0100
+++ b/pyin/pyin.cpp	Wed Jun 14 13:58:45 2017 +0100
@@ -1,4 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
 #include "PiperExport.h"
 
@@ -6,14 +5,43 @@
 #include "YinVamp.h"
 #include "LocalCandidatePYIN.h"
 
-std::string soname("pyin");
+using piper_vamp_js::PiperAdapter;
+using piper_vamp_js::PiperPluginLibrary;
 
-piper_vamp_js::PiperAdapter<PYinVamp> pyinAdapter(soname);
-piper_vamp_js::PiperAdapter<YinVamp> yinAdapter(soname);
-piper_vamp_js::PiperAdapter<LocalCandidatePYIN> localCandAdapter(soname);
+static std::string libname("pyin");
 
-piper_vamp_js::PiperPluginLibrary library({
-        &pyinAdapter, &yinAdapter, &localCandAdapter
+static PiperAdapter<PYinVamp>
+pyinAdapter(
+    libname,
+    { "Pitch" },
+    {
+        { "notes",
+            { "http://purl.org/ontology/af/Note" }
+        }
+    }
+    );
+
+static PiperAdapter<YinVamp>
+yinAdapter(
+    libname,
+    { "Pitch" },
+    {
+        { "f0",
+            { "http://purl.org/ontology/af/Pitch" }
+        }
+    }
+    );
+
+static PiperAdapter<LocalCandidatePYIN>
+localCandidatePYinAdapter(
+    libname,
+    { "Pitch" }
+    );
+
+static PiperPluginLibrary library({
+    &pyinAdapter,
+    &yinAdapter,
+    &localCandidatePYinAdapter
 });
 
 PIPER_EXPORT_LIBRARY(library);
diff -r 1c1bad814d02 -r 4d450d496793 qm-vamp-plugins/qm-vamp-plugins.cpp
--- a/qm-vamp-plugins/qm-vamp-plugins.cpp	Thu Mar 30 16:30:04 2017 +0100
+++ b/qm-vamp-plugins/qm-vamp-plugins.cpp	Wed Jun 14 13:58:45 2017 +0100
@@ -1,4 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
 #include "PiperExport.h"
 
@@ -19,36 +18,224 @@
 using piper_vamp_js::PiperAdapter;
 using piper_vamp_js::PiperPluginLibrary;
 
-static std::string soname("qm-vamp-plugins");
+static std::string libname("qm-vamp-plugins");
 
-static PiperAdapter<BeatTracker> beatTrackerAdapter(soname);
-static PiperAdapter<OnsetDetector> onsetDetectorAdapter(soname);
-static PiperAdapter<ChromagramPlugin> chromagramPluginAdapter(soname);
-static PiperAdapter<ConstantQSpectrogram> constantQAdapter(soname);
-static PiperAdapter<TonalChangeDetect> tonalChangeDetectorAdapter(soname);
-static PiperAdapter<KeyDetector> keyDetectorAdapter(soname);
-static PiperAdapter<MFCCPlugin> mfccPluginAdapter(soname);
-static PiperAdapter<SegmenterPlugin> segmenterPluginAdapter(soname);
-static PiperAdapter<SimilarityPlugin> similarityPluginAdapter(soname);
-static PiperAdapter<BarBeatTracker> barBeatTrackPluginAdapter(soname);
-//!!!static PiperAdapter<AdaptiveSpectrogram> adaptiveSpectrogramAdapter(soname);
-static PiperAdapter<DWT> dwtAdapter(soname);
-static PiperAdapter<Transcription> transcriptionAdapter(soname);
+static PiperAdapter<BeatTracker>
+qmTempoTrackerAdapter(
+    libname,
+    { "Time", "Tempo" },
+    {
+        { "beats",
+            { "http://purl.org/ontology/af/Beat" }
+        },
+        { "detection_fn",
+            { "http://purl.org/ontology/af/OnsetDetectionFunction" }
+        },
+        { "tempo",
+            { "http://purl.org/ontology/af/Tempo" }
+        }
+    }
+    );
+
+static PiperAdapter<OnsetDetector>
+qmOnsetDetectorAdapter(
+    libname,
+    { "Time", "Onsets" },
+    {
+        { "onsets",
+            { "http://purl.org/ontology/af/Onset" }
+        },
+        { "detection_fn",
+            { "http://purl.org/ontology/af/OnsetDetectionFunction" }
+        },
+        { "smoothed_df",
+            { "http://purl.org/ontology/af/OnsetDetectionFunction" }
+        }
+    }
+    );
+
+static PiperAdapter<ChromagramPlugin>
+qmChromagramAdapter(
+    libname,
+    { "Visualisation" },
+    {
+        { "chromagram",
+            { "http://purl.org/ontology/af/Chromagram" }
+        },
+        { "chromameans",
+            { "" }
+        }
+    }
+    );
+
+static PiperAdapter<ConstantQSpectrogram>
+qmConstantQAdapter(
+    libname,
+    { "Visualisation" },
+    {
+        { "constantq",
+            { "http://purl.org/ontology/af/Spectrogram" }
+        }
+    }
+    );
+
+static PiperAdapter<TonalChangeDetect>
+qmTonalChangeAdapter(
+    libname,
+    { "Key and Tonality" },
+    {
+        { "tcstransform",
+            { "http://purl.org/ontology/af/TonalContentSpace" }
+        },
+        { "tcfunction",
+            { "http://purl.org/ontology/af/TonalChangeDetectionFunction" }
+        },
+        { "changepositions",
+            { "http://purl.org/ontology/af/TonalOnset" }
+        }
+    }
+    );
+
+static PiperAdapter<KeyDetector>
+qmKeyDetectorAdapter(
+    libname,
+    { "Key and Tonality" },
+    {
+        { "tonic",
+            { "" }
+        },
+        { "mode",
+            { "" }
+        },
+        { "key",
+            { "http://purl.org/ontology/af/KeyChange" }
+        },
+        { "keystrength",
+            { "" }
+        }
+    }
+    );
+
+static PiperAdapter<SegmenterPlugin>
+qmSegmenterAdapter(
+    libname,
+    { "Classification" },
+    {
+        { "segmentation",
+            { "http://purl.org/ontology/af/StructuralSegment" }
+        }
+    }
+    );
+
+static PiperAdapter<SimilarityPlugin>
+qmSimilarityAdapter(
+    libname,
+    { "Classification" },
+    {
+        { "distancematrix",
+            { "" }
+        },
+        { "distancevector",
+            { "" }
+        },
+        { "sorteddistancevector",
+            { "" }
+        },
+        { "means",
+            { "" }
+        },
+        { "variances",
+            { "" }
+        },
+        { "beatspectrum",
+            { "" }
+        }
+    }
+    );
+
+static PiperAdapter<MFCCPlugin>
+qmMfccAdapter(
+    libname,
+    { "Low Level Features" },
+    {
+        { "coefficients",
+            { "" }
+        },
+        { "means",
+            { "" }
+        }
+    }
+    );
+
+static PiperAdapter<BarBeatTracker>
+qmBarBeatTrackerAdapter(
+    libname,
+    { "Time", "Tempo" },
+    {
+        { "beats",
+            { "http://purl.org/ontology/af/Beat" }
+        },
+        { "bars",
+            { "" }
+        },
+        { "beatcounts",
+            { "" }
+        },
+        { "beatsd",
+            { "" }
+        }
+    }
+    );
+
+static PiperAdapter<DWT>
+qmDwtAdapter(
+    libname,
+    { "Visualisation" },
+    {
+        { "wcoeff",
+            { "" }
+        }
+    }
+    );
+
+/*
+static PiperAdapter<AdaptiveSpectrogram>
+qmAdaptiveSpectrogramAdapter(
+    libname,
+    { "Visualisation" },
+    {
+        { "output",
+            { "http://purl.org/ontology/af/Spectrogram" }
+        }
+    }
+    );
+*/
+
+static PiperAdapter<Transcription>
+qmTranscriptionAdapter(
+    libname,
+    { "Notes" },
+    {
+        { "transcription",
+            { "http://purl.org/ontology/af/Note" }
+        }
+    }
+    );
 
 static PiperPluginLibrary library({
-    &beatTrackerAdapter,
-    &onsetDetectorAdapter,
-    &chromagramPluginAdapter,
-    &constantQAdapter,
-    &tonalChangeDetectorAdapter,
-    &keyDetectorAdapter,
-    &mfccPluginAdapter,
-    &segmenterPluginAdapter,
-    &similarityPluginAdapter,
-    &barBeatTrackPluginAdapter,
-//!!!       &adaptiveSpectrogramAdapter,
-    &dwtAdapter,
-    &transcriptionAdapter
+    &qmTempoTrackerAdapter,
+    &qmOnsetDetectorAdapter,
+    &qmChromagramAdapter,
+    &qmConstantQAdapter,
+    &qmTonalChangeAdapter,
+    &qmKeyDetectorAdapter,
+    &qmSegmenterAdapter,
+    &qmSimilarityAdapter,
+    &qmMfccAdapter,
+    &qmBarBeatTrackerAdapter,
+    &qmDwtAdapter,
+//    &qmAdaptivespectrogramAdapter,
+    &qmTranscriptionAdapter
 });
 
 PIPER_EXPORT_LIBRARY(library);
diff -r 1c1bad814d02 -r 4d450d496793 silvet/silvet.cpp
--- a/silvet/silvet.cpp	Thu Mar 30 16:30:04 2017 +0100
+++ b/silvet/silvet.cpp	Wed Jun 14 13:58:45 2017 +0100
@@ -1,12 +1,45 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
 #include "PiperExport.h"
+
 #include "Silvet.h"
 
-static std::string soname("silvet");
+using piper_vamp_js::PiperAdapter;
+using piper_vamp_js::PiperPluginLibrary;
 
-static piper_vamp_js::PiperAdapter<Silvet> silvetAdapter(soname);
-static piper_vamp_js::PiperPluginLibrary library({ &silvetAdapter });
+static std::string libname("silvet");
+
+static PiperAdapter<Silvet>
+silvetAdapter(
+    libname,
+    { "Notes" },
+    {
+        { "notes",
+            { "http://purl.org/ontology/af/Note" }
+        },
+        { "onsets",
+            { "http://purl.org/ontology/af/Onset" }
+        },
+        { "onoffsets",
+            { "" }
+        },
+        { "timefreq",
+            { "http://purl.org/ontology/af/Spectrogram" }
+        },
+        { "pitchactivation",
+            { "http://purl.org/ontology/af/Spectrogram" }
+        },
+        { "chroma",
+            { "http://purl.org/ontology/af/Chromagram" }
+        },
+        { "templates",
+            { "" }
+        }
+    }
+    );
+
+static PiperPluginLibrary library({
+    &silvetAdapter
+});
 
 PIPER_EXPORT_LIBRARY(library);
 
diff -r 1c1bad814d02 -r 4d450d496793 tipic/tipic.cpp
--- a/tipic/tipic.cpp	Thu Mar 30 16:30:04 2017 +0100
+++ b/tipic/tipic.cpp	Wed Jun 14 13:58:45 2017 +0100
@@ -1,4 +1,3 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
 #include "PiperExport.h"
 
@@ -7,9 +6,42 @@
 using piper_vamp_js::PiperAdapter;
 using piper_vamp_js::PiperPluginLibrary;
 
-static std::string soname("tipic");
+static std::string libname("tipic");
 
-static PiperAdapter<Tipic> tipicAdapter(soname);
+static PiperAdapter<Tipic>
+tipicAdapter(
+    libname,
+    { "Visualisation" },
+    {
+        { "pitch",
+            { "http://purl.org/ontology/af/Spectrogram" }
+        },
+        { "pitch-smoothed",
+            { "" }
+        },
+        { "chroma",
+            { "http://purl.org/ontology/af/Chromagram" }
+        },
+        { "chroma-smoothed",
+            { "" }
+        },
+        { "clp",
+            { "http://purl.org/ontology/af/Chromagram" }
+        },
+        { "clp-smoothed",
+            { "" }
+        },
+        { "cens",
+            { "" }
+        },
+        { "crp",
+            { "http://purl.org/ontology/af/Chromagram" }
+        },
+        { "crp-smoothed",
+            { "" }
+        }
+    }
+    );
 
 static PiperPluginLibrary library({
     &tipicAdapter
diff -r 1c1bad814d02 -r 4d450d496793 vamp-example-plugins/vamp-example-plugins.cpp
--- a/vamp-example-plugins/vamp-example-plugins.cpp	Thu Mar 30 16:30:04 2017 +0100
+++ b/vamp-example-plugins/vamp-example-plugins.cpp	Wed Jun 14 13:58:45 2017 +0100
@@ -4,7 +4,7 @@
     Piper
 
     Centre for Digital Music, Queen Mary, University of London.
-    Copyright 2015-2016 QMUL.
+    Copyright 2015-2017 QMUL.
   
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation
@@ -44,21 +44,101 @@
 using piper_vamp_js::PiperAdapter;
 using piper_vamp_js::PiperPluginLibrary;
 
-static std::string soname("vamp-example-plugins");
+static std::string libname("vamp-example-plugins");
 
-static PiperAdapter<ZeroCrossing> zeroCrossingAdapter(soname);
-static PiperAdapter<SpectralCentroid> spectralCentroidAdapter(soname);
-static PiperAdapter<PercussionOnsetDetector> percussionOnsetAdapter(soname);
-static PiperAdapter<FixedTempoEstimator> fixedTempoAdapter(soname);
-static PiperAdapter<AmplitudeFollower> amplitudeAdapter(soname);
-static PiperAdapter<PowerSpectrum> powerSpectrumAdapter(soname);
+static PiperAdapter<ZeroCrossing>
+zeroCrossingAdapter(
+    libname,
+    { "Low Level Features" },
+    {
+        { "counts",
+            { "http://purl.org/ontology/af/ZeroCrossingCount" }
+        },
+        { "zerocrossings",
+            { "http://purl.org/ontology/af/ZeroCrossing" }
+        }
+    }
+    );
+
+static PiperAdapter<SpectralCentroid>
+spectralCentroidAdapter(
+    libname,
+    { "Low Level Features" },
+    {
+        { "logcentroid",
+            { "http://purl.org/ontology/af/LogFrequencyCentroid" }
+        },
+        { "linearcentroid",
+            { "http://purl.org/ontology/af/LinearFrequencyCentroid" }
+        }
+    }
+    );
+
+static PiperAdapter<PercussionOnsetDetector>
+percussionOnsetsAdapter(
+    libname,
+    { "Time", "Onsets" },
+    {
+        { "onsets",
+            { "http://purl.org/ontology/af/Onset" }
+        },
+        { "detectionfunction",
+            { "http://purl.org/ontology/af/OnsetDetectionFunction" }
+        }
+    }
+    );
+
+static PiperAdapter<AmplitudeFollower>
+amplitudeFollowerAdapter(
+    libname,
+    { "Low Level Features" },
+    {
+        { "amplitude",
+            { "http://purl.org/ontology/af/Signal" }
+        }
+    }
+    );
+
+static PiperAdapter<FixedTempoEstimator>
+fixedTempoAdapter(
+    libname,
+    { "Time", "Tempo" },
+    {
+        { "tempo",
+            { "http://purl.org/ontology/af/Tempo" }
+        },
+        { "candidates",
+            { "http://purl.org/ontology/af/Tempo" }
+        },
+        { "detectionfunction",
+            { "http://purl.org/ontology/af/OnsetDetectionFunction" }
+        },
+        { "acf",
+            { "http://purl.org/ontology/af/Signal" }
+        },
+        { "filtered_acf",
+            { "http://purl.org/ontology/af/Signal" }
+        }
+    }
+    );
+
+static PiperAdapter<PowerSpectrum>
+powerSpectrumAdapter(
+    libname,
+    { "Visualisation" },
+    {
+        { "powerspectrum",
+            { "http://purl.org/ontology/af/Signal" }
+        }
+    }
+    );
 
 static PiperPluginLibrary library({
     &zeroCrossingAdapter,
     &spectralCentroidAdapter,
-    &percussionOnsetAdapter,
+    &percussionOnsetsAdapter,
+    &amplitudeFollowerAdapter,
     &fixedTempoAdapter,
-    &amplitudeAdapter,
     &powerSpectrumAdapter
 });
 
diff -r 1c1bad814d02 -r 4d450d496793 vamp-test-plugin/vamp-test-plugin.cpp
--- a/vamp-test-plugin/vamp-test-plugin.cpp	Thu Mar 30 16:30:04 2017 +0100
+++ b/vamp-test-plugin/vamp-test-plugin.cpp	Wed Jun 14 13:58:45 2017 +0100
@@ -1,7 +1,7 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 /*
     Vamp Test Plugin
-    Copyright (c) 2013-2016 Queen Mary, University of London
+    Copyright (c) 2013-2017 Queen Mary, University of London
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation
@@ -36,7 +36,7 @@
 using piper_vamp_js::PiperAdapterBase;
 using piper_vamp_js::PiperPluginLibrary;
 
-static std::string soname("vamp-test-plugin");
+static std::string libname("vamp-test-plugin");
 
 /*
    This is an example of a library that exports more than one "plugin"
@@ -59,7 +59,7 @@
 {
 public:
     Adapter(bool freq) :
-        PiperAdapterBase<VampTestPlugin>(soname),
+        PiperAdapterBase<VampTestPlugin>(libname, { "Development" }),
         m_freq(freq) { }
 
 protected: