From f08e80e15613697ab8c89eed608dd0d2a1fc7c2e Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Sun, 5 Aug 2018 15:07:12 -0700 Subject: [PATCH] Application: Fix uninitalized fmt_pcm_t field warning --- firmware/application/io_wave.hpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/firmware/application/io_wave.hpp b/firmware/application/io_wave.hpp index 13b3a432f..cca22fe1b 100644 --- a/firmware/application/io_wave.hpp +++ b/firmware/application/io_wave.hpp @@ -32,20 +32,26 @@ struct fmt_pcm_t { constexpr fmt_pcm_t( const uint32_t sampling_rate - ) : nSamplesPerSec { sampling_rate }, - nAvgBytesPerSec { nSamplesPerSec * nBlockAlign } + ) : ckID { 'f', 'm', 't', ' ' }, + cksize { 16 }, + wFormatTag { 0x0001 }, + nChannels { 1 }, + nSamplesPerSec { sampling_rate }, + nAvgBytesPerSec { sampling_rate * 2 }, + nBlockAlign { 2 }, + wBitsPerSample { 16 } { } private: - uint8_t ckID[4] { 'f', 'm', 't', ' ' }; - uint32_t cksize { 16 }; - uint16_t wFormatTag { 0x0001 }; - uint16_t nChannels { 1 }; + uint8_t ckID[4]; + uint32_t cksize; + uint16_t wFormatTag; + uint16_t nChannels; uint32_t nSamplesPerSec; uint32_t nAvgBytesPerSec; - uint16_t nBlockAlign { 2 }; - uint16_t wBitsPerSample { 16 }; + uint16_t nBlockAlign; + uint16_t wBitsPerSample; }; struct data_t {