Mercurial > hg > qm-vamp-plugins

changeset 159:6462f0981922

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam <c.cannam@qmul.ac.uk>
date Mon, 04 Aug 2014 16:02:26 +0100
parents c2bc9fd26159
children 9cc1f0be41dc
files build/linux/Makefile.linux build/linux/Makefile.linux32 build/linux/Makefile.linux64 plugins/ConstantQSpectrogram.cpp
diffstat 4 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/build/linux/Makefile.linux	Wed Jun 25 13:55:33 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-
-CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS
-#CFLAGS	:= -g -Wall
-
-CXXFLAGS := $(CFLAGS)
-
-LDFLAGS	 := -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/sse2/atlas -L/usr/lib/atlas/sse -Wl,-Bdynamic -llapack -lblas -lpthread -Wl,--version-script=vamp-plugin.map
-
-PLUGIN_EXT   := .so
-
-include build/general/Makefile.inc
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/linux/Makefile.linux32	Mon Aug 04 16:02:26 2014 +0100
@@ -0,0 +1,12 @@
+
+CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS
+#CFLAGS	:= -g -Wall
+
+CXXFLAGS := $(CFLAGS)
+
+LDFLAGS	 := -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/sse2/atlas -L/usr/lib/atlas/sse -llapack -lblas -Wl,-Bdynamic -lpthread -Wl,-z,defs -Wl,--version-script=vamp-plugin.map
+
+PLUGIN_EXT   := .so
+
+include build/general/Makefile.inc
+
--- a/build/linux/Makefile.linux64	Wed Jun 25 13:55:33 2014 +0100
+++ b/build/linux/Makefile.linux64	Mon Aug 04 16:02:26 2014 +0100
@@ -1,9 +1,9 @@
 
-CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -msse2 -mfpmath=sse -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS
+CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -msse2 -mfpmath=sse -ftree-vectorize -DUSE_PTHREADS
 
 CXXFLAGS := $(CFLAGS)
 
-LDFLAGS	 := -shared -Lbuild/linux/amd64 -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/sse2/atlas -L/usr/lib/atlas/sse -llapack -lcblas -latlas -Wl,-Bdynamic -lpthread -Wl,--version-script=vamp-plugin.map
+LDFLAGS	 := -shared -Lbuild/linux/amd64 -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/sse2/atlas -L/usr/lib/atlas/sse -llapack -lcblas -lf77blas -latlas -Wl,-z,defs -Wl,-Bdynamic -lpthread -Wl,--version-script=vamp-plugin.map
 
 PLUGIN_EXT   := .so
 
--- a/plugins/ConstantQSpectrogram.cpp	Wed Jun 25 13:55:33 2014 +0100
+++ b/plugins/ConstantQSpectrogram.cpp	Mon Aug 04 16:02:26 2014 +0100
@@ -29,11 +29,11 @@
     m_step(0),
     m_block(0)
 {
-    m_minMIDIPitch = 36;
+    m_minMIDIPitch = 24;
     m_maxMIDIPitch = 84;
     m_tuningFrequency = 440;
     m_normalized = false;
-    m_bpo = 12;
+    m_bpo = 24;
 
     setupConfig();
 }