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

fix reboot logic upon server loss - release

Browse Source
This commit is contained in:
Philippe G
2020-09-25 21:50:44 -07:00
parent fb530645b8
commit 7f1db60c45
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/display/CMakeLists.txt
View File

@@ -1,4 +1,3 @@
idf_component_register(SRC_DIRS . core core/ifaces fonts idf_component_register(SRC_DIRS . core core/ifaces fonts
INCLUDE_DIRS . fonts core INCLUDE_DIRS . fonts core
REQUIRES platform_config tools esp_common REQUIRES platform_config tools esp_common

10
components/raop/raop.c
View File

@@ -228,7 +228,6 @@ void raop_delete(struct raop_ctx_s *ctx) {
ctx->running = false; ctx->running = false;
// wake-up thread by connecting socket, needed for freeBSD // wake-up thread by connecting socket, needed for freeBSD
sock = socket(AF_INET, SOCK_STREAM, 0);
sock = socket(AF_INET, SOCK_STREAM, 0); sock = socket(AF_INET, SOCK_STREAM, 0);
getsockname(ctx->sock, (struct sockaddr *) &addr, &nlen); getsockname(ctx->sock, (struct sockaddr *) &addr, &nlen);
connect(sock, (struct sockaddr*) &addr, sizeof(addr)); connect(sock, (struct sockaddr*) &addr, sizeof(addr));
@@ -248,13 +247,16 @@ void raop_delete(struct raop_ctx_s *ctx) {
// stop broadcasting devices // stop broadcasting devices
mdns_service_remove(ctx->svr, ctx->svc); mdns_service_remove(ctx->svr, ctx->svc);
mdnsd_stop(ctx->svr);
#else
// then the RTSP task
ctx->joiner = xTaskGetCurrentTaskHandle();
ctx->running = false;
// brute-force exit of accept() // brute-force exit of accept()
shutdown(ctx->sock, SHUT_RDWR); shutdown(ctx->sock, SHUT_RDWR);
closesocket(ctx->sock); closesocket(ctx->sock);
ctx->running = false;
ulTaskNotifyTake(pdFALSE, portMAX_DELAY);
// wait to make sure LWIP if scheduled (avoid issue with NotifyTake) // wait to make sure LWIP if scheduled (avoid issue with NotifyTake)
vTaskDelay(100 / portTICK_PERIOD_MS); vTaskDelay(100 / portTICK_PERIOD_MS);
ulTaskNotifyTake(pdFALSE, portMAX_DELAY); ulTaskNotifyTake(pdFALSE, portMAX_DELAY);

4
components/squeezelite/decode_external.c
View File

@@ -327,12 +327,12 @@ void register_external(void) {
void deregister_external(void) { void deregister_external(void) {
if (!strcasestr(output.device, "BT ") && enable_bt_sink) { if (!strcasestr(output.device, "BT ") && enable_bt_sink) {
bt_sink_deinit();
LOG_INFO("Stopping BT sink"); LOG_INFO("Stopping BT sink");
bt_sink_deinit();
} }
if (enable_airplay){ if (enable_airplay){
raop_sink_deinit();
LOG_INFO("Stopping AirPlay sink"); LOG_INFO("Stopping AirPlay sink");
raop_sink_deinit();
} }
} }

2
components/squeezelite/embedded.h
View File

@@ -35,7 +35,7 @@ typedef unsigned long long u64_t;
#define OUTPUT_THREAD_STACK_SIZE 6 * 1024 #define OUTPUT_THREAD_STACK_SIZE 6 * 1024
#define IR_THREAD_STACK_SIZE 6 * 1024 #define IR_THREAD_STACK_SIZE 6 * 1024
// number of 5s times search for a server will happen beforee slimproto exits (0 = no limit) // number of times the 5s search for a server will happen before slimproto exits (0 = no limit)
#define MAX_SERVER_RETRIES 5 #define MAX_SERVER_RETRIES 5
// or can be as simple as #define PLAYER_ID 100 // or can be as simple as #define PLAYER_ID 100

2
components/squeezelite/slimproto.c
View File

@@ -962,7 +962,7 @@ void slimproto(log_level level, char *server, u8_t mac[6], const char *name, con
if (++failed_connect > 5 && !server) { if (++failed_connect > 5 && !server) {
slimproto_ip = serv_addr.sin_addr.s_addr = discover_server(NULL, MAX_SERVER_RETRIES); slimproto_ip = serv_addr.sin_addr.s_addr = discover_server(NULL, MAX_SERVER_RETRIES);
if (!slimproto_ip) return; if (!slimproto_ip) return;
} else if (MAX_SERVER_RETRIES && failed_connect > 5 * MAX_SERVER_RETRIES) return; } else if (reconnect && MAX_SERVER_RETRIES && failed_connect > 5 * MAX_SERVER_RETRIES) return;
#else #else
// rediscover server if it was not set at startup or exit // rediscover server if it was not set at startup or exit
if (!server && ++failed_connect > 5) { if (!server && ++failed_connect > 5) {