Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-09 13:07:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Philippe G
2021-12-22 15:10:42 -08:00
parent 9dfe90c26f
commit d914e68a9b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/spotify/cspot/bell/include/Task.h
View File

@@ -26,8 +26,8 @@ namespace bell
this->core = core; this->core = core;
this->runOnPSRAM = runOnPSRAM; this->runOnPSRAM = runOnPSRAM;
#ifdef ESP_PLATFORM #ifdef ESP_PLATFORM
this->priority = ESP_TASK_PRIO_MIN + 1 + priority; this->priority = CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT + priority;
if (this->priority < 0) this->priority = ESP_TASK_PRIO_MIN + 1; if (this->priority < 0) this->priority = ESP_TASK_PRIO_MIN;
#endif #endif
} }
virtual ~Task() {} virtual ~Task() {}
@@ -37,11 +37,10 @@ namespace bell
#ifdef ESP_PLATFORM #ifdef ESP_PLATFORM
if (runOnPSRAM) if (runOnPSRAM)
{ {
xTaskBuffer = (StaticTask_t *)heap_caps_malloc(sizeof(StaticTask_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT); 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); 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 else
{ {
@@ -50,7 +49,7 @@ namespace bell
cfg.inherit_cfg = true; cfg.inherit_cfg = true;
cfg.thread_name = this->taskName.c_str(); cfg.thread_name = this->taskName.c_str();
cfg.pin_to_core = core; cfg.pin_to_core = core;
cfg.prio = priority; cfg.prio = this->priority;
esp_pthread_set_cfg(&cfg); esp_pthread_set_cfg(&cfg);
} }
#endif #endif

2
components/spotify/cspot/src/PlainConnection.cpp
View File

@@ -164,6 +164,8 @@ size_t PlainConnection::writeBlock(const std::vector<uint8_t> &data)
void PlainConnection::closeSocket() void PlainConnection::closeSocket()
{ {
if (this->apSock < 0) return;
CSPOT_LOG(info, "Closing socket..."); CSPOT_LOG(info, "Closing socket...");
shutdown(this->apSock, SHUT_RDWR); shutdown(this->apSock, SHUT_RDWR);
close(this->apSock); close(this->apSock);