TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-15 00:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move AudioOutput back to inside audio processor classes.

Browse Source 
Was wasting precious RAM making it static. I lose 400 bytes of .text, not sure why, but I think the trade is worth it.
This commit is contained in:
Jared Boone
2016-01-16 13:56:23 -08:00
parent 1d0de2240d
commit 58e6d26910
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/baseband/audio_output.cpp
View File

@@ -98,5 +98,3 @@ void AudioOutput::feed_audio_stats(const buffer_f32_t& audio) {
} }
); );
} }
AudioOutput audio_output;

2
firmware/baseband/audio_output.hpp
View File

@@ -55,6 +55,4 @@ private:
void feed_audio_stats(const buffer_f32_t& audio); void feed_audio_stats(const buffer_f32_t& audio);
}; };
extern AudioOutput audio_output;
#endif/*__AUDIO_OUTPUT_H__*/ #endif/*__AUDIO_OUTPUT_H__*/

3
firmware/baseband/proc_am_audio.hpp
View File

@@ -27,6 +27,7 @@
#include "dsp_decimate.hpp" #include "dsp_decimate.hpp"
#include "dsp_demodulate.hpp" #include "dsp_demodulate.hpp"
#include "audio_output.hpp"
#include "spectrum_collector.hpp" #include "spectrum_collector.hpp"
#include <cstdint> #include <cstdint>
@@ -56,6 +57,8 @@ private:
dsp::demodulate::AM demod; dsp::demodulate::AM demod;
AudioOutput audio_output;
SpectrumCollector channel_spectrum; SpectrumCollector channel_spectrum;
bool configured { false }; bool configured { false };

3
firmware/baseband/proc_nfm_audio.hpp
View File

@@ -27,6 +27,7 @@
#include "dsp_decimate.hpp" #include "dsp_decimate.hpp"
#include "dsp_demodulate.hpp" #include "dsp_demodulate.hpp"
#include "audio_output.hpp"
#include "spectrum_collector.hpp" #include "spectrum_collector.hpp"
class NarrowbandFMAudio : public BasebandProcessor { class NarrowbandFMAudio : public BasebandProcessor {
@@ -55,6 +56,8 @@ private:
dsp::demodulate::FM demod; dsp::demodulate::FM demod;
AudioOutput audio_output;
SpectrumCollector channel_spectrum; SpectrumCollector channel_spectrum;
bool configured { false }; bool configured { false };

3
firmware/baseband/proc_wfm_audio.hpp
View File

@@ -27,6 +27,7 @@
#include "dsp_decimate.hpp" #include "dsp_decimate.hpp"
#include "dsp_demodulate.hpp" #include "dsp_demodulate.hpp"
#include "audio_output.hpp"
#include "spectrum_collector.hpp" #include "spectrum_collector.hpp"
class WidebandFMAudio : public BasebandProcessor { class WidebandFMAudio : public BasebandProcessor {
@@ -56,6 +57,8 @@ private:
dsp::decimate::DecimateBy2CIC4Real audio_dec_2; dsp::decimate::DecimateBy2CIC4Real audio_dec_2;
dsp::decimate::FIR64AndDecimateBy2Real audio_filter; dsp::decimate::FIR64AndDecimateBy2Real audio_filter;
AudioOutput audio_output;
SpectrumCollector channel_spectrum; SpectrumCollector channel_spectrum;
size_t spectrum_interval_samples = 0; size_t spectrum_interval_samples = 0;
size_t spectrum_samples = 0; size_t spectrum_samples = 0;