oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mathbase: use size_t for sample counts instead of int

Browse Source
This commit is contained in:
itsmattkc
2022-09-16 00:00:39 -07:00
parent 3cb9caa35d
commit 22b618da96
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/math/math/mathbase.cpp
+4 -4
View File
@@ -301,21 +301,21 @@ void MathNodeBase::ValueInternal(Operation operation, Pairing pairing, const QSt
SampleBuffer samples_a = val_a.toSamples(); SampleBuffer samples_a = val_a.toSamples();
SampleBuffer samples_b = val_b.toSamples(); SampleBuffer samples_b = val_b.toSamples();
int max_samples = qMax(samples_a.sample_count(), samples_b.sample_count()); size_t max_samples = qMax(samples_a.sample_count(), samples_b.sample_count());
int min_samples = qMin(samples_a.sample_count(), samples_b.sample_count()); size_t min_samples = qMin(samples_a.sample_count(), samples_b.sample_count());
SampleBuffer mixed_samples = SampleBuffer(samples_a.audio_params(), max_samples); SampleBuffer mixed_samples = SampleBuffer(samples_a.audio_params(), max_samples);
for (int i=0;i<mixed_samples.audio_params().channel_count();i++) { for (int i=0;i<mixed_samples.audio_params().channel_count();i++) {
// Mix samples that are in both buffers // Mix samples that are in both buffers
for (int j=0;j<min_samples;j++) { for (size_t j=0;j<min_samples;j++) {
mixed_samples.data(i)[j] = PerformAll<float, float>(operation, samples_a.data(i)[j], samples_b.data(i)[j]); mixed_samples.data(i)[j] = PerformAll<float, float>(operation, samples_a.data(i)[j], samples_b.data(i)[j]);
} }
} }
if (max_samples > min_samples) { if (max_samples > min_samples) {
// Fill in remainder space with 0s // Fill in remainder space with 0s
int remainder = max_samples - min_samples; size_t remainder = max_samples - min_samples;
const SampleBuffer &larger_buffer = (max_samples == samples_a.sample_count()) ? samples_a : samples_b; const SampleBuffer &larger_buffer = (max_samples == samples_a.sample_count()) ? samples_a : samples_b;