diff transform/FeatureExtractionPluginTransform.cpp @ 118:b4110b17bca8

* Fix #1672407 confused by plugin-named files in cwd (or home?) * Fix #1491848 crash when loading new file while transform plugin runs * Fix #1502287 Background remains black after spectrogram layer deleted * Fix #1604477 Replacing the main audio file silences secondary audio file * Fix failure to initialise property box layout to last preference on startup * Fix resample/wrong-rate display in Pane, ensure that right rate is chosen if all current models have an acceptable rate even if previous main model had a different one * Fix "global zoom" broken in previous commit * Some fixes to spectrogram cache area updating (makes spectrogram appear more quickly, previously it had a tendency to refresh with empty space) * Fixes to colour 3d plot normalization
author Chris Cannam
date Thu, 08 Mar 2007 16:53:08 +0000
parents dd11619b73ba
children 7a5ba9dadbf7
line wrap: on
line diff
--- a/transform/FeatureExtractionPluginTransform.cpp	Wed Mar 07 18:00:49 2007 +0000
+++ b/transform/FeatureExtractionPluginTransform.cpp	Thu Mar 08 16:53:08 2007 +0000
@@ -279,7 +279,7 @@
 
     long prevCompletion = 0;
 
-    while (1) {
+    while (!m_abandoned) {
 
         if (frequencyDomain) {
             if (blockFrame - int(m_context.blockSize)/2 > endFrame) break;
@@ -326,6 +326,8 @@
 	blockFrame += m_context.stepSize;
     }
 
+    if (m_abandoned) return;
+
     Vamp::Plugin::FeatureSet features = m_plugin->getRemainingFeatures();
 
     for (size_t fi = 0; fi < features[m_outputFeatureNo].size(); ++fi) {