comparison transform/RealTimeEffectModelTransformer.cpp @ 1134:f8604a7c4660 3.0-integration

Merge from branch "tony-2.0-integration"
author Chris Cannam
date Wed, 14 Oct 2015 10:12:14 +0100
parents e994747fb9dd
children 48e9f538e6e9
comparison
equal deleted inserted replaced
1132:0cb263a2f52c 1134:f8604a7c4660
280 } 280 }
281 } 281 }
282 } 282 }
283 283
284 if (blockFrame == contextStart || completion > prevCompletion) { 284 if (blockFrame == contextStart || completion > prevCompletion) {
285 // This setCompletion is probably misusing the completion
286 // terminology, just as it was for WritableWaveFileModel
285 if (stvm) stvm->setCompletion(completion); 287 if (stvm) stvm->setCompletion(completion);
286 if (wwfm) wwfm->setCompletion(completion); 288 if (wwfm) wwfm->setWriteProportion(completion);
287 prevCompletion = completion; 289 prevCompletion = completion;
288 } 290 }
289 291
290 blockFrame += blockSize; 292 blockFrame += blockSize;
291 } 293 }
292 294
293 if (m_abandoned) return; 295 if (m_abandoned) return;
294 296
295 if (stvm) stvm->setCompletion(100); 297 if (stvm) stvm->setCompletion(100);
296 if (wwfm) wwfm->setCompletion(100); 298 if (wwfm) wwfm->writeComplete();
297 } 299 }
298 300