rework cover state machine

Author: mringwal

effect/cover_art.cpp

@@ -1,5 +1,6 @@
 #include "effect.hpp"
 #include "3rd-party/JPEGDEC/JPEGDEC.h"
+#include "btstack_util.h"
 
 // cover art thumbnails are 200x200, main options:
 #if 0
@@ -43,15 +44,20 @@ static int JPEGDraw(JPEGDRAW *pDraw) {
 
 void CoverArt::update(int16_t *buffer16, size_t sample_count) {
     if (this->render){
-        this->render = false;
         display.clear();
         if (this->cover_data != NULL){
+            this->render = false;
             decoder.openRAM((uint8_t *) this->cover_data, this->cover_len, JPEGDraw);
             decoder.setUserPointer(&display);
             decoder.decode(0, 0, SCALING);
             decoder.close();
         } else {
-            display.draw_string(0, 12, "Info");
+            uint16_t scroll_offset = this->cover_art_scroller_offset / 2;
+            display.draw_string(Display::WIDTH - scroll_offset, 12, this->cover_art_info);
+            this->cover_art_scroller_offset++;
+            if (scroll_offset >= ((MAX_TEXT_LEN * 8 * 2) + Display::WIDTH)){
+                this->render = false;
+            }
         }
     }
 }
@@ -65,12 +71,10 @@ void CoverArt::set_cover(const uint8_t * data, uint32_t len){
     this->render = true;
 };
 
-void CoverArt::set_artist(const char * artist){
-
-}
-void CoverArt::set_album(const char * album){
-
-}
-void CoverArt::set_title(const char * title){
-
+void CoverArt::set_info(const char *info) {
+    btstack_strcpy(this->cover_art_info, sizeof(this->cover_art_info), info);
+    printf("Scroller: %s\n", this->cover_art_info);
+    this->cover_data = NULL;
+    this->cover_art_scroller_offset = 0;
+    this->render = true;
 }

effect/effect.hpp

@@ -76,17 +76,19 @@ class ClassicFFT : public Effect {
         void init(uint32_t sample_frequency) override;
 };
 
+#define MAX_TEXT_LEN 32
 class CoverArt : public Effect {
     private:
         const uint8_t * cover_data;
         uint32_t        cover_len;
         bool            render;
+        char            cover_art_info[2 * MAX_TEXT_LEN];
+        uint16_t        cover_art_scroller_offset = 0;
+
     public:
         CoverArt(Display& display, FIX_FFT &fft) : Effect(display, fft) {}
         void update(int16_t *buffer16, size_t sample_count) override;
         void init(uint32_t sample_frequency) override;
         void set_cover(const uint8_t * data, uint32_t len);
-        void set_artist(const char * artist);
-        void set_album(const char * album);
-        void set_title(const char * title);
+        void set_info(const char * info);
 };

src/a2dp_sink.cpp

@@ -178,13 +178,15 @@ static FILE * a2dp_sink_cover_art_file;
 #ifdef COVER_ART_DEMO
 static uint8_t cover_art_jpeg[40000];
 void cover_art_set_cover(const uint8_t * cover_data, uint32_t cover_len);
+void cover_art_set_info(const char * info);
 #endif
 #endif
 
 #define MAX_NAME_LEN 32
 static char avrcp_artist[MAX_NAME_LEN];
 static char avrcp_album[MAX_NAME_LEN];
 static char avrcp_title[MAX_NAME_LEN];
+static char avrcp_info[2 * MAX_NAME_LEN];
 
 typedef struct {
     uint8_t  reconfigure;
@@ -981,7 +983,11 @@ static void avrcp_controller_packet_handler(uint8_t packet_type, uint16_t channe
                 printf("AVRCP Controller: Cover Art %s\n", a2dp_sink_demo_image_handle);
 #ifdef COVER_ART_DEMO
 #ifndef HAVE_POSIX_FILE_IO
-                cover_art_set_cover(NULL, 0);
+                // artist - album
+                btstack_strcpy(avrcp_info, sizeof(avrcp_info), avrcp_artist);
+                btstack_strcat( avrcp_info, sizeof(avrcp_info), " - ");
+                btstack_strcat( avrcp_info, sizeof(avrcp_info), avrcp_title);
+                cover_art_set_info(avrcp_info);
 #endif
                 if (a2dp_sink_cover_art_download_active == false){
 #ifdef HAVE_POSIX_FILE_IO

src/btstack_audio_pico.cpp

@@ -49,6 +49,7 @@
 #include "btstack_debug.h"
 #include "btstack_audio.h"
 #include "btstack_run_loop.h"
+#include "btstack_util.h"
 
 #include <stddef.h>
 #include <hardware/dma.h>
@@ -66,7 +67,7 @@
 #include "3rd-party/JPEGDEC/JPEGDEC.h"
 
 #define DRIVER_POLL_INTERVAL_MS 5
-#define INFO_TIME_MS  3000
+#define INFO_TIME_MS  5000
 #define COVER_TIME_MS 3000
 
 Display display;
@@ -343,26 +344,21 @@ const btstack_audio_sink_t * btstack_audio_pico_sink_get_instance(void){
     return &btstack_audio_pico_sink;
 }
 
-void cover_art_set_cover(const uint8_t * data, uint32_t len){
+void cover_art_cache_effect(void){
+    // cache active effect
+    if (current_effect != 2){
+        previous_effect = current_effect;
+        current_effect = 2;
+    }
+}
 
+void cover_art_set_cover(const uint8_t * data, uint32_t len){
     cover_data = data;
     cover_len = len;
-
     switch (display_mode){
         case DISPLAY_IDLE:
         case DISPLAY_COVER:
         case DISPLAY_FFT:
-            // cache active effect
-            btstack_assert(data != NULL);
-            // new song started, show info
-            if (display_mode != DISPLAY_COVER){
-                previous_effect = current_effect;
-                current_effect = 2;
-            }
-            printf("COVER: new song, show info\n");
-            display_mode = DISPLAY_INFO;
-            cover_time_counter = INFO_TIME_MS / DRIVER_POLL_INTERVAL_MS;
-            cover_art.set_cover(NULL, 0);
             break;
         case DISPLAY_INFO:
             // info still shown, cache cover for later
@@ -381,14 +377,10 @@ void cover_art_set_cover(const uint8_t * data, uint32_t len){
     }
 }
 
-void cover_art_set_title(const char * title){
-    cover_art.set_title(title);
-};
-
-void cover_art_set_artist(const char * artist){
-    cover_art.set_artist(artist);
-};
-
-void cover_art_set_album(const char * album){
-    cover_art.set_album(album);
-};
+void cover_art_set_info(const char * info){
+    cover_art_cache_effect();
+    printf("COVER: new song, show info\n");
+    cover_art.set_info(info);
+    display_mode = DISPLAY_INFO;
+    cover_time_counter = INFO_TIME_MS / DRIVER_POLL_INTERVAL_MS;
+}