# HG changeset patch # User Chris Cannam # Date 1371141624 -3600 # Node ID 8bd9b79c9e830d011c7305b969f7b57eb2b350ea # Parent 0df6322d83bbb2403d2b1780e05d88fb22964d57 Avoid returning unwanted output from process; move Linux makefile to linux rather than linux64 as there's nothing 64-bit-specific about it diff -r 0df6322d83bb -r 8bd9b79c9e83 Makefile.linux --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Makefile.linux Thu Jun 13 17:40:24 2013 +0100 @@ -0,0 +1,13 @@ + +CFLAGS := -O3 -fPIC -ftree-vectorize + +#CFLAGS := -Wall -g -fPIC + +CXXFLAGS := $(CFLAGS) + +LDFLAGS := -shared -Wl,-Bsymbolic -Wl,--version-script=segmentino/vamp-plugin.map + +PLUGIN_EXT := .so + +include Makefile.inc + diff -r 0df6322d83bb -r 8bd9b79c9e83 Makefile.linux64 --- a/Makefile.linux64 Thu Jun 13 16:39:46 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - -CFLAGS := -O3 -fPIC -ftree-vectorize - -#CFLAGS := -Wall -g -fPIC - -CXXFLAGS := $(CFLAGS) - -LDFLAGS := -shared -Wl,-Bsymbolic -Wl,--version-script=segmentino/vamp-plugin.map - -PLUGIN_EXT := .so - -include Makefile.inc - diff -r 0df6322d83bb -r 8bd9b79c9e83 segmentino/Segmentino.cpp --- a/segmentino/Segmentino.cpp Thu Jun 13 16:39:46 2013 +0100 +++ b/segmentino/Segmentino.cpp Thu Jun 13 17:40:24 2013 +0100 @@ -653,8 +653,6 @@ m_pluginFrameCount++; FeatureSet fs; - fs[m_logscalespecOutputNumber].push_back( - m_chromadata->logSpectrum.back()); return fs; }