comparison data/model/WaveFileModel.cpp @ 949:5f7b509a441a tonioni

Merge from default branch
author Chris Cannam
date Fri, 18 Jul 2014 11:07:30 +0100
parents 6d2ece0fe356
children 9869ea3a93b7
comparison
equal deleted inserted replaced
943:178ffa964096 949:5f7b509a441a
195 #endif 195 #endif
196 196
197 if (start >= m_startFrame) { 197 if (start >= m_startFrame) {
198 start -= m_startFrame; 198 start -= m_startFrame;
199 } else { 199 } else {
200 for (int i = 0; i < count; ++i) buffer[i] = 0.f; 200 for (int i = 0; i < count; ++i) {
201 buffer[i] = 0.f;
202 }
201 if (count <= m_startFrame - start) { 203 if (count <= m_startFrame - start) {
202 return 0; 204 return 0;
203 } else { 205 } else {
204 count -= (m_startFrame - start); 206 count -= (m_startFrame - start);
205 start = 0; 207 start = 0;