projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't update unused dsp timer variable in freewheel process in PortaudioBackend
[ardour.git]
/
libs
/
vamp-plugins
/
Onset.h
diff --git
a/libs/vamp-plugins/Onset.h
b/libs/vamp-plugins/Onset.h
index c858151b213753d0258d263cabc28933132d6095..bba95e0d2ba262b44a4c0a6f7f8e0702d8e3a5e1 100644
(file)
--- a/
libs/vamp-plugins/Onset.h
+++ b/
libs/vamp-plugins/Onset.h
@@
-17,9
+17,22
@@
#ifndef _ONSET_PLUGIN_H_
#define _ONSET_PLUGIN_H_
#ifndef _ONSET_PLUGIN_H_
#define _ONSET_PLUGIN_H_
-#include
"vamp-sdk/Plugin.h"
+#include
<vamp-sdk/Plugin.h>
#include <aubio/aubio.h>
#include <aubio/aubio.h>
+#ifdef HAVE_AUBIO4
+enum OnsetType {
+ OnsetEnergy,
+ OnsetSpecDiff,
+ OnsetHFC,
+ OnsetComplex,
+ OnsetPhase,
+ OnsetKL,
+ OnsetMKL,
+ OnsetSpecFlux // new in 0.4!
+};
+#endif
+
class Onset : public Vamp::Plugin
{
public:
class Onset : public Vamp::Plugin
{
public:
@@
-54,20
+67,25
@@
public:
protected:
fvec_t *m_ibuf;
protected:
fvec_t *m_ibuf;
- cvec_t *m_fftgrain;
fvec_t *m_onset;
fvec_t *m_onset;
+#ifdef HAVE_AUBIO4
+ aubio_onset_t *m_onsetdet;
+ OnsetType m_onsettype;
+ float m_minioi;
+#else
+ cvec_t *m_fftgrain;
aubio_pvoc_t *m_pv;
aubio_pickpeak_t *m_peakpick;
aubio_onsetdetection_t *m_onsetdet;
aubio_onsetdetection_type m_onsettype;
aubio_pvoc_t *m_pv;
aubio_pickpeak_t *m_peakpick;
aubio_onsetdetection_t *m_onsetdet;
aubio_onsetdetection_type m_onsettype;
- float m_threshold;
+ size_t m_channelCount;
+#endif
float m_silence;
float m_silence;
+ float m_threshold;
size_t m_stepSize;
size_t m_blockSize;
size_t m_stepSize;
size_t m_blockSize;
- size_t m_channelCount;
Vamp::RealTime m_delay;
Vamp::RealTime m_lastOnset;
};
Vamp::RealTime m_delay;
Vamp::RealTime m_lastOnset;
};
-
#endif
#endif