hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Change fpp_t usage in SampleFrame to use size_t instead (#7362)

Browse Source
This commit is contained in:
saker
2024-07-02 12:02:34 -04:00
committed by GitHub
parent 449e669067
commit 538572a3c5
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/SampleFrame.h
View File

@@ -29,6 +29,7 @@
#include "lmms_basics.h"
#include <array>
#include <cstddef>
namespace lmms
@@ -186,7 +187,7 @@ private:
std::array<sample_t, DEFAULT_CHANNELS> m_samples;
};
inline void zeroSampleFrames(SampleFrame* buffer, fpp_t frames)
inline void zeroSampleFrames(SampleFrame* buffer, size_t frames)
{
// The equivalent of the following operation which yields compiler warnings
// memset(buffer, 0, sizeof(SampleFrame) * frames);
@@ -194,7 +195,7 @@ inline void zeroSampleFrames(SampleFrame* buffer, fpp_t frames)
std::fill(buffer, buffer + frames, SampleFrame());
}
inline SampleFrame getAbsPeakValues(SampleFrame* buffer, fpp_t frames)
inline SampleFrame getAbsPeakValues(SampleFrame* buffer, size_t frames)
{
SampleFrame peaks;
@@ -206,18 +207,18 @@ inline SampleFrame getAbsPeakValues(SampleFrame* buffer, fpp_t frames)
return peaks;
}
inline void copyToSampleFrames(SampleFrame* target, const float* source, fpp_t frames)
inline void copyToSampleFrames(SampleFrame* target, const float* source, size_t frames)
{
for (fpp_t i = 0; i < frames; ++i)
for (size_t i = 0; i < frames; ++i)
{
target[i].setLeft(source[2*i]);
target[i].setRight(source[2*i + 1]);
}
}
inline void copyFromSampleFrames(float* target, const SampleFrame* source, fpp_t frames)
inline void copyFromSampleFrames(float* target, const SampleFrame* source, size_t frames)
{
for (fpp_t i = 0; i < frames; ++i)
for (size_t i = 0; i < frames; ++i)
{
target[2*i] = source[i].left();
target[2*i + 1] = source[i].right();