From d914e68a9b49605537546e4b48540f48d60c86f5 Mon Sep 17 00:00:00 2001 From: Philippe G Date: Wed, 22 Dec 2021 15:10:42 -0800 Subject: [PATCH] more fixes --- components/spotify/cspot/bell/include/Task.h | 9 ++++----- components/spotify/cspot/src/PlainConnection.cpp | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/components/spotify/cspot/bell/include/Task.h b/components/spotify/cspot/bell/include/Task.h index f9f1fc63..8d478d41 100644 --- a/components/spotify/cspot/bell/include/Task.h +++ b/components/spotify/cspot/bell/include/Task.h @@ -26,8 +26,8 @@ namespace bell this->core = core; this->runOnPSRAM = runOnPSRAM; #ifdef ESP_PLATFORM - this->priority = ESP_TASK_PRIO_MIN + 1 + priority; - if (this->priority < 0) this->priority = ESP_TASK_PRIO_MIN + 1; + this->priority = CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT + priority; + if (this->priority < 0) this->priority = ESP_TASK_PRIO_MIN; #endif } virtual ~Task() {} @@ -37,11 +37,10 @@ namespace bell #ifdef ESP_PLATFORM if (runOnPSRAM) { - xTaskBuffer = (StaticTask_t *)heap_caps_malloc(sizeof(StaticTask_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT); xStack = (StackType_t *)heap_caps_malloc(this->stackSize, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); - return (xTaskCreateStaticPinnedToCore(taskEntryFuncPSRAM, this->taskName.c_str(), this->stackSize, this, 2, xStack, xTaskBuffer, this->core) != NULL); + return (xTaskCreateStaticPinnedToCore(taskEntryFuncPSRAM, this->taskName.c_str(), this->stackSize, this, this->priority, xStack, xTaskBuffer, this->core) != NULL); } else { @@ -50,7 +49,7 @@ namespace bell cfg.inherit_cfg = true; cfg.thread_name = this->taskName.c_str(); cfg.pin_to_core = core; - cfg.prio = priority; + cfg.prio = this->priority; esp_pthread_set_cfg(&cfg); } #endif diff --git a/components/spotify/cspot/src/PlainConnection.cpp b/components/spotify/cspot/src/PlainConnection.cpp index 0aaba929..f4c43c1d 100644 --- a/components/spotify/cspot/src/PlainConnection.cpp +++ b/components/spotify/cspot/src/PlainConnection.cpp @@ -164,6 +164,8 @@ size_t PlainConnection::writeBlock(const std::vector &data) void PlainConnection::closeSocket() { + if (this->apSock < 0) return; + CSPOT_LOG(info, "Closing socket..."); shutdown(this->apSock, SHUT_RDWR); close(this->apSock);