Mercurial > hg > qm-vamp-plugins

changeset 70:5f46f4b33fd1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Add forgotten file g2cstubs.c * Some symbol visibility work
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 03 Jul 2008 13:59:10 +0000
parents c2b7e1d4f1db
children 1759834c6235
files g2cstubs.c plugins/TonalChangeDetect.cpp qm-vamp-plugins.pro
diffstat 3 files changed, 16 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/g2cstubs.c	Thu Jul 03 13:59:10 2008 +0000
@@ -0,0 +1,5 @@
+
+void s_wsfe() { }
+void do_fio() { }
+void e_wsfe() { }
+void s_stop() { }
--- a/plugins/TonalChangeDetect.cpp	Thu Jun 19 09:22:44 2008 +0000
+++ b/plugins/TonalChangeDetect.cpp	Thu Jul 03 13:59:10 2008 +0000
@@ -271,10 +271,10 @@
     d.minValue = 2;
     d.hasFixedBinCount = true;
     d.binCount = 1;
-    d.hasKnownExtents = true;
+    d.hasKnownExtents = false;
     d.isQuantized = false;
     d.sampleType = OutputDescriptor::VariableSampleRate;
-    double dStepSecs = double(m_step) / m_inputSampleRate;
+    double dStepSecs = double(getPreferredStepSize()) / m_inputSampleRate;
     d.sampleRate = 1.0f / dStepSecs;
 	
     OutputDescriptor changes;
@@ -283,6 +283,8 @@
     changes.unit = "";
     changes.hasFixedBinCount = true;
     changes.binCount = 0;
+    changes.hasKnownExtents = false;
+    changes.isQuantized = false;
     changes.sampleType = OutputDescriptor::VariableSampleRate;
     changes.sampleRate = 1.0 / dStepSecs;
 	
--- a/qm-vamp-plugins.pro	Thu Jun 19 09:22:44 2008 +0000
+++ b/qm-vamp-plugins.pro	Thu Jul 03 13:59:10 2008 +0000
@@ -12,8 +12,11 @@
 INCLUDEPATH += ../vamp-plugin-sdk ../qm-dsp
 LIBPATH += ../vamp-plugin-sdk/vamp-sdk ../qm-dsp
 
-linux-g++:LIBS += -static-libgcc -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/atlas/sse -llapack -lblas -lg2c $(shell g++ -print-file-name=libstdc++.a) -Wl,-Bdynamic
-#LIBS += -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/atlas/sse -lblas -llapack -lg2c -Wl,-Bdynamic
+linux-g++:LIBS += -static-libgcc -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/sse2/atlas -L/usr/lib/atlas/sse -llapack -lblas $$system(g++ -print-file-name=libstdc++.a) -lc -Wl,-Bdynamic -Wl,--version-script=vamp-plugin.map
+
+osx:CXXFLAGS += -fvisibility=hidden
+
+#LIBS += -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/atlas/sse -lblas -llapack -Wl,-Bdynamic
 
 DEPENDPATH += plugins
 INCLUDEPATH += . plugins
@@ -28,7 +31,8 @@
            plugins/SegmenterPlugin.h \
            plugins/SimilarityPlugin.h \
            plugins/TonalChangeDetect.h
-SOURCES += plugins/BeatTrack.cpp \
+SOURCES += g2cstubs.c \
+           plugins/BeatTrack.cpp \
            plugins/OnsetDetect.cpp \
            plugins/ChromagramPlugin.cpp \
            plugins/ConstantQSpectrogram.cpp \