# HG changeset patch # User Chris Cannam # Date 1405610574 -3600 # Node ID 6d2ece0fe35637968428395746cdac60f7d687e5 # Parent cd42620e3f4024f6d9e25f7b90f08e350b1fdaa0 Small fixes: avoid static etc diff -r cd42620e3f40 -r 6d2ece0fe356 data/model/WaveFileModel.cpp --- a/data/model/WaveFileModel.cpp Thu Jul 17 14:50:31 2014 +0100 +++ b/data/model/WaveFileModel.cpp Thu Jul 17 16:22:54 2014 +0100 @@ -197,7 +197,9 @@ if (start >= m_startFrame) { start -= m_startFrame; } else { - for (int i = 0; i < count; ++i) buffer[i] = 0.f; + for (int i = 0; i < count; ++i) { + buffer[i] = 0.f; + } if (count <= m_startFrame - start) { return 0; } else { diff -r cd42620e3f40 -r 6d2ece0fe356 data/model/WaveFileModel.h --- a/data/model/WaveFileModel.h Thu Jul 17 14:50:31 2014 +0100 +++ b/data/model/WaveFileModel.h Thu Jul 17 16:22:54 2014 +0100 @@ -63,14 +63,14 @@ void setStartFrame(int startFrame) { m_startFrame = startFrame; } virtual int getData(int channel, int start, int count, - float *buffer) const; + float *buffer) const; virtual int getData(int channel, int start, int count, - double *buffer) const; + double *buffer) const; virtual int getData(int fromchannel, int tochannel, - int start, int count, - float **buffers) const; + int start, int count, + float **buffers) const; virtual int getSummaryBlockSize(int desired) const;