Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-02-23 16:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move BasebandProcessor message.push() from dedicated methods to existing lambdas.

Browse Source
This commit is contained in:
Jared Boone 2015-12-10 12:04:43 -08:00
parent 98abc4bba8
commit 14f24d8584
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/baseband/baseband_processor.cpp
View File

@ -62,8 +62,10 @@ void BasebandProcessor::update_spectrum() {
void BasebandProcessor::feed_channel_stats(const buffer_c16_t& channel) { void BasebandProcessor::feed_channel_stats(const buffer_c16_t& channel) {
channel_stats.feed( channel_stats.feed(
channel, channel,
[this](const ChannelStatistics statistics) { [](const ChannelStatistics statistics) {
this->post_channel_stats_message(statistics); ChannelStatisticsMessage channel_stats_message;
channel_stats_message.statistics = statistics;
shared_memory.application_queue.push(channel_stats_message);
} }
); );
} }
@ -93,12 +95,6 @@ void BasebandProcessor::fill_audio_buffer(const buffer_s16_t& audio) {
feed_audio_stats(audio); feed_audio_stats(audio);
} }
void BasebandProcessor::post_channel_stats_message(const ChannelStatistics& statistics) {
ChannelStatisticsMessage channel_stats_message;
channel_stats_message.statistics = statistics;
shared_memory.application_queue.push(channel_stats_message);
}
void BasebandProcessor::post_channel_spectrum_message(const buffer_c16_t& data) { void BasebandProcessor::post_channel_spectrum_message(const buffer_c16_t& data) {
if( !channel_spectrum_request_update ) { if( !channel_spectrum_request_update ) {
fft_swap(data, channel_spectrum); fft_swap(data, channel_spectrum);
@ -112,13 +108,9 @@ void BasebandProcessor::feed_audio_stats(const buffer_s16_t& audio) {
audio_stats.feed( audio_stats.feed(
audio, audio,
[this](const AudioStatistics statistics) { [this](const AudioStatistics statistics) {
this->post_audio_stats_message(statistics);
}
);
}
void BasebandProcessor::post_audio_stats_message(const AudioStatistics& statistics) {
AudioStatisticsMessage audio_stats_message; AudioStatisticsMessage audio_stats_message;
audio_stats_message.statistics = statistics; audio_stats_message.statistics = statistics;
shared_memory.application_queue.push(audio_stats_message); shared_memory.application_queue.push(audio_stats_message);
} }
);
}

2
firmware/baseband/baseband_processor.hpp
View File

@ -64,10 +64,8 @@ private:
ChannelStatsCollector channel_stats; ChannelStatsCollector channel_stats;
AudioStatsCollector audio_stats; AudioStatsCollector audio_stats;
void post_channel_stats_message(const ChannelStatistics& statistics);
void post_channel_spectrum_message(const buffer_c16_t& data); void post_channel_spectrum_message(const buffer_c16_t& data);
void feed_audio_stats(const buffer_s16_t& audio); void feed_audio_stats(const buffer_s16_t& audio);
void post_audio_stats_message(const AudioStatistics& statistics);
}; };
#endif/*__BASEBAND_PROCESSOR_H__*/ #endif/*__BASEBAND_PROCESSOR_H__*/