Skip to content

Commit b38f3a7

Browse files
committed
compile warnings
1 parent 8efc951 commit b38f3a7

File tree

10 files changed

+19
-11
lines changed

10 files changed

+19
-11
lines changed

src/AudioAnalog/AnalogAudioESP32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class AnalogAudio : public AudioStream {
193193
adc_config = cfg;
194194
i2s_config_t i2s_config = {
195195
.mode = (i2s_mode_t) cfg.mode_internal,
196-
.sample_rate = (uint32_t)cfg.sample_rate,
196+
.sample_rate = (eps32_i2s_sample_rate_type)cfg.sample_rate,
197197
.bits_per_sample = (i2s_bits_per_sample_t)16,
198198
.channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT,
199199
.communication_format = (i2s_comm_format_t) I2S_COMM_FORMAT_STAND_I2S,

src/AudioConfig.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,9 @@
175175
#if ESP_IDF_VERSION_MAJOR < 4 && !defined(I2S_COMM_FORMAT_STAND_I2S)
176176
# define I2S_COMM_FORMAT_STAND_I2S (I2S_COMM_FORMAT_I2S | I2S_COMM_FORMAT_I2S_LSB)
177177
# define I2S_COMM_FORMAT_STAND_MSB (I2S_COMM_FORMAT_I2S | I2S_COMM_FORMAT_I2S_MSB)
178+
typedef int eps32_i2s_sample_rate_type;
179+
#else
180+
typedef uint32_t eps32_i2s_sample_rate_type;
178181
#endif
179182

180183
#endif

src/AudioEffects/AudioEffectsSuite.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ModulationBaseClass {
4646
ModulationBaseClass() { srand(static_cast<unsigned>(time(0))); }
4747

4848
ModulationBaseClass(effectsuite_t extSampRate) {
49-
sampleRate = extSampRate;
49+
this->sampleRate = extSampRate;
5050
timeStep = 1. / extSampRate;
5151
allocateMemory();
5252
// setInterpTable();
@@ -975,9 +975,10 @@ class SimpleChorus : public DelayEffectBase,
975975
* delay buffer size when initialisi.
976976
*/
977977
SimpleChorus() : SimpleLPF(0.0001, 4) {}
978-
SimpleChorus(int extSampleRate=44100)
979-
: ModulationBaseClass(extSampleRate),
980-
DelayEffectBase(effectsuite_t(extSampleRate) * .031), SimpleLPF(0.0001, 4) {
978+
SimpleChorus(int extSampleRate=44100) :
979+
DelayEffectBase(static_cast<int>(0.031 * extSampleRate)),
980+
ModulationBaseClass(extSampleRate),
981+
SimpleLPF(0.0001, 4) {
981982
swing = 0.005 * sampleRate;
982983
base = 0.015 * sampleRate;
983984
if (sampleRate != 0)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#pragma once
22

3+
#ifdef USE_EXPERIMENTS
34
#include "AudioExperiments/AudioDAC.h"
45
#include "AudioExperiments/AudioUSB.h"
56
//#include "AudioExperiments/TimerCallbackAudioStream.h"
7+
#endif

src/AudioI2S/I2SESP32.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ class I2SBase {
4343

4444
i2s_config_t i2s_config_new = {
4545
.mode = toMode(cfg),
46-
.sample_rate = (uint32_t)cfg.sample_rate,
46+
.sample_rate = (eps32_i2s_sample_rate_type)cfg.sample_rate,
4747
.bits_per_sample = (i2s_bits_per_sample_t) cfg.bits_per_sample,
4848
.channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT,
4949
.communication_format = toCommFormat(cfg.i2s_format),
5050
.intr_alloc_flags = ESP_INTR_FLAG_LEVEL1, // default interrupt priority
5151
.dma_buf_count = I2S_BUFFER_COUNT,
5252
.dma_buf_len = I2S_BUFFER_SIZE,
53-
.use_apll = cfg.use_apll,
53+
.use_apll = (bool) cfg.use_apll,
5454
.tx_desc_auto_clear = I2S_AUTO_CLEAR,
55-
.fixed_mclk = cfg.use_apll ? cfg.sample_rate * cfg.apll_frequency_factor : 0
55+
.fixed_mclk = (eps32_i2s_sample_rate_type) (cfg.use_apll ? cfg.sample_rate * cfg.apll_frequency_factor : 0 )
5656

5757
};
5858
i2s_config = i2s_config_new;

src/AudioMetaData/AbstractMetaData.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ const char *toStr(MetaDataType t){
2121
*/
2222
class AbstractMetaData {
2323
public:
24+
virtual ~AbstractMetaData() = default;
25+
2426
// defines the callback which provides the metadata information
2527
virtual void setCallback(void (*fn)(MetaDataType info, const char* str, int len)) = 0 ;
2628
// starts the processing

src/AudioMetaData/MetaData.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class MetaDataPrint : public AudioPrint {
5656
}
5757

5858
virtual void end() {
59-
if (callback!=nullptr & meta != nullptr) {
59+
if (callback!=nullptr && meta != nullptr) {
6060
LOGD(LOG_METHOD);
6161
meta->end();
6262
}

src/AudioTimer/AudioTimerDef.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ enum TimerFunction {DirectTimerCallback, TimerCallbackInThread, SimpleThreadLoop
1313
*/
1414
class TimerAlarmRepeatingDef {
1515
public:
16+
virtual ~TimerAlarmRepeatingDef() = default;
1617
virtual bool begin(repeating_timer_callback_t callback_f, uint32_t time, TimeUnit unit = MS) = 0;
1718
virtual bool end() = 0;
1819

src/AudioTools/AudioStreams.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,6 @@ class TimerCallbackAudioStream : public BufferedStream, public AudioBaseInfoSour
705705
if (lastTimestamp>0u){
706706
uint32_t diff = ms-lastTimestamp;
707707
if (diff>0){
708-
uint16_t bytes_per_sample = cfg.bits_per_sample/8;
709708
uint16_t rate = 1 * 1000 / diff;
710709

711710
if (currentRateValue==0){

src/AudioTools/SoundGenerator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class SoundGenerator {
7878

7979
virtual AudioBaseInfo defaultConfig(){
8080
AudioBaseInfo def;
81-
def.bits_per_sample!=sizeof(T)*8;
81+
def.bits_per_sample = sizeof(T)*8;
8282
def.channels = 1;
8383
def.sample_rate = 44100;
8484
return def;

0 commit comments

Comments
 (0)