projects
/
vamp-aubio-plugins.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust includes for subrepo aubio
[vamp-aubio-plugins.git]
/
plugins
/
Notes.h
diff --git
a/plugins/Notes.h
b/plugins/Notes.h
index
66d7f98
..
5bf32aa
100644
(file)
--- a/
plugins/Notes.h
+++ b/
plugins/Notes.h
@@
-18,7
+18,7
@@
#define _NOTES_PLUGIN_H_
#include <vamp-sdk/Plugin.h>
#define _NOTES_PLUGIN_H_
#include <vamp-sdk/Plugin.h>
-#include <aubio
/aubio
.h>
+#include <aubio.h>
#include <deque>
#include <deque>
@@
-27,7
+27,7
@@
class Notes : public Vamp::Plugin
{
public:
class Notes : public Vamp::Plugin
{
public:
- Notes(float inputSampleRate
, unsigned int apiVersion
);
+ Notes(float inputSampleRate);
virtual ~Notes();
bool initialise(size_t channels, size_t stepSize, size_t blockSize);
virtual ~Notes();
bool initialise(size_t channels, size_t stepSize, size_t blockSize);
@@
-57,22
+57,19
@@
public:
FeatureSet getRemainingFeatures();
protected:
FeatureSet getRemainingFeatures();
protected:
- int m_apiVersion;
fvec_t *m_ibuf;
fvec_t *m_ibuf;
- cvec_t *m_fftgrain;
fvec_t *m_onset;
fvec_t *m_onset;
- aubio_pvoc_t *m_pv;
- aubio_peakpicker_t *m_peakpick;
+ fvec_t *m_pitch;
aubio_onset_t *m_onsetdet;
OnsetType m_onsettype;
aubio_pitch_t *m_pitchdet;
PitchType m_pitchtype;
float m_threshold;
float m_silence;
aubio_onset_t *m_onsetdet;
OnsetType m_onsettype;
aubio_pitch_t *m_pitchdet;
PitchType m_pitchtype;
float m_threshold;
float m_silence;
+ float m_minioi;
size_t m_median;
size_t m_stepSize;
size_t m_blockSize;
size_t m_median;
size_t m_stepSize;
size_t m_blockSize;
- size_t m_channelCount;
int m_minpitch;
int m_maxpitch;
bool m_wrapRange;
int m_minpitch;
int m_maxpitch;
bool m_wrapRange;