# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1201775979 0
# Node ID ee9d180a5ad608ea5e0f3d12552628946b74959c
# Parent  4fb1c0a2417803a1dc9e589eaed634cc7a8931a4
* reset() implementations

diff -r 4fb1c0a24178 -r ee9d180a5ad6 plugins/SegmenterPlugin.cpp
--- a/plugins/SegmenterPlugin.cpp	Thu Jan 31 10:33:35 2008 +0000
+++ b/plugins/SegmenterPlugin.cpp	Thu Jan 31 10:39:39 2008 +0000
@@ -96,7 +96,9 @@
 void
 SegmenterPlugin::reset()
 {
-    //!!!
+    // re-make segmenter only if it has already been made; otherwise
+    // there's nothing to reset
+    if (segmenter) makeSegmenter();
 }
 
 size_t
diff -r 4fb1c0a24178 -r ee9d180a5ad6 plugins/SimilarityPlugin.cpp
--- a/plugins/SimilarityPlugin.cpp	Thu Jan 31 10:33:35 2008 +0000
+++ b/plugins/SimilarityPlugin.cpp	Thu Jan 31 10:39:39 2008 +0000
@@ -237,7 +237,14 @@
 void
 SimilarityPlugin::reset()
 {
-    //!!!
+    for (int i = 0; i < m_values.size(); ++i) {
+        m_values[i].clear();
+    }
+
+    for (int i = 0; i < m_rhythmValues.size(); ++i) {
+        m_rhythmValues[i].clear();
+    }
+
     m_done = false;
 }
 
diff -r 4fb1c0a24178 -r ee9d180a5ad6 qm-vamp-plugins.pro
--- a/qm-vamp-plugins.pro	Thu Jan 31 10:33:35 2008 +0000
+++ b/qm-vamp-plugins.pro	Thu Jan 31 10:39:39 2008 +0000
@@ -4,7 +4,7 @@
 CONFIG += plugin warn_on debug
 CONFIG -= qt
 
-linux-g++:QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -O3 -march=pentium4 -msse -msse2
+linux-g++:QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -O3 -march=pentium3 -msse 
 
 OBJECTS_DIR = tmp_obj
 MOC_DIR = tmp_moc
@@ -12,7 +12,7 @@
 INCLUDEPATH += ../vamp-plugin-sdk ../qm-dsp
 LIBPATH += ../vamp-plugin-sdk/vamp-sdk ../qm-dsp
 
-linux-g++:LIBS += -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/atlas/sse -llapack -lblas -lg2c -Wl,-Bdynamic
+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
 
 DEPENDPATH += plugins