From 8bac09c126e669a57b4b088ead67a37e878e3bde Mon Sep 17 00:00:00 2001 From: "bsongis@gmail.com" Date: Tue, 25 Jun 2013 19:46:21 +0000 Subject: [PATCH] Warning removed --- src/audio_arm.cpp | 4 ++-- src/audio_arm.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/audio_arm.cpp b/src/audio_arm.cpp index fff6b9d8d..67cd830e7 100644 --- a/src/audio_arm.cpp +++ b/src/audio_arm.cpp @@ -440,7 +440,7 @@ int AudioQueue::mixBeep(AudioContext &context, AudioBuffer *buffer, int volume, if (fragment.tone.duration > 0) { result = AUDIO_BUFFER_SIZE; if (fragment.tone.freq && context.state.tone.freq!=fragment.tone.freq && (!fragment.tone.freqIncr || abs(context.state.tone.freq-fragment.tone.freq) > 100)) { - int periods = DIM(context.state.tone.points) / ((AUDIO_SAMPLE_RATE / fragment.tone.freq) + 1); + int periods = BEEP_POINTS_COUNT / ((AUDIO_SAMPLE_RATE / fragment.tone.freq) + 1); context.state.tone.count = (periods * AUDIO_SAMPLE_RATE) / fragment.tone.freq; if (context.state.tone.idx >= context.state.tone.count) context.state.tone.idx = 0; #if 1 @@ -473,7 +473,7 @@ int AudioQueue::mixBeep(AudioContext &context, AudioBuffer *buffer, int volume, context.state.tone.idx = context.state.tone.idx + 1; if (context.state.tone.idx >= context.state.tone.count) { context.state.tone.idx = 0; - if (end && i+DIM(context.state.tone.points) > points) break; + if (end && i+BEEP_POINTS_COUNT>points) break; } } diff --git a/src/audio_arm.h b/src/audio_arm.h index 20ecb3088..fd403222f 100644 --- a/src/audio_arm.h +++ b/src/audio_arm.h @@ -51,6 +51,7 @@ #define BEEP_DEFAULT_FREQ (2250) #define BEEP_KEY_UP_FREQ (BEEP_DEFAULT_FREQ+150) #define BEEP_KEY_DOWN_FREQ (BEEP_DEFAULT_FREQ-150) +#define BEEP_POINTS_COUNT 100 #define AUDIO_BUFFER_FREE (0) #define AUDIO_BUFFER_FILLED (1) @@ -104,7 +105,7 @@ class AudioContext { #endif struct { - int16_t points[100]; + int16_t points[BEEP_POINTS_COUNT]; uint8_t count; uint8_t idx; uint16_t freq;