From d097fbdd9d4dd001c84c023bcd00dae86734ef7f Mon Sep 17 00:00:00 2001 From: willem Date: Fri, 10 Dec 2021 17:22:02 +0100 Subject: [PATCH] update audio --- FW/leo_muziekdoos_esp32/src/audio.cpp | 19 +++++++++++++++++++ FW/leo_muziekdoos_esp32/src/audio.h | 2 ++ FW/leo_muziekdoos_esp32/src/game.h | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/FW/leo_muziekdoos_esp32/src/audio.cpp b/FW/leo_muziekdoos_esp32/src/audio.cpp index 7f556e8..6a636a9 100644 --- a/FW/leo_muziekdoos_esp32/src/audio.cpp +++ b/FW/leo_muziekdoos_esp32/src/audio.cpp @@ -6,6 +6,7 @@ AudioFileSourceLittleFS *file; AudioOutputI2S *out; uint8_t audio_current_Song = 0; +const char* nextAudioFile = ""; uint8_t n = 0; bool audio_start = false; @@ -46,6 +47,19 @@ void playSong(uint8_t index) mp3->begin(id3, out); } +void playSong(String filename) +{ + if(filename != "") + { + log_i("now playing %s\n", filename.c_str()); + file = new AudioFileSourceLittleFS(filename.c_str()); + id3 = new AudioFileSourceID3(file); + id3->RegisterMetadataCB(MDCallback, (void *)"ID3TAG"); + mp3->begin(id3, out); + } +} + + void initAudio() { log_i("init Audio"); @@ -67,6 +81,11 @@ bool getAudioInitStatus(void) return audioInitOk; } +void setAudioFileName(String filename) +{ + nextAudioFile = filename; +} + void handleAudio() { if (hallIsIdle()) diff --git a/FW/leo_muziekdoos_esp32/src/audio.h b/FW/leo_muziekdoos_esp32/src/audio.h index a86fc6d..29f0090 100644 --- a/FW/leo_muziekdoos_esp32/src/audio.h +++ b/FW/leo_muziekdoos_esp32/src/audio.h @@ -18,4 +18,6 @@ void initAudio(void); void handleAudio(void); bool getAudioInitStatus(void); +void playSong(String filename); + diff --git a/FW/leo_muziekdoos_esp32/src/game.h b/FW/leo_muziekdoos_esp32/src/game.h index bb9e139..58b6790 100644 --- a/FW/leo_muziekdoos_esp32/src/game.h +++ b/FW/leo_muziekdoos_esp32/src/game.h @@ -11,7 +11,7 @@ #define HALLIDLESAMPLES 4 #define HALLPLAYSAMPLES 8 -#define TIMEOUT_IDLE 7000 +#define TIMEOUT_IDLE 20000 typedef enum{ stateInit,