# HG changeset patch
# User Chris Cannam
# Date 1378398638 -3600
# Node ID c40de221b5df39597ebcd23bba60eed91bc863c1
# Parent  d0ea842539a98fa68816f34d22eb995c72f0154c# Parent  5a7f78c34133fe2c6f222334a399f2b3c514a9f9
Merge

diff -r d0ea842539a9 -r c40de221b5df Makefile.osx
--- a/Makefile.osx	Thu Sep 05 17:29:53 2013 +0100
+++ b/Makefile.osx	Thu Sep 05 17:30:38 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 d0ea842539a9 -r c40de221b5df NNLSBase.cpp
--- a/NNLSBase.cpp	Thu Sep 05 17:29:53 2013 +0100
+++ b/NNLSBase.cpp	Thu Sep 05 17:30:38 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;