From e30cd901409e3369f9bc6db181925bc56a26861e Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Fri, 2 May 2014 10:09:52 +0200
Subject: [PATCH] AudioQueue::stopAll() instead of AudioQueue::reset()

---
 radio/src/audio_arm.cpp | 4 ++--
 radio/src/audio_arm.h   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp
index 8fd43e9b4..8b1c3457c 100644
--- a/radio/src/audio_arm.cpp
+++ b/radio/src/audio_arm.cpp
@@ -912,13 +912,13 @@ void AudioQueue::stopPlay(uint8_t id)
 void AudioQueue::stopSD()
 {
   sdAvailableSystemAudioFiles = 0;
-  reset();
+  stopAll();
   playTone(0, 0, 100, PLAY_NOW);        // insert a 100ms pause
 }
 
 #endif
 
-void AudioQueue::reset()
+void AudioQueue::stopAll()
 {
   CoEnterMutexSection(audioMutex);
   widx = ridx;                      // clean the queue
diff --git a/radio/src/audio_arm.h b/radio/src/audio_arm.h
index 65a9d6233..825f82fd7 100644
--- a/radio/src/audio_arm.h
+++ b/radio/src/audio_arm.h
@@ -161,6 +161,8 @@ class AudioQueue {
 
     void stopPlay(uint8_t id);
 
+    void stopAll();
+
     void pause(uint16_t tLen);
 
     void stopSD();
@@ -177,8 +179,6 @@ class AudioQueue {
       return ridx == widx;
     }
 
-    void reset();
-
     inline AudioBuffer * getNextFilledBuffer()
     {
       if (buffers[bufferRIdx].state == AUDIO_BUFFER_PLAYING) {
@@ -322,7 +322,7 @@ void pushPrompt(uint16_t prompt, uint8_t id=0);
 #define PLAY_VALUE(v, id)        playValue((v), (id))
 #define PLAY_FILE(f, flags, id)  audioQueue.playFile((f), (flags), (id))
 #define STOP_PLAY(id)            audioQueue.stopPlay((id))
-#define AUDIO_RESET()            audioQueue.reset()
+#define AUDIO_RESET()            audioQueue.stopAll()
 
 #if defined(SDCARD)
   extern tmr10ms_t timeAutomaticPromptsSilence;