From 247acd057576f657d4ce2fdc7f8c3567462bf53c Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Mon, 5 Dec 2016 18:19:01 +0100 Subject: [PATCH] Merge from Chips (audio related fixes) --- src/od-pandora/pandora_gui.cpp | 1 + src/sd-pandora/sound.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/od-pandora/pandora_gui.cpp b/src/od-pandora/pandora_gui.cpp index c733477d..fa0e9881 100644 --- a/src/od-pandora/pandora_gui.cpp +++ b/src/od-pandora/pandora_gui.cpp @@ -564,6 +564,7 @@ void gui_display (int shortcut) /* Clear menu garbage at the bottom of the screen */ black_screen_now(); + reset_sound(); resume_sound(); blkdev_exitgui(); diff --git a/src/sd-pandora/sound.h b/src/sd-pandora/sound.h index 614aa6c4..865f034c 100644 --- a/src/sd-pandora/sound.h +++ b/src/sd-pandora/sound.h @@ -41,7 +41,7 @@ STATIC_INLINE void set_sound_buffers (void) STATIC_INLINE void clear_sound_buffers (void) { - memset (sndbuffer, 0, 4 * (SNDBUFFER_LEN + 32) * DEFAULT_SOUND_CHANNELS); + memset (sndbuffer, 0, sizeof(sndbuffer)); } #define PUT_SOUND_WORD_MONO(x) put_sound_word_mono_func(x)