* Update along with latest Vamp API change

[vamp-aubio-plugins.git] / plugins / Pitch.cpp

diff --git a/plugins/Pitch.cpp b/plugins/Pitch.cpp
index 60ba4fe..7cab33f 100644 (file)
--- a/plugins/Pitch.cpp
+++ b/plugins/Pitch.cpp
@@ -38,18 +38,24 @@ Pitch::~Pitch()
 }
 
 string
 }
 
 string

-Pitch::getName() const
+Pitch::getIdentifier() const

 {
     return "aubiopitch";
 }
 
 string
 {
     return "aubiopitch";
 }
 
 string

-Pitch::getDescription() const
+Pitch::getName() const

 {
     return "Aubio Pitch Detector";
 }
 
 string
 {
     return "Aubio Pitch Detector";
 }
 
 string

+Pitch::getDescription() const
+{
+    return "Track estimated note pitches";
+}
+
+string

 Pitch::getMaker() const
 {
     return "Paul Brossier (plugin by Chris Cannam)";
 Pitch::getMaker() const
 {
     return "Paul Brossier (plugin by Chris Cannam)";


@@ -109,8 +115,8 @@ Pitch::getParameterDescriptors() const
     ParameterList list;
     
     ParameterDescriptor desc;
     ParameterList list;
     
     ParameterDescriptor desc;

-    desc.name = "pitchtype";
-    desc.description = "Pitch Detection Function Type";
+    desc.identifier = "pitchtype";
+    desc.name = "Pitch Detection Function Type";

     desc.minValue = 0;
     desc.maxValue = 4;
     desc.defaultValue = (int)aubio_pitch_yinfft;
     desc.minValue = 0;
     desc.maxValue = 4;
     desc.defaultValue = (int)aubio_pitch_yinfft;


@@ -156,9 +162,9 @@ Pitch::getOutputDescriptors() const
     OutputList list;
 
     OutputDescriptor d;
     OutputList list;
 
     OutputDescriptor d;

-    d.name = "frequency";
+    d.identifier = "frequency";
+    d.name = "Frequency";

     d.unit = "Hz";
     d.unit = "Hz";

-    d.description = "Frequency";

     d.hasFixedBinCount = true;
     d.binCount = 1;
     d.hasKnownExtents = false;
     d.hasFixedBinCount = true;
     d.binCount = 1;
     d.hasKnownExtents = false;


@@ -170,7 +176,8 @@ Pitch::getOutputDescriptors() const
 }
 
 Pitch::FeatureSet
 }
 
 Pitch::FeatureSet

-Pitch::process(float **inputBuffers, Vamp::RealTime /* timestamp */)
+Pitch::process(const float *const *inputBuffers,
+               Vamp::RealTime /* timestamp */)

 {
     for (size_t i = 0; i < m_stepSize; ++i) {
         for (size_t j = 0; j < m_channelCount; ++j) {
 {
     for (size_t i = 0; i < m_stepSize; ++i) {
         for (size_t j = 0; j < m_channelCount; ++j) {