merge with master, primarily for adrian's maximise-mixer change

[ardour.git] / libs / vamp-plugins / Onset.cpp

diff --git a/libs/vamp-plugins/Onset.cpp b/libs/vamp-plugins/Onset.cpp
index f97af203c757d3b0916791cace4604ca66876ec6..b8a97170240cb3e23ba2808aa25207a8e473ef7d 100644 (file)
--- a/libs/vamp-plugins/Onset.cpp
+++ b/libs/vamp-plugins/Onset.cpp
@@ -146,10 +146,10 @@ Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)
     return true;
 }
 
-#ifdef HAVE_AUBIO4
 void
 Onset::reset()
 {
+#ifdef HAVE_AUBIO4
     if (m_onsetdet) del_aubio_onset(m_onsetdet);
 
     m_onsetdet = new_aubio_onset
@@ -166,8 +166,8 @@ Onset::reset()
                                              lrintf(m_inputSampleRate));
 
     m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;
-}
 #endif
+}
 
 size_t
 Onset::getPreferredStepSize() const