Skip to content

Commit 69ce5fa

Browse files
committed
Update buffer size when changing frequency range
1 parent 5323b70 commit 69ce5fa

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

Source/SpectrumViewer.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,11 @@ void SpectrumViewer::setFrequencyRange(Range<int> newRange)
125125
tfrParams.freqStep = 1.0 / float(tfrParams.winLen * tfrParams.interpRatio);
126126
tfrParams.nFreqs = int((tfrParams.freqEnd - tfrParams.freqStart) / tfrParams.freqStep);
127127

128+
int bufferSize = int(tfrParams.Fs * tfrParams.winLen);
129+
128130
for (int i = 0; i < MAX_CHANS; i++)
129131
{
132+
powerBuffers[i].setBufferSize(bufferSize, tfrParams.stepLen * tfrParams.Fs);
130133
powerBuffers[i].setNumFreqs(tfrParams.nFreqs);
131134
}
132135

Source/SpectrumViewer.h

+10-13
Original file line numberDiff line numberDiff line change
@@ -221,23 +221,20 @@ class SpectrumViewer :
221221
}
222222
}
223223

224-
if (numFreqsChanged)
225-
{
226-
power.clear();
224+
power.clear();
227225

228-
LOGD("Creating ", stepsPerBuffer + 5, " power buffers of length ", nFreqs);
226+
LOGD("Creating ", stepsPerBuffer + 5, " power buffers of length ", nFreqs);
229227

230-
for (int i = 0; i < stepsPerBuffer + 5; i++)
228+
for (int i = 0; i < stepsPerBuffer + 5; i++)
229+
{
230+
power.add(new AtomicallyShared<std::vector<float>>());
231+
power.getLast()->map([=](std::vector<float>& arr)
231232
{
232-
power.add(new AtomicallyShared<std::vector<float>>());
233-
power.getLast()->map([=](std::vector<float>& arr)
234-
{
235-
arr.resize(nFreqs);
236-
});
237-
}
238-
239-
numFreqsChanged = false;
233+
arr.resize(nFreqs);
234+
});
240235
}
236+
237+
numFreqsChanged = false;
241238
}
242239
};
243240

Source/SpectrumViewerEditor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ void SpectrumViewerEditor::comboBoxChanged(ComboBox* cb)
180180
{
181181
auto sp = stream->getParameter("Channels");
182182
ped->setParameter(sp);
183-
sp->setNextValue(sp->getValue());
183+
getProcessor()->parameterChangeRequest(sp);
184184
break;
185185
}
186186
}

0 commit comments

Comments
 (0)