otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "spectrum: store own channel count"

Browse source 
This reverts commit 6f501a91b2.
This commit is contained in:
Eknous-P 2025-11-05 12:34:48 +04:00
parent 6f501a91b2
commit 14f8273e13
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/gui/gui.h
View file

@ -2770,7 +2770,7 @@ class FurnaceGUI {
fftw_complex* tunerFFTOutBuf;
fftw_plan tunerPlan;
struct SpectrumSettings {
int bins, chans;
int bins;
float xZoom, xOffset;
float yOffset;
fftw_plan plan[DIV_MAX_OUTPUTS];
@ -2782,7 +2782,6 @@ class FurnaceGUI {
bool showXGrid, showYGrid, showXScale, showYScale;
SpectrumSettings():
bins(4096),
chans(0),
xZoom(1.0f),
xOffset(0.0f),
yOffset(0.0f),

10
src/gui/spectrum.cpp
View file

@ -110,10 +110,10 @@ void FurnaceGUI::drawSpectrum() {
prevPos=pos;
}
}
int chans=e->getAudioDescGot().outChans;
if (spectrum.update) {
spectrum.update=false;
spectrum.running=true;
spectrum.chans=e->getAudioDescGot().outChans; // save our own channel count in case it changes at around line 157
for (int i=0; i<DIV_MAX_OUTPUTS; i++) {
if (spectrum.buffer[i]) {
fftw_free(spectrum.buffer[i]);
@ -132,7 +132,7 @@ void FurnaceGUI::drawSpectrum() {
spectrum.plot[i]=NULL;
}
}
for (int i=0; i<(spectrum.mono?1:spectrum.chans); i++) {
for (int i=0; i<(spectrum.mono?1:chans); i++) {
spectrum.buffer[i]=(fftw_complex*)fftw_malloc(sizeof(fftw_complex)*spectrum.bins);
if (!spectrum.buffer[i]) spectrum.running=false;
spectrum.in[i]=new double[spectrum.bins];
@ -156,7 +156,7 @@ void FurnaceGUI::drawSpectrum() {
if (spectrum.running) logV("spectrum ready!");
}
if (spectrum.running) {
for (int z=spectrum.mono?0:(spectrum.chans-1); z>=0; z--) {
for (int z=spectrum.mono?0:(chans-1); z>=0; z--) {
// get buffer
memset(spectrum.in[z],0,sizeof(double)*spectrum.bins);
int needle=e->oscReadPos-spectrum.bins;
@ -165,10 +165,10 @@ void FurnaceGUI::drawSpectrum() {
int pos=(needle+j)&0x7fff;
double sample=0.0;
if (spectrum.mono) {
for (int i=0; i<spectrum.chans; i++) {
for (int i=0; i<chans; i++) {
sample+=e->oscBuf[i][pos];
}
sample/=spectrum.chans;
sample/=chans;
} else {
sample+=e->oscBuf[z][pos];
}