[Sv1-commits] SF.net SVN: sv1:[1310] runner/trunk

[<ca...@us...>]

Revision: 1310
          http://sv1.svn.sourceforge.net/sv1/?rev=1310&view=rev
Author:   cannam
Date:     2008-11-26 13:54:40 +0000 (Wed, 26 Nov 2008)

Log Message:
-----------

* Save/restore fftw wisdom if appropriate

Modified Paths:
--------------
    runner/trunk/main.cpp
    runner/trunk/runner.pro

Modified: runner/trunk/main.cpp
===================================================================
--- runner/trunk/main.cpp	2008-11-26 13:53:55 UTC (rev 1309)
+++ runner/trunk/main.cpp	2008-11-26 13:54:40 UTC (rev 1310)
@@ -44,6 +44,10 @@
 
 #include <vamp-hostsdk/PluginSummarisingAdapter.h>
 
+#ifdef HAVE_FFTW3
+#include <fftw3.h>
+#endif
+
 // Desired options:
 //
 // * output preference:
@@ -537,6 +541,15 @@
         }
     }
 
+#ifdef HAVE_FFTW3
+    settings.beginGroup("FFTWisdom");
+    QString wisdom = settings.value("wisdom").toString();
+    if (wisdom != "") {
+        fftw_import_wisdom_from_string(wisdom.toLocal8Bit().data());
+    }
+    settings.endGroup();
+#endif
+
     FeatureExtractionManager manager;
 
     if (!requestedSummaryTypes.empty()) {
@@ -696,6 +709,16 @@
     
     for (int i = 0; i < writers.size(); ++i) delete writers[i];
 
+#ifdef HAVE_FFTW3
+    settings.beginGroup("FFTWisdom");
+    char *cwisdom = fftw_export_wisdom_to_string();
+    if (cwisdom) {
+        settings.setValue("wisdom", cwisdom);
+        fftw_free(cwisdom);
+    }
+    settings.endGroup();
+#endif
+
     TempDirectory::getInstance()->cleanup();
     
     return 0;

Modified: runner/trunk/runner.pro
===================================================================
--- runner/trunk/runner.pro	2008-11-26 13:53:55 UTC (rev 1309)
+++ runner/trunk/runner.pro	2008-11-26 13:54:40 UTC (rev 1310)
@@ -3,8 +3,8 @@
 
 SV_UNIT_PACKAGES = vamp vamp-hostsdk samplerate mad id3tag oggz fishsound sndfile lrdf redland rasqal raptor
 
-linux-g++:LIBS += -Wl,-Bstatic
-linux-g++:DEFINES += BUILD_STATIC
+#linux-g++:LIBS += -Wl,-Bstatic
+#linux-g++:DEFINES += BUILD_STATIC
 
 load(../sonic-visualiser/sv.prf)
 
@@ -20,6 +20,12 @@
 # look for win32 features
 win32-x-g++:QMAKE_LFLAGS += -Wl,-subsystem,console
 
+# If you have compiled your Vamp plugin SDK with FFTW (using its
+# HAVE_FFTW3 flag), you can define the same flag here to ensure the
+# program saves and restores FFTW wisdom in its configuration properly
+#
+#DEFINES += HAVE_FFTW3
+
 TARGET = sonic-annotator
 
 DEPENDPATH += . ../sonic-visualiser i18n main


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.