comparison 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
comparison
equal deleted inserted replaced
117:8089a394829a 118:b4110b17bca8
277 long endFrame = m_input->getEndFrame(); 277 long endFrame = m_input->getEndFrame();
278 long blockFrame = startFrame; 278 long blockFrame = startFrame;
279 279
280 long prevCompletion = 0; 280 long prevCompletion = 0;
281 281
282 while (1) { 282 while (!m_abandoned) {
283 283
284 if (frequencyDomain) { 284 if (frequencyDomain) {
285 if (blockFrame - int(m_context.blockSize)/2 > endFrame) break; 285 if (blockFrame - int(m_context.blockSize)/2 > endFrame) break;
286 } else { 286 } else {
287 if (blockFrame >= endFrame) break; 287 if (blockFrame >= endFrame) break;
324 } 324 }
325 325
326 blockFrame += m_context.stepSize; 326 blockFrame += m_context.stepSize;
327 } 327 }
328 328
329 if (m_abandoned) return;
330
329 Vamp::Plugin::FeatureSet features = m_plugin->getRemainingFeatures(); 331 Vamp::Plugin::FeatureSet features = m_plugin->getRemainingFeatures();
330 332
331 for (size_t fi = 0; fi < features[m_outputFeatureNo].size(); ++fi) { 333 for (size_t fi = 0; fi < features[m_outputFeatureNo].size(); ++fi) {
332 Vamp::Plugin::Feature feature = 334 Vamp::Plugin::Feature feature =
333 features[m_outputFeatureNo][fi]; 335 features[m_outputFeatureNo][fi];