Mercurial > hg > qm-vamp-plugins
changeset 22:6d014fb538db
* Update along with latest Vamp API change
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Mon, 26 Feb 2007 17:49:15 +0000 |
| parents | d695fc2baa91 |
| children | bec0d544984b |
| files | plugins/BeatDetect.cpp plugins/BeatDetect.h plugins/ChromagramPlugin.cpp plugins/ChromagramPlugin.h plugins/ConstantQSpectrogram.cpp plugins/ConstantQSpectrogram.h plugins/KeyDetect.cpp plugins/KeyDetect.h plugins/TonalChangeDetect.cpp plugins/TonalChangeDetect.h |
| diffstat | 10 files changed, 91 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/BeatDetect.cpp Mon Jan 22 17:32:40 2007 +0000 +++ b/plugins/BeatDetect.cpp Mon Feb 26 17:49:15 2007 +0000 @@ -53,15 +53,22 @@ } string -BeatDetector::getName() const +BeatDetector::getIdentifier() const { return "qm-tempotracker"; } string +BeatDetector::getName() const +{ + return "Beat Tracker"; +} + +string BeatDetector::getDescription() const { - return "Beat Tracker"; + //!!! + return ""; } string @@ -88,8 +95,9 @@ ParameterList list; ParameterDescriptor desc; - desc.name = "dftype"; - desc.description = "Onset Detection Function Type"; + desc.identifier = "dftype"; + desc.name = "Onset Detection Function Type"; + desc.description = ""; desc.minValue = 0; desc.maxValue = 3; desc.defaultValue = 3; @@ -194,18 +202,18 @@ OutputList list; OutputDescriptor beat; - beat.name = "beats"; + beat.identifier = "beats"; + beat.name = "Detected Beats"; beat.unit = ""; - beat.description = "Detected Beats"; beat.hasFixedBinCount = true; beat.binCount = 0; beat.sampleType = OutputDescriptor::VariableSampleRate; beat.sampleRate = 1.0 / m_stepSecs; OutputDescriptor df; - df.name = "detection_fn"; + df.identifier = "detection_fn"; + df.name = "Beat Detection Function"; df.unit = ""; - df.description = "Beat Detection Function"; df.hasFixedBinCount = true; df.binCount = 1; df.hasKnownExtents = false; @@ -213,9 +221,9 @@ df.sampleType = OutputDescriptor::OneSamplePerStep; OutputDescriptor tempo; - tempo.name = "tempo"; + tempo.identifier = "tempo"; + tempo.name = "Tempo"; tempo.unit = "bpm"; - tempo.description = "Tempo"; tempo.hasFixedBinCount = true; tempo.binCount = 1; tempo.sampleType = OutputDescriptor::VariableSampleRate;
--- a/plugins/BeatDetect.h Mon Jan 22 17:32:40 2007 +0000 +++ b/plugins/BeatDetect.h Mon Feb 26 17:49:15 2007 +0000 @@ -25,6 +25,7 @@ InputDomain getInputDomain() const { return FrequencyDomain; } + std::string getIdentifier() const; std::string getName() const; std::string getDescription() const; std::string getMaker() const;
--- a/plugins/ChromagramPlugin.cpp Mon Jan 22 17:32:40 2007 +0000 +++ b/plugins/ChromagramPlugin.cpp Mon Feb 26 17:49:15 2007 +0000 @@ -54,15 +54,22 @@ } string -ChromagramPlugin::getName() const +ChromagramPlugin::getIdentifier() const { return "qm-chromagram"; } string +ChromagramPlugin::getName() const +{ + return "Chromagram"; +} + +string ChromagramPlugin::getDescription() const { - return "Chromagram"; + //!!! + return ""; } string @@ -89,8 +96,8 @@ ParameterList list; ParameterDescriptor desc; - desc.name = "minpitch"; - desc.description = "Minimum Pitch"; + desc.identifier = "minpitch"; + desc.name = "Minimum Pitch"; desc.unit = "MIDI units"; desc.minValue = 0; desc.maxValue = 127; @@ -99,8 +106,8 @@ desc.quantizeStep = 1; list.push_back(desc); - desc.name = "maxpitch"; - desc.description = "Maximum Pitch"; + desc.identifier = "maxpitch"; + desc.name = "Maximum Pitch"; desc.unit = "MIDI units"; desc.minValue = 0; desc.maxValue = 127; @@ -109,8 +116,8 @@ desc.quantizeStep = 1; list.push_back(desc); - desc.name = "tuning"; - desc.description = "Tuning Frequency"; + desc.identifier = "tuning"; + desc.name = "Tuning Frequency"; desc.unit = "Hz"; desc.minValue = 420; desc.maxValue = 460; @@ -118,8 +125,8 @@ desc.isQuantized = false; list.push_back(desc); - desc.name = "bpo"; - desc.description = "Bins per Octave"; + desc.identifier = "bpo"; + desc.name = "Bins per Octave"; desc.unit = "bins"; desc.minValue = 2; desc.maxValue = 36; @@ -128,8 +135,8 @@ desc.quantizeStep = 1; list.push_back(desc); - desc.name = "normalized"; - desc.description = "Normalized"; + desc.identifier = "normalized"; + desc.name = "Normalized"; desc.unit = ""; desc.minValue = 0; desc.maxValue = 1; @@ -254,9 +261,9 @@ OutputList list; OutputDescriptor d; - d.name = "chromagram"; + d.identifier = "chromagram"; + d.name = "Chromagram"; d.unit = ""; - d.description = "Chromagram"; d.hasFixedBinCount = true; d.binCount = m_config.BPO;
--- a/plugins/ChromagramPlugin.h Mon Jan 22 17:32:40 2007 +0000 +++ b/plugins/ChromagramPlugin.h Mon Feb 26 17:49:15 2007 +0000 @@ -26,6 +26,7 @@ InputDomain getInputDomain() const { return FrequencyDomain; } + std::string getIdentifier() const; std::string getName() const; std::string getDescription() const; std::string getMaker() const;
--- a/plugins/ConstantQSpectrogram.cpp Mon Jan 22 17:32:40 2007 +0000 +++ b/plugins/ConstantQSpectrogram.cpp Mon Feb 26 17:49:15 2007 +0000 @@ -54,15 +54,21 @@ } string -ConstantQSpectrogram::getName() const +ConstantQSpectrogram::getIdentifier() const { return "qm-constantq"; } string +ConstantQSpectrogram::getName() const +{ + return "Constant-Q Spectrogram"; +} + +string ConstantQSpectrogram::getDescription() const { - return "Constant-Q Spectrogram"; + return ""; } string @@ -89,8 +95,8 @@ ParameterList list; ParameterDescriptor desc; - desc.name = "minpitch"; - desc.description = "Minimum Pitch"; + desc.identifier = "minpitch"; + desc.name = "Minimum Pitch"; desc.unit = "MIDI units"; desc.minValue = 0; desc.maxValue = 127; @@ -99,8 +105,8 @@ desc.quantizeStep = 1; list.push_back(desc); - desc.name = "maxpitch"; - desc.description = "Maximum Pitch"; + desc.identifier = "maxpitch"; + desc.name = "Maximum Pitch"; desc.unit = "MIDI units"; desc.minValue = 0; desc.maxValue = 127; @@ -109,8 +115,8 @@ desc.quantizeStep = 1; list.push_back(desc); - desc.name = "tuning"; - desc.description = "Tuning Frequency"; + desc.identifier = "tuning"; + desc.name = "Tuning Frequency"; desc.unit = "Hz"; desc.minValue = 420; desc.maxValue = 460; @@ -118,8 +124,8 @@ desc.isQuantized = false; list.push_back(desc); - desc.name = "bpo"; - desc.description = "Bins per Octave"; + desc.identifier = "bpo"; + desc.name = "Bins per Octave"; desc.unit = "bins"; desc.minValue = 2; desc.maxValue = 36; @@ -128,8 +134,8 @@ desc.quantizeStep = 1; list.push_back(desc); - desc.name = "normalized"; - desc.description = "Normalized"; + desc.identifier = "normalized"; + desc.name = "Normalized"; desc.unit = ""; desc.minValue = 0; desc.maxValue = 1; @@ -255,9 +261,9 @@ OutputList list; OutputDescriptor d; - d.name = "constantq"; + d.identifier = "constantq"; + d.name = "Constant-Q Spectrogram"; d.unit = ""; - d.description = "Constant-Q Spectrogram"; d.hasFixedBinCount = true; d.binCount = m_bins;
--- a/plugins/ConstantQSpectrogram.h Mon Jan 22 17:32:40 2007 +0000 +++ b/plugins/ConstantQSpectrogram.h Mon Feb 26 17:49:15 2007 +0000 @@ -26,6 +26,7 @@ InputDomain getInputDomain() const { return FrequencyDomain; } + std::string getIdentifier() const; std::string getName() const; std::string getDescription() const; std::string getMaker() const;
--- a/plugins/KeyDetect.cpp Mon Jan 22 17:32:40 2007 +0000 +++ b/plugins/KeyDetect.cpp Mon Feb 26 17:49:15 2007 +0000 @@ -65,15 +65,22 @@ } string -KeyDetector::getName() const +KeyDetector::getIdentifier() const { return "qm-keydetector"; } string +KeyDetector::getName() const +{ + return "Key Detector"; +} + +string KeyDetector::getDescription() const { - return "Key Detector"; + //!!! + return ""; } string @@ -100,8 +107,8 @@ ParameterList list; ParameterDescriptor desc; - desc.name = "tuning"; - desc.description = "Tuning Frequency"; + desc.identifier = "tuning"; + desc.name = "Tuning Frequency"; desc.unit = "Hz"; desc.minValue = 420; desc.maxValue = 460; @@ -109,8 +116,8 @@ desc.isQuantized = false; list.push_back(desc); - desc.name = "length"; - desc.description = "Window Length"; + desc.identifier = "length"; + desc.name = "Window Length"; desc.unit = "chroma frames"; desc.minValue = 1; desc.maxValue = 30; @@ -209,9 +216,9 @@ OutputList list; OutputDescriptor d; - d.name = "tonic"; + d.identifier = "tonic"; + d.name = "Tonic Pitch"; d.unit = ""; - d.description = "Tonic Pitch"; d.hasFixedBinCount = true; d.binCount = 1; d.hasKnownExtents = true; @@ -222,9 +229,9 @@ d.sampleType = OutputDescriptor::OneSamplePerStep; list.push_back(d); - d.name = "mode"; + d.identifier = "mode"; + d.name = "Key Mode"; d.unit = ""; - d.description = "Key Mode"; d.hasFixedBinCount = true; d.binCount = 1; d.hasKnownExtents = true; @@ -236,9 +243,9 @@ d.sampleType = OutputDescriptor::OneSamplePerStep; list.push_back(d); - d.name = "key"; + d.identifier = "key"; + d.name = "Key"; d.unit = ""; - d.description = "Key"; d.hasFixedBinCount = true; d.binCount = 1; d.hasKnownExtents = true;
--- a/plugins/KeyDetect.h Mon Jan 22 17:32:40 2007 +0000 +++ b/plugins/KeyDetect.h Mon Feb 26 17:49:15 2007 +0000 @@ -52,6 +52,7 @@ InputDomain getInputDomain() const { return TimeDomain; } + std::string getIdentifier() const; std::string getName() const; std::string getDescription() const; std::string getMaker() const;
--- a/plugins/TonalChangeDetect.cpp Mon Jan 22 17:32:40 2007 +0000 +++ b/plugins/TonalChangeDetect.cpp Mon Feb 26 17:49:15 2007 +0000 @@ -75,14 +75,20 @@ } -std::string TonalChangeDetect::getName() const +std::string TonalChangeDetect::getIdentifier() const { return "qm-tonalchange"; } +std::string TonalChangeDetect::getName() const +{ + return "Tonal Change"; +} + std::string TonalChangeDetect::getDescription() const { - return "Tonal Change"; + //!!! + return ""; } std::string TonalChangeDetect::getMaker() const
--- a/plugins/TonalChangeDetect.h Mon Jan 22 17:32:40 2007 +0000 +++ b/plugins/TonalChangeDetect.h Mon Feb 26 17:49:15 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;