projects
/
vamp-aubio-plugins.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3144a5d
)
* Update along with latest Vamp API change
author
Chris Cannam
<cannam@all-day-breakfast.com>
Mon, 26 Feb 2007 18:10:34 +0000
(18:10 +0000)
committer
Chris Cannam
<cannam@all-day-breakfast.com>
Mon, 26 Feb 2007 18:10:34 +0000
(18:10 +0000)
plugins/Notes.cpp
patch
|
blob
|
history
plugins/Notes.h
patch
|
blob
|
history
plugins/Onset.cpp
patch
|
blob
|
history
plugins/Onset.h
patch
|
blob
|
history
plugins/Pitch.cpp
patch
|
blob
|
history
plugins/Pitch.h
patch
|
blob
|
history
plugins/Tempo.cpp
patch
|
blob
|
history
plugins/Tempo.h
patch
|
blob
|
history
diff --git
a/plugins/Notes.cpp
b/plugins/Notes.cpp
index
eb68cee
..
cc1c250
100644
(file)
--- a/
plugins/Notes.cpp
+++ b/
plugins/Notes.cpp
@@
-57,18
+57,24
@@
Notes::~Notes()
}
string
}
string
-Notes::get
Name
() const
+Notes::get
Identifier
() const
{
return "aubionotes";
}
string
{
return "aubionotes";
}
string
-Notes::get
Description
() const
+Notes::get
Name
() const
{
return "Aubio Note Tracker";
}
string
{
return "Aubio Note Tracker";
}
string
+Notes::getDescription() const
+{
+ return "Estimate note onset positions, pitches and durations";
+}
+
+string
Notes::getMaker() const
{
return "Paul Brossier (plugin by Chris Cannam)";
Notes::getMaker() const
{
return "Paul Brossier (plugin by Chris Cannam)";
@@
-149,8
+155,8
@@
Notes::getParameterDescriptors() const
ParameterList list;
ParameterDescriptor desc;
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;
desc.minValue = 0;
desc.maxValue = 6;
desc.defaultValue = (int)aubio_onset_complex;
@@
-166,8
+172,8
@@
Notes::getParameterDescriptors() const
list.push_back(desc);
desc = ParameterDescriptor();
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;
desc.minValue = 0;
desc.maxValue = 4;
desc.defaultValue = (int)aubio_pitch_yinfft;
@@
-181,8
+187,8
@@
Notes::getParameterDescriptors() const
list.push_back(desc);
desc = ParameterDescriptor();
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;
desc.minValue = 0;
desc.maxValue = 127;
desc.defaultValue = 32;
@@
-192,8
+198,8
@@
Notes::getParameterDescriptors() const
list.push_back(desc);
desc = ParameterDescriptor();
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;
desc.minValue = 0;
desc.maxValue = 127;
desc.defaultValue = 95;
@@
-203,8
+209,8
@@
Notes::getParameterDescriptors() const
list.push_back(desc);
desc = ParameterDescriptor();
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;
desc.minValue = 0;
desc.maxValue = 1;
desc.defaultValue = 0;
@@
-213,8
+219,8
@@
Notes::getParameterDescriptors() const
list.push_back(desc);
desc = ParameterDescriptor();
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;
desc.minValue = 0;
desc.maxValue = 1;
desc.defaultValue = 0;
@@
-223,8
+229,8
@@
Notes::getParameterDescriptors() const
list.push_back(desc);
desc = ParameterDescriptor();
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;
desc.minValue = 0;
desc.maxValue = 1;
desc.defaultValue = 0.3;
@@
-232,8
+238,8
@@
Notes::getParameterDescriptors() const
list.push_back(desc);
desc = ParameterDescriptor();
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;
desc.minValue = -120;
desc.maxValue = 0;
desc.defaultValue = -90;
@@
-310,9
+316,9
@@
Notes::getOutputDescriptors() const
OutputList list;
OutputDescriptor d;
OutputList list;
OutputDescriptor d;
- d.name = "notes";
+ d.identifier = "notes";
+ d.name = "Notes";
d.unit = "Hz";
d.unit = "Hz";
- d.description = "Notes";
d.hasFixedBinCount = true;
d.binCount = 2;
d.binNames.push_back("Frequency");
d.hasFixedBinCount = true;
d.binCount = 2;
d.binNames.push_back("Frequency");
diff --git
a/plugins/Notes.h
b/plugins/Notes.h
index
b3bc24c
..
3fc488b
100644
(file)
--- a/
plugins/Notes.h
+++ b/
plugins/Notes.h
@@
-33,6
+33,7
@@
public:
InputDomain getInputDomain() const { return TimeDomain; }
InputDomain getInputDomain() const { return TimeDomain; }
+ std::string getIdentifier() const;
std::string getName() const;
std::string getDescription() const;
std::string getMaker() const;
std::string getName() const;
std::string getDescription() const;
std::string getMaker() const;
diff --git
a/plugins/Onset.cpp
b/plugins/Onset.cpp
index
df33208
..
d475b11
100644
(file)
--- a/
plugins/Onset.cpp
+++ b/
plugins/Onset.cpp
@@
-48,18
+48,24
@@
Onset::~Onset()
}
string
}
string
-Onset::get
Name
() const
+Onset::get
Identifier
() const
{
return "aubioonset";
}
string
{
return "aubioonset";
}
string
-Onset::get
Description
() const
+Onset::get
Name
() const
{
return "Aubio Onset Detector";
}
string
{
return "Aubio Onset Detector";
}
string
+Onset::getDescription() const
+{
+ return "Estimate note onset times";
+}
+
+string
Onset::getMaker() const
{
return "Paul Brossier (plugin by Chris Cannam)";
Onset::getMaker() const
{
return "Paul Brossier (plugin by Chris Cannam)";
@@
-123,8
+129,8
@@
Onset::getParameterDescriptors() const
ParameterList list;
ParameterDescriptor desc;
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;
desc.minValue = 0;
desc.maxValue = 6;
desc.defaultValue = (int)aubio_onset_complex;
@@
-140,8
+146,8
@@
Onset::getParameterDescriptors() const
list.push_back(desc);
desc = ParameterDescriptor();
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;
desc.minValue = 0;
desc.maxValue = 1;
desc.defaultValue = 0.3;
@@
-149,8
+155,8
@@
Onset::getParameterDescriptors() const
list.push_back(desc);
desc = ParameterDescriptor();
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;
desc.minValue = -120;
desc.maxValue = 0;
desc.defaultValue = -90;
@@
-201,9
+207,9
@@
Onset::getOutputDescriptors() const
OutputList list;
OutputDescriptor d;
OutputList list;
OutputDescriptor d;
- d.name = "onsets";
+ d.identifier = "onsets";
+ d.name = "Onsets";
d.unit = "";
d.unit = "";
- d.description = "Onsets";
d.hasFixedBinCount = true;
d.binCount = 0;
d.sampleType = OutputDescriptor::VariableSampleRate;
d.hasFixedBinCount = true;
d.binCount = 0;
d.sampleType = OutputDescriptor::VariableSampleRate;
@@
-211,9
+217,9
@@
Onset::getOutputDescriptors() const
list.push_back(d);
d = OutputDescriptor();
list.push_back(d);
d = OutputDescriptor();
- d.name = "detectionfunction";
+ d.identifier = "detectionfunction";
+ d.name = "Onset Detection Function";
d.unit = "";
d.unit = "";
- d.description = "Onset Detection Function";
d.hasFixedBinCount = true;
d.binCount = m_channelCount;
d.hasKnownExtents = false;
d.hasFixedBinCount = true;
d.binCount = m_channelCount;
d.hasKnownExtents = false;
diff --git
a/plugins/Onset.h
b/plugins/Onset.h
index
c8c3475
..
314e107
100644
(file)
--- a/
plugins/Onset.h
+++ b/
plugins/Onset.h
@@
-31,6
+31,7
@@
public:
InputDomain getInputDomain() const { return TimeDomain; }
InputDomain getInputDomain() const { return TimeDomain; }
+ std::string getIdentifier() const;
std::string getName() const;
std::string getDescription() const;
std::string getMaker() const;
std::string getName() const;
std::string getDescription() const;
std::string getMaker() const;
diff --git
a/plugins/Pitch.cpp
b/plugins/Pitch.cpp
index
635909d
..
7cab33f
100644
(file)
--- a/
plugins/Pitch.cpp
+++ b/
plugins/Pitch.cpp
@@
-38,18
+38,24
@@
Pitch::~Pitch()
}
string
}
string
-Pitch::get
Name
() const
+Pitch::get
Identifier
() const
{
return "aubiopitch";
}
string
{
return "aubiopitch";
}
string
-Pitch::get
Description
() const
+Pitch::get
Name
() 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;
diff --git
a/plugins/Pitch.h
b/plugins/Pitch.h
index
4b86b04
..
9a0abb4
100644
(file)
--- a/
plugins/Pitch.h
+++ b/
plugins/Pitch.h
@@
-31,6
+31,7
@@
public:
InputDomain getInputDomain() const { return TimeDomain; }
InputDomain getInputDomain() const { return TimeDomain; }
+ std::string getIdentifier() const;
std::string getName() const;
std::string getDescription() const;
std::string getMaker() const;
std::string getName() const;
std::string getDescription() const;
std::string getMaker() const;
diff --git
a/plugins/Tempo.cpp
b/plugins/Tempo.cpp
index
81c4a49
..
9d2b708
100644
(file)
--- a/
plugins/Tempo.cpp
+++ b/
plugins/Tempo.cpp
@@
-22,7
+22,7
@@
using std::vector;
using std::cerr;
using std::endl;
using std::cerr;
using std::endl;
-
//
#define HAVE_AUBIO_LOCKED_TEMPO_HACK
+#define HAVE_AUBIO_LOCKED_TEMPO_HACK
Tempo::Tempo(float inputSampleRate) :
Plugin(inputSampleRate),
Tempo::Tempo(float inputSampleRate) :
Plugin(inputSampleRate),
@@
-57,21
+57,27
@@
Tempo::~Tempo()
}
string
}
string
-Tempo::get
Name
() const
+Tempo::get
Identifier
() const
{
return "aubiotempo";
}
string
{
return "aubiotempo";
}
string
-Tempo::get
Description
() const
+Tempo::get
Name
() const
{
return "Aubio Tempo Detector";
}
string
{
return "Aubio Tempo Detector";
}
string
+Tempo::getDescription() const
+{
+ return "Estimate the musical tempo by tracking note onset timings";
+}
+
+string
Tempo::getMaker() const
{
Tempo::getMaker() const
{
- return "Paul Brossier (plugin by Chris Cannam)";
+ return "Paul Brossier (
method by Matthew Davies,
plugin by Chris Cannam)";
}
int
}
int
@@
-138,8
+144,8
@@
Tempo::getParameterDescriptors() const
ParameterList list;
ParameterDescriptor desc;
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;
desc.minValue = 0;
desc.maxValue = 6;
desc.defaultValue = (int)aubio_onset_complex;
@@
-155,8
+161,8
@@
Tempo::getParameterDescriptors() const
list.push_back(desc);
desc = ParameterDescriptor();
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;
desc.minValue = 0;
desc.maxValue = 1;
desc.defaultValue = 0.3;
@@
-164,8
+170,8
@@
Tempo::getParameterDescriptors() const
list.push_back(desc);
desc = ParameterDescriptor();
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;
desc.minValue = -120;
desc.maxValue = 0;
desc.defaultValue = -90;
@@
-216,9
+222,9
@@
Tempo::getOutputDescriptors() const
OutputList list;
OutputDescriptor d;
OutputList list;
OutputDescriptor d;
- d.name = "beats";
+ d.identifier = "beats";
+ d.name = "Beats";
d.unit = "";
d.unit = "";
- d.description = "Beats";
d.hasFixedBinCount = true;
d.binCount = 0;
d.sampleType = OutputDescriptor::VariableSampleRate;
d.hasFixedBinCount = true;
d.binCount = 0;
d.sampleType = OutputDescriptor::VariableSampleRate;
@@
-226,9
+232,9
@@
Tempo::getOutputDescriptors() const
list.push_back(d);
#ifdef HAVE_AUBIO_LOCKED_TEMPO_HACK
list.push_back(d);
#ifdef HAVE_AUBIO_LOCKED_TEMPO_HACK
- d.name = "tempo";
+ d.identifier = "tempo";
+ d.name = "Tempo";
d.unit = "bpm";
d.unit = "bpm";
- d.description = "Tempo";
d.hasFixedBinCount = true;
d.binCount = 1;
d.hasKnownExtents = false;
d.hasFixedBinCount = true;
d.binCount = 1;
d.hasKnownExtents = false;
diff --git
a/plugins/Tempo.h
b/plugins/Tempo.h
index
a92c545
..
ab07d35
100644
(file)
--- a/
plugins/Tempo.h
+++ b/
plugins/Tempo.h
@@
-31,6
+31,7
@@
public:
InputDomain getInputDomain() const { return TimeDomain; }
InputDomain getInputDomain() const { return TimeDomain; }
+ std::string getIdentifier() const;
std::string getName() const;
std::string getDescription() const;
std::string getMaker() const;
std::string getName() const;
std::string getDescription() const;
std::string getMaker() const;