# HG changeset patch
# User Chris Cannam
# Date 1215694256 0
# Node ID c452d8a7b770c4802637d5a3c8372a5351b76f5f
# Parent 52ef51ba9a74113841f56908574cd5802e3d338a
* Updates for 1.3
diff -r 52ef51ba9a74 -r c452d8a7b770 main/MainWindow.cpp
--- 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("
With FFTW3 © Matteo Frigo and MIT");
#endif
#endif
+#ifdef HAVE_RUBBERBAND
+#ifdef RUBBERBAND_VERSION
+ aboutText += tr("
With Rubber Band (v%1) © Chris Cannam").arg(RUBBERBAND_VERSION);
+#else
+ aboutText += tr("
With Rubber Band © Chris Cannam");
+#endif
+#endif
#ifdef HAVE_VAMP
aboutText += tr("
With Vamp plugin support (API v%1, host SDK v%2) © Chris Cannam").arg(VAMP_API_VERSION).arg(VAMP_SDK_VERSION);
#endif
diff -r 52ef51ba9a74 -r c452d8a7b770 main/main.cpp
--- 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;