comparison data/model/WaveFileModel.cpp @ 841:226733f3cf3f tonioni

Merge from default branch
author Chris Cannam
date Fri, 22 Nov 2013 10:37:28 +0000
parents 33fca917c800
children e802e550a1f2
comparison
equal deleted inserted replaced
829:f63051833723 841:226733f3cf3f
461 461
462 float sample = m_directRead[index]; 462 float sample = m_directRead[index];
463 if (sample > max || got == 0) max = sample; 463 if (sample > max || got == 0) max = sample;
464 if (sample < min || got == 0) min = sample; 464 if (sample < min || got == 0) min = sample;
465 total += fabsf(sample); 465 total += fabsf(sample);
466 466
467 ++i; 467 ++i;
468 ++got; 468 ++got;
469 469
470 if (got == blockSize) { 470 if (got == blockSize) {
471 ranges.push_back(Range(min, max, total / got)); 471 ranges.push_back(Range(min, max, total / got));