# HG changeset patch
# User matthiasm
# Date 1378347030 -3600
# Node ID a85e745c0721f9b30116f642275929bb55e28ccb
# Parent  0d70058c2bce866111b7b56c05972b771934cb52
attempt to resolve problem of mangitude threshold for small frame sizes

diff -r 0d70058c2bce -r a85e745c0721 Makefile.osx
--- a/Makefile.osx	Tue Jun 19 16:28:16 2012 +0100
+++ b/Makefile.osx	Thu Sep 05 03:10:30 2013 +0100
@@ -12,9 +12,9 @@
 
 
 ##  Uncomment these for an OS/X native build using command-line tools:
-ARCHFLAGS = -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -arch i386
+ARCHFLAGS = -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk -mmacosx-version-min=10.5 -arch i386 -arch x86_64 
 CFLAGS = $(ARCHFLAGS) -Wall -fPIC -g -O3
-CXXFLAGS = $(CFLAGS) -I$(VAMP_SDK_DIR) -I$(BOOST_ROOT)
+CXXFLAGS = $(CFLAGS) -I$(VAMP_SDK_DIR) -I$(BOOST_ROOT) -I.
 PLUGIN_EXT = .dylib
 PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
 LDFLAGS = $(ARCHFLAGS) -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a  -exported_symbols_list vamp-plugin.list -framework Accelerate
diff -r 0d70058c2bce -r a85e745c0721 NNLSBase.cpp
--- a/NNLSBase.cpp	Tue Jun 19 16:28:16 2012 +0100
+++ b/NNLSBase.cpp	Thu Sep 05 03:10:30 2013 +0100
@@ -465,7 +465,7 @@
         }
     }
 	
-    if (maxmag < 2) {
+    if (maxmag < m_blockSize * 2.0 / 16384.0) { // this is not quite right, I think
         // cerr << "timestamp " << timestamp << ": very low magnitude, setting magnitude to all zeros" << endl;
         for (int iBin = 0; iBin < static_cast<int>(m_blockSize/2); iBin++) {
             magnitude[iBin] = 0;