Merge branch 'master' into fix-build

This commit is contained in:
Charles J. Cliffe
2023-03-29 01:50:22 -04:00
committed by GitHub
26 changed files with 7638 additions and 6717 deletions
+1 -1
View File
@@ -225,7 +225,7 @@ CubicSDR::CubicSDR() : frequency(0), offset(0), ppm(0), snap(1), sampleRate(DEFA
m_glContextAttributes = new wxGLContextAttrs();
wxGLContextAttrs glSettings;
glSettings.PlatformDefaults().EndList();
glSettings.CompatibilityProfile().EndList();
*m_glContextAttributes = glSettings;
}
+1 -1
View File
@@ -352,7 +352,7 @@ void SpectrumVisualProcessor::process() {
}
if (!resampler || resampleBw != lastBandwidth || lastInputBandwidth != iqData->sampleRate) {
float As = 480.0;
float As = 60.0;
if (resampler) {
msresamp_crcf_destroy(resampler);