merge with master

2014-01-14 21:13:21 -05:00
parent adc2edc05c 35c170937d
commit 37b1f5017e
13 changed files with 436 additions and 325 deletions
--- 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