Mercurial > hg > vamp-aubio-plugins
changeset 13:1169d00391d8
* Update along with latest Vamp API change
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Mon, 26 Feb 2007 18:10:34 +0000 |
| parents | 62414aaaaa7e |
| children | a5e23a7501a2 |
| files | plugins/Notes.cpp plugins/Notes.h plugins/Onset.cpp plugins/Onset.h plugins/Pitch.cpp plugins/Pitch.h plugins/Tempo.cpp plugins/Tempo.h |
| diffstat | 8 files changed, 80 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/Notes.cpp Tue Dec 12 10:42:21 2006 +0000 +++ b/plugins/Notes.cpp Mon Feb 26 18:10:34 2007 +0000 @@ -57,15 +57,21 @@ } string -Notes::getName() const +Notes::getIdentifier() const { return "aubionotes"; } string +Notes::getName() const +{ + return "Aubio Note Tracker"; +} + +string Notes::getDescription() const { - return "Aubio Note Tracker"; + return "Estimate note onset positions, pitches and durations"; } string @@ -149,8 +155,8 @@ ParameterList list; ParameterDescriptor desc; - desc.name = "onsettype"; - desc.description = "Onset Detection Function Type"; + desc.identifier = "onsettype"; + desc.name = "Onset Detection Function Type"; desc.minValue = 0; desc.maxValue = 6; desc.defaultValue = (int)aubio_onset_complex; @@ -166,8 +172,8 @@ list.push_back(desc); desc = ParameterDescriptor(); - 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; @@ -181,8 +187,8 @@ list.push_back(desc); desc = ParameterDescriptor(); - desc.name = "minpitch"; - desc.description = "Minimum Pitch"; + desc.identifier = "minpitch"; + desc.name = "Minimum Pitch"; desc.minValue = 0; desc.maxValue = 127; desc.defaultValue = 32; @@ -192,8 +198,8 @@ list.push_back(desc); desc = ParameterDescriptor(); - desc.name = "maxpitch"; - desc.description = "Maximum Pitch"; + desc.identifier = "maxpitch"; + desc.name = "Maximum Pitch"; desc.minValue = 0; desc.maxValue = 127; desc.defaultValue = 95; @@ -203,8 +209,8 @@ list.push_back(desc); desc = ParameterDescriptor(); - desc.name = "wraprange"; - desc.description = "Fold Higher or Lower Notes into Range"; + desc.identifier = "wraprange"; + desc.name = "Fold Higher or Lower Notes into Range"; desc.minValue = 0; desc.maxValue = 1; desc.defaultValue = 0; @@ -213,8 +219,8 @@ list.push_back(desc); desc = ParameterDescriptor(); - desc.name = "avoidleaps"; - desc.description = "Avoid Multi-Octave Jumps"; + desc.identifier = "avoidleaps"; + desc.name = "Avoid Multi-Octave Jumps"; desc.minValue = 0; desc.maxValue = 1; desc.defaultValue = 0; @@ -223,8 +229,8 @@ list.push_back(desc); desc = ParameterDescriptor(); - desc.name = "peakpickthreshold"; - desc.description = "Peak Picker Threshold"; + desc.identifier = "peakpickthreshold"; + desc.name = "Peak Picker Threshold"; desc.minValue = 0; desc.maxValue = 1; desc.defaultValue = 0.3; @@ -232,8 +238,8 @@ list.push_back(desc); desc = ParameterDescriptor(); - desc.name = "silencethreshold"; - desc.description = "Silence Threshold"; + desc.identifier = "silencethreshold"; + desc.name = "Silence Threshold"; desc.minValue = -120; desc.maxValue = 0; desc.defaultValue = -90; @@ -310,9 +316,9 @@ OutputList list; OutputDescriptor d; - d.name = "notes"; + d.identifier = "notes"; + d.name = "Notes"; d.unit = "Hz"; - d.description = "Notes"; d.hasFixedBinCount = true; d.binCount = 2; d.binNames.push_back("Frequency");
--- a/plugins/Notes.h Tue Dec 12 10:42:21 2006 +0000 +++ b/plugins/Notes.h Mon Feb 26 18:10:34 2007 +0000 @@ -33,6 +33,7 @@ InputDomain getInputDomain() const { return TimeDomain; } + std::string getIdentifier() const; std::string getName() const; std::string getDescription() const; std::string getMaker() const;
--- a/plugins/Onset.cpp Tue Dec 12 10:42:21 2006 +0000 +++ b/plugins/Onset.cpp Mon Feb 26 18:10:34 2007 +0000 @@ -48,15 +48,21 @@ } string -Onset::getName() const +Onset::getIdentifier() const { return "aubioonset"; } string +Onset::getName() const +{ + return "Aubio Onset Detector"; +} + +string Onset::getDescription() const { - return "Aubio Onset Detector"; + return "Estimate note onset times"; } string @@ -123,8 +129,8 @@ ParameterList list; ParameterDescriptor desc; - desc.name = "onsettype"; - desc.description = "Onset Detection Function Type"; + desc.identifier = "onsettype"; + desc.name = "Onset Detection Function Type"; desc.minValue = 0; desc.maxValue = 6; desc.defaultValue = (int)aubio_onset_complex; @@ -140,8 +146,8 @@ list.push_back(desc); desc = ParameterDescriptor(); - desc.name = "peakpickthreshold"; - desc.description = "Peak Picker Threshold"; + desc.identifier = "peakpickthreshold"; + desc.name = "Peak Picker Threshold"; desc.minValue = 0; desc.maxValue = 1; desc.defaultValue = 0.3; @@ -149,8 +155,8 @@ list.push_back(desc); desc = ParameterDescriptor(); - desc.name = "silencethreshold"; - desc.description = "Silence Threshold"; + desc.identifier = "silencethreshold"; + desc.name = "Silence Threshold"; desc.minValue = -120; desc.maxValue = 0; desc.defaultValue = -90; @@ -201,9 +207,9 @@ OutputList list; OutputDescriptor d; - d.name = "onsets"; + d.identifier = "onsets"; + d.name = "Onsets"; d.unit = ""; - d.description = "Onsets"; d.hasFixedBinCount = true; d.binCount = 0; d.sampleType = OutputDescriptor::VariableSampleRate; @@ -211,9 +217,9 @@ list.push_back(d); d = OutputDescriptor(); - d.name = "detectionfunction"; + d.identifier = "detectionfunction"; + d.name = "Onset Detection Function"; d.unit = ""; - d.description = "Onset Detection Function"; d.hasFixedBinCount = true; d.binCount = m_channelCount; d.hasKnownExtents = false;
--- a/plugins/Onset.h Tue Dec 12 10:42:21 2006 +0000 +++ b/plugins/Onset.h Mon Feb 26 18:10:34 2007 +0000 @@ -31,6 +31,7 @@ InputDomain getInputDomain() const { return TimeDomain; } + std::string getIdentifier() const; std::string getName() const; std::string getDescription() const; std::string getMaker() const;
--- a/plugins/Pitch.cpp Tue Dec 12 10:42:21 2006 +0000 +++ b/plugins/Pitch.cpp Mon Feb 26 18:10:34 2007 +0000 @@ -38,15 +38,21 @@ } string -Pitch::getName() const +Pitch::getIdentifier() const { return "aubiopitch"; } string +Pitch::getName() const +{ + return "Aubio Pitch Detector"; +} + +string Pitch::getDescription() const { - return "Aubio Pitch Detector"; + return "Track estimated note pitches"; } string @@ -109,8 +115,8 @@ 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; @@ -156,9 +162,9 @@ OutputList list; OutputDescriptor d; - d.name = "frequency"; + d.identifier = "frequency"; + d.name = "Frequency"; d.unit = "Hz"; - d.description = "Frequency"; d.hasFixedBinCount = true; d.binCount = 1; d.hasKnownExtents = false;
--- a/plugins/Pitch.h Tue Dec 12 10:42:21 2006 +0000 +++ b/plugins/Pitch.h Mon Feb 26 18:10:34 2007 +0000 @@ -31,6 +31,7 @@ InputDomain getInputDomain() const { return TimeDomain; } + std::string getIdentifier() const; std::string getName() const; std::string getDescription() const; std::string getMaker() const;
--- a/plugins/Tempo.cpp Tue Dec 12 10:42:21 2006 +0000 +++ b/plugins/Tempo.cpp Mon Feb 26 18:10:34 2007 +0000 @@ -22,7 +22,7 @@ using std::cerr; using std::endl; -//#define HAVE_AUBIO_LOCKED_TEMPO_HACK +#define HAVE_AUBIO_LOCKED_TEMPO_HACK Tempo::Tempo(float inputSampleRate) : Plugin(inputSampleRate), @@ -57,21 +57,27 @@ } string -Tempo::getName() const +Tempo::getIdentifier() const { return "aubiotempo"; } string -Tempo::getDescription() const +Tempo::getName() const { return "Aubio Tempo Detector"; } string +Tempo::getDescription() const +{ + return "Estimate the musical tempo by tracking note onset timings"; +} + +string Tempo::getMaker() const { - return "Paul Brossier (plugin by Chris Cannam)"; + return "Paul Brossier (method by Matthew Davies, plugin by Chris Cannam)"; } int @@ -138,8 +144,8 @@ ParameterList list; ParameterDescriptor desc; - desc.name = "onsettype"; - desc.description = "Onset Detection Function Type"; + desc.identifier = "onsettype"; + desc.name = "Onset Detection Function Type"; desc.minValue = 0; desc.maxValue = 6; desc.defaultValue = (int)aubio_onset_complex; @@ -155,8 +161,8 @@ list.push_back(desc); desc = ParameterDescriptor(); - desc.name = "peakpickthreshold"; - desc.description = "Peak Picker Threshold"; + desc.identifier = "peakpickthreshold"; + desc.name = "Peak Picker Threshold"; desc.minValue = 0; desc.maxValue = 1; desc.defaultValue = 0.3; @@ -164,8 +170,8 @@ list.push_back(desc); desc = ParameterDescriptor(); - desc.name = "silencethreshold"; - desc.description = "Silence Threshold"; + desc.identifier = "silencethreshold"; + desc.name = "Silence Threshold"; desc.minValue = -120; desc.maxValue = 0; desc.defaultValue = -90; @@ -216,9 +222,9 @@ OutputList list; OutputDescriptor d; - d.name = "beats"; + d.identifier = "beats"; + d.name = "Beats"; d.unit = ""; - d.description = "Beats"; d.hasFixedBinCount = true; d.binCount = 0; d.sampleType = OutputDescriptor::VariableSampleRate; @@ -226,9 +232,9 @@ list.push_back(d); #ifdef HAVE_AUBIO_LOCKED_TEMPO_HACK - d.name = "tempo"; + d.identifier = "tempo"; + d.name = "Tempo"; d.unit = "bpm"; - d.description = "Tempo"; d.hasFixedBinCount = true; d.binCount = 1; d.hasKnownExtents = false;
--- a/plugins/Tempo.h Tue Dec 12 10:42:21 2006 +0000 +++ b/plugins/Tempo.h Mon Feb 26 18:10:34 2007 +0000 @@ -31,6 +31,7 @@ InputDomain getInputDomain() const { return TimeDomain; } + std::string getIdentifier() const; std::string getName() const; std::string getDescription() const; std::string getMaker() const;