changeset 267:c452d8a7b770 sv1-v1.3 sv1-v1.3rc1

* Updates for 1.3

--- a/main/MainWindow.cpp	Mon Jul 07 16:49:53 2008 +0000
+++ b/main/MainWindow.cpp	Thu Jul 10 12:50:56 2008 +0000
@@ -3119,7 +3119,7 @@
     float percent = m_playSpeed->mappedValue();
     float factor = mapper.getFactorForValue(percent);
 
-    std::cerr << "speed = " << position << " percent = " << percent << " factor = " << factor << std::endl;
+//    std::cerr << "speed = " << position << " percent = " << percent << " factor = " << factor << std::endl;
 
     bool something = (position != 100);
 
@@ -3503,7 +3503,7 @@
 void
 MainWindow::help()
 {
-    openHelpUrl(tr("http://www.sonicvisualiser.org/doc/reference/1.2/en/"));
+    openHelpUrl(tr("http://www.sonicvisualiser.org/doc/reference/1.3/en/"));
 }
 
 void
@@ -3596,6 +3596,13 @@
     aboutText += tr("<br>With FFTW3 &copy; Matteo Frigo and MIT");
 #endif
 #endif
+#ifdef HAVE_RUBBERBAND
+#ifdef RUBBERBAND_VERSION
+    aboutText += tr("<br>With Rubber Band (v%1) &copy; Chris Cannam").arg(RUBBERBAND_VERSION);
+#else
+    aboutText += tr("<br>With Rubber Band &copy; Chris Cannam");
+#endif
+#endif
 #ifdef HAVE_VAMP
     aboutText += tr("<br>With Vamp plugin support (API v%1, host SDK v%2) &copy; Chris Cannam").arg(VAMP_API_VERSION).arg(VAMP_SDK_VERSION);
 #endif

--- a/main/main.cpp	Mon Jul 07 16:49:53 2008 +0000
+++ b/main/main.cpp	Thu Jul 10 12:50:56 2008 +0000
@@ -370,6 +370,12 @@
     if (wisdom != "") {
         fftwf_import_wisdom_from_string(wisdom.toLocal8Bit().data());
     }
+#ifdef HAVE_FFTW3
+    wisdom = settings.value("wisdom_d").toString();
+    if (wisdom != "") {
+        fftw_import_wisdom_from_string(wisdom.toLocal8Bit().data());
+    }
+#endif
     settings.endGroup();
 #endif
 
@@ -382,7 +388,6 @@
     }
 */
     int rv = application.exec();
-    std::cerr << "application.exec() returned " << rv << std::endl;
 
     cleanupMutex.lock();
     TempDirectory::getInstance()->cleanup();
@@ -390,13 +395,20 @@
     application.releaseMainWindow();
 
 #ifdef HAVE_FFTW3F
+    settings.beginGroup("FFTWisdom");
     char *cwisdom = fftwf_export_wisdom_to_string();
     if (cwisdom) {
-        settings.beginGroup("FFTWisdom");
         settings.setValue("wisdom", cwisdom);
-        settings.endGroup();
         fftwf_free(cwisdom);
     }
+#ifdef HAVE_FFTW3
+    cwisdom = fftw_export_wisdom_to_string();
+    if (cwisdom) {
+        settings.setValue("wisdom_d", cwisdom);
+        fftw_free(cwisdom);
+    }
+#endif
+    settings.endGroup();
 #endif
 
     delete gui;