Mercurial > hg > sonic-visualiser
changeset 79:c1318aac18d2
* Fix apparent (but not actual) failure to save session file
* Fix doofusness in FFT model (N/2 vs N/2+1) -- need to review use of
this model in spectrogram
| author | Chris Cannam |
|---|---|
| date | Fri, 08 Dec 2006 18:17:29 +0000 |
| parents | 9918c8a3f904 |
| children | f4f52566e451 |
| files | main/MainWindow.cpp main/main.cpp osc/demoscript.sh transform/FeatureExtractionPluginTransform.cpp |
| diffstat | 4 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/main/MainWindow.cpp Fri Nov 24 16:56:15 2006 +0000 +++ b/main/MainWindow.cpp Fri Dec 08 18:17:29 2006 +0000 @@ -2619,7 +2619,7 @@ if (!saveSessionFile(path)) { QMessageBox::critical(this, tr("Failed to save file"), - tr("Session file \"%1\" could not be saved.").arg(m_sessionFile)); + tr("Session file \"%1\" could not be saved.").arg(path)); } else { setWindowTitle(tr("Sonic Visualiser: %1") .arg(QFileInfo(path).fileName()));
--- a/main/main.cpp Fri Nov 24 16:56:15 2006 +0000 +++ b/main/main.cpp Fri Dec 08 18:17:29 2006 +0000 @@ -34,9 +34,6 @@ #include <iostream> #include <signal.h> -//!!! catch trappable signals, cleanup temporary directory etc -//!!! check for crap left over from previous run - static QMutex cleanupMutex; static void
--- a/osc/demoscript.sh Fri Nov 24 16:56:15 2006 +0000 +++ b/osc/demoscript.sh Fri Dec 08 18:17:29 2006 +0000 @@ -509,6 +509,7 @@ sv-command resize 1000 500 show_stuff +sleep 5 sleep 20 playback_bits
--- a/transform/FeatureExtractionPluginTransform.cpp Fri Nov 24 16:56:15 2006 +0000 +++ b/transform/FeatureExtractionPluginTransform.cpp Fri Dec 08 18:17:29 2006 +0000 @@ -31,8 +31,6 @@ #include <QMessageBox> -#include <fftw3.h> - #include <iostream> FeatureExtractionPluginTransform::FeatureExtractionPluginTransform(Model *inputModel, @@ -244,7 +242,7 @@ float **buffers = new float*[channelCount]; for (size_t ch = 0; ch < channelCount; ++ch) { - buffers[ch] = new float[m_context.blockSize]; + buffers[ch] = new float[m_context.blockSize + 2]; } bool frequencyDomain = (m_plugin->getInputDomain() == @@ -301,7 +299,7 @@ for (size_t ch = 0; ch < channelCount; ++ch) { if (frequencyDomain) { int column = (blockFrame - startFrame) / m_context.stepSize; - for (size_t i = 0; i < m_context.blockSize/2; ++i) { + for (size_t i = 0; i <= m_context.blockSize/2; ++i) { fftModels[ch]->getValuesAt (column, i, buffers[ch][i*2], buffers[ch][i*2+1]); }