# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1179933713 0
# Node ID b300de89ea30cd2f3b2773d3f191060c4cce7875
# Parent  3256bfa04ed818ad7d55e1b20cefb914f55743e4
...

diff -r 3256bfa04ed8 -r b300de89ea30 plugins/BeatTrack.cpp
--- a/plugins/BeatTrack.cpp	Mon May 21 13:09:12 2007 +0000
+++ b/plugins/BeatTrack.cpp	Wed May 23 15:21:53 2007 +0000
@@ -157,16 +157,16 @@
         return false;
     }
 
-    if (blockSize != getPreferredStepSize() * 2) {
-        std::cerr << "BeatTracker::initialise: Unsupported block size for this sample rate: "
-                  << blockSize << " (wanted " << (getPreferredStepSize() * 2) << ")" << std::endl;
+    if (stepSize != getPreferredStepSize()) {
+        std::cerr << "ERROR: BeatTracker::initialise: Unsupported step size for this sample rate: "
+                  << stepSize << " (wanted " << (getPreferredStepSize()) << ")" << std::endl;
         return false;
     }
 
-    if (stepSize != getPreferredStepSize()) {
-        std::cerr << "BeatTracker::initialise: Unsupported step size for this sample rate: "
-                  << stepSize << " (wanted " << (getPreferredStepSize()) << ")" << std::endl;
-        return false;
+    if (blockSize != getPreferredBlockSize()) {
+        std::cerr << "WARNING: BeatTracker::initialise: Unsupported block size for this sample rate: "
+                  << blockSize << " (wanted " << getPreferredBlockSize() << ")" << std::endl;
+//        return false;
     }
 
     DFConfig dfConfig;
@@ -197,7 +197,10 @@
 size_t
 BeatTracker::getPreferredBlockSize() const
 {
-    return getPreferredStepSize() * 2;
+    size_t theoretical = getPreferredStepSize() * 2;
+
+    //!!! need power of 2
+    return theoretical;
 }
 
 BeatTracker::OutputList
diff -r 3256bfa04ed8 -r b300de89ea30 plugins/OnsetDetect.cpp
--- a/plugins/OnsetDetect.cpp	Mon May 21 13:09:12 2007 +0000
+++ b/plugins/OnsetDetect.cpp	Wed May 23 15:21:53 2007 +0000
@@ -174,16 +174,16 @@
         return false;
     }
 
-    if (blockSize != getPreferredStepSize() * 2) {
-        std::cerr << "OnsetDetector::initialise: Unsupported block size for this sample rate: "
-                  << blockSize << " (wanted " << (getPreferredStepSize() * 2) << ")" << std::endl;
+    if (stepSize != getPreferredStepSize()) {
+        std::cerr << "ERROR: OnsetDetector::initialise: Unsupported step size for this sample rate: "
+                  << stepSize << " (wanted " << (getPreferredStepSize()) << ")" << std::endl;
         return false;
     }
 
-    if (stepSize != getPreferredStepSize()) {
-        std::cerr << "OnsetDetector::initialise: Unsupported step size for this sample rate: "
-                  << stepSize << " (wanted " << (getPreferredStepSize()) << ")" << std::endl;
-        return false;
+    if (blockSize != getPreferredBlockSize()) {
+        std::cerr << "WARNING: OnsetDetector::initialise: Unsupported block size for this sample rate: "
+                  << blockSize << " (wanted " << (getPreferredBlockSize()) << ")" << std::endl;
+//        return false;
     }
 
     DFConfig dfConfig;