Merge branch 'master-v4.3' of https://github.com/sle118/squeezelite-esp32 into master-v4.3

components/spotify/Shim.cpp

@@ -39,6 +39,7 @@ class chunkManager : public bell::Task {
 public:
     std::atomic<bool> isRunning = true;
     std::atomic<bool> isPaused = true;
+    std::atomic<bool> discard = true;
     chunkManager(std::shared_ptr<bell::CentralAudioBuffer> centralAudioBuffer, std::function<void()> trackHandler,
                  std::function<void(const uint8_t*, size_t)> dataHandler);
     void teardown();
@@ -88,10 +89,11 @@ void chunkManager::runTask() {
         if (lastHash != chunk->trackHash) {
             CSPOT_LOG(info, "hash update %x => %x", lastHash, chunk->trackHash);
             lastHash = chunk->trackHash;
+            discard = false;
             trackHandler();
         }
 
-        dataHandler(chunk->pcmData, chunk->pcmSize);
+        if (!discard) dataHandler(chunk->pcmData, chunk->pcmSize);
     }
 }
 
@@ -223,6 +225,7 @@ esp_err_t cspotPlayer::handlePOST(httpd_req_t *request) {
 void cspotPlayer::eventHandler(std::unique_ptr<cspot::SpircHandler::Event> event) {
     switch (event->eventType) {
     case cspot::SpircHandler::EventType::PLAYBACK_START: {
+        chunker->discard = true;
         centralAudioBuffer->clearBuffer();
 
         // we are not playing anymore

components/wifi-manager/webapp/dist/src/js/test.d.ts

@@ -42,6 +42,8 @@ declare function getStatus(): {};
 declare function getStatus(): {};
 declare function getStatus(): {};
 declare function getStatus(): {};
+declare function getStatus(): {};
+declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
@@ -130,6 +132,7 @@ declare function pushStatus(): void;
 declare function pushStatus(): void;
 declare function pushStatus(): void;
 declare function pushStatus(): void;
+declare function pushStatus(): void;
 declare let sd: {};
 declare let rf: boolean;
 declare function refreshStatus(): void;

components/wifi-manager/webapp/webapp.cmake

@@ -1,5 +1,5 @@
 target_add_binary_data( __idf_wifi-manager webapp/dist/css/index.cd56ff129e3113d8cd3a.css.gz BINARY)
 target_add_binary_data( __idf_wifi-manager webapp/dist/favicon-32x32.png BINARY)
 target_add_binary_data( __idf_wifi-manager webapp/dist/index.html.gz BINARY)
-target_add_binary_data( __idf_wifi-manager webapp/dist/js/index.0748ab.bundle.js.gz BINARY)
-target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.0748ab.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/js/index.b79c88.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.b79c88.bundle.js.gz BINARY)

components/wifi-manager/webapp/webpack.c

@@ -6,29 +6,29 @@ extern const uint8_t _favicon_32x32_png_start[] asm("_binary_favicon_32x32_png_s
 extern const uint8_t _favicon_32x32_png_end[] asm("_binary_favicon_32x32_png_end");
 extern const uint8_t _index_html_gz_start[] asm("_binary_index_html_gz_start");
 extern const uint8_t _index_html_gz_end[] asm("_binary_index_html_gz_end");
-extern const uint8_t _index_0748ab_bundle_js_gz_start[] asm("_binary_index_0748ab_bundle_js_gz_start");
-extern const uint8_t _index_0748ab_bundle_js_gz_end[] asm("_binary_index_0748ab_bundle_js_gz_end");
-extern const uint8_t _node_vendors_0748ab_bundle_js_gz_start[] asm("_binary_node_vendors_0748ab_bundle_js_gz_start");
-extern const uint8_t _node_vendors_0748ab_bundle_js_gz_end[] asm("_binary_node_vendors_0748ab_bundle_js_gz_end");
+extern const uint8_t _index_b79c88_bundle_js_gz_start[] asm("_binary_index_b79c88_bundle_js_gz_start");
+extern const uint8_t _index_b79c88_bundle_js_gz_end[] asm("_binary_index_b79c88_bundle_js_gz_end");
+extern const uint8_t _node_vendors_b79c88_bundle_js_gz_start[] asm("_binary_node_vendors_b79c88_bundle_js_gz_start");
+extern const uint8_t _node_vendors_b79c88_bundle_js_gz_end[] asm("_binary_node_vendors_b79c88_bundle_js_gz_end");
 const char * resource_lookups[] = {
 	"/css/index.cd56ff129e3113d8cd3a.css.gz",
 	"/favicon-32x32.png",
 	"/index.html.gz",
-	"/js/index.0748ab.bundle.js.gz",
-	"/js/node_vendors.0748ab.bundle.js.gz",
+	"/js/index.b79c88.bundle.js.gz",
+	"/js/node_vendors.b79c88.bundle.js.gz",
 ""
 };
 const uint8_t * resource_map_start[] = {
 	_index_cd56ff129e3113d8cd3a_css_gz_start,
 	_favicon_32x32_png_start,
 	_index_html_gz_start,
-	_index_0748ab_bundle_js_gz_start,
-	_node_vendors_0748ab_bundle_js_gz_start
+	_index_b79c88_bundle_js_gz_start,
+	_node_vendors_b79c88_bundle_js_gz_start
 };
 const uint8_t * resource_map_end[] = {
 	_index_cd56ff129e3113d8cd3a_css_gz_end,
 	_favicon_32x32_png_end,
 	_index_html_gz_end,
-	_index_0748ab_bundle_js_gz_end,
-	_node_vendors_0748ab_bundle_js_gz_end
+	_index_b79c88_bundle_js_gz_end,
+	_node_vendors_b79c88_bundle_js_gz_end
 };

components/wifi-manager/webapp/webpack.h

@@ -1,6 +1,6 @@
 /***********************************
 webpack_headers
-dist/css/index.cd56ff129e3113d8cd3a.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.0748ab.bundle.js.gz,dist/js/node_vendors.0748ab.bundle.js.gz
+dist/css/index.cd56ff129e3113d8cd3a.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.b79c88.bundle.js.gz,dist/js/node_vendors.b79c88.bundle.js.gz
 ***********************************/
 #pragma once
 #include <inttypes.h>