Mercurial > hg > svapp
diff audio/ClipMixer.cpp @ 595:b23bebfdfaba
Untabify
author | Chris Cannam |
---|---|
date | Thu, 01 Mar 2018 18:02:22 +0000 |
parents | 56acd9368532 |
children | c99892f0c5c3 |
line wrap: on
line diff
--- a/audio/ClipMixer.cpp Tue Mar 07 11:48:29 2017 +0000 +++ b/audio/ClipMixer.cpp Thu Mar 01 18:02:22 2018 +0000 @@ -60,9 +60,9 @@ info.format = 0; file = sf_open(path.toLocal8Bit().data(), SFM_READ, &info); if (!file) { - cerr << "ClipMixer::loadClipData: Failed to open file path \"" + cerr << "ClipMixer::loadClipData: Failed to open file path \"" << path << "\": " << sf_strerror(file) << endl; - return false; + return false; } tmpFrames = (float *)malloc(info.frames * info.channels * sizeof(float)); @@ -77,16 +77,16 @@ m_clipData = (float *)malloc(info.frames * sizeof(float)); if (!m_clipData) { cerr << "ClipMixer::loadClipData: malloc(" << info.frames * sizeof(float) << ") failed" << endl; - free(tmpFrames); - return false; + free(tmpFrames); + return false; } for (i = 0; i < info.frames; ++i) { - int j; - m_clipData[i] = 0.0f; - for (j = 0; j < info.channels; ++j) { - m_clipData[i] += tmpFrames[i * info.channels + j] * float(level); - } + int j; + m_clipData[i] = 0.0f; + for (j = 0; j < info.channels; ++j) { + m_clipData[i] += tmpFrames[i * info.channels + j] * float(level); + } } free(tmpFrames);