From 6d3cdb9bbfe81b89b772678e44fa990d628e34d3 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Mon, 4 Jan 2016 11:45:33 -0800 Subject: [PATCH] Separate template/callback code from method code. ...for more small reductions in code size. --- firmware/baseband/audio_stats_collector.cpp | 10 ++++++++++ firmware/baseband/audio_stats_collector.hpp | 9 +++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/firmware/baseband/audio_stats_collector.cpp b/firmware/baseband/audio_stats_collector.cpp index a82e8f40e..c728ed355 100644 --- a/firmware/baseband/audio_stats_collector.cpp +++ b/firmware/baseband/audio_stats_collector.cpp @@ -58,3 +58,13 @@ bool AudioStatsCollector::update_stats(const size_t sample_count, const size_t s return false; } } + +bool AudioStatsCollector::feed(const buffer_s16_t& src) { + consume_audio_buffer(src); + + return update_stats(src.count, src.sampling_rate); +} + +bool AudioStatsCollector::mute(const size_t sample_count, const size_t sampling_rate) { + return update_stats(sample_count, sampling_rate); +} diff --git a/firmware/baseband/audio_stats_collector.hpp b/firmware/baseband/audio_stats_collector.hpp index 1193fd0d0..467bc3377 100644 --- a/firmware/baseband/audio_stats_collector.hpp +++ b/firmware/baseband/audio_stats_collector.hpp @@ -32,16 +32,14 @@ class AudioStatsCollector { public: template void feed(const buffer_s16_t& src, Callback callback) { - consume_audio_buffer(src); - - if( update_stats(src.count, src.sampling_rate) ) { + if( feed(src) ) { callback(statistics); } } template void mute(const size_t sample_count, const size_t sampling_rate, Callback callback) { - if( update_stats(sample_count, sampling_rate) ) { + if( mute(sample_count, sampling_rate) ) { callback(statistics); } } @@ -57,6 +55,9 @@ private: void consume_audio_buffer(const buffer_s16_t& src); bool update_stats(const size_t sample_count, const size_t sampling_rate); + + bool feed(const buffer_s16_t& src); + bool mute(const size_t sample_count, const size_t sampling_rate); }; #endif/*__AUDIO_STATS_COLLECTOR_H__*/