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

Correcting annoying AirPlay bug! - release

Browse Source
This commit is contained in:
philippe44
2020-03-01 00:25:09 -08:00
parent 9759c0dbef
commit 0bf2c11fdb
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/display/display.c
View File

@@ -192,7 +192,7 @@ static void displayer_task(void *args) {
// handler elapsed track time // handler elapsed track time
if (displayer.timer && displayer.state == DISPLAYER_ACTIVE) { if (displayer.timer && displayer.state == DISPLAYER_ACTIVE) {
char counter[12]; char counter[16];
TickType_t tick = xTaskGetTickCount(); TickType_t tick = xTaskGetTickCount();
uint32_t elapsed = (tick - displayer.tick) * portTICK_PERIOD_MS; uint32_t elapsed = (tick - displayer.tick) * portTICK_PERIOD_MS;

12
components/raop/raop.c
View File

@@ -631,11 +631,9 @@ static bool handle_rtsp(raop_ctx_t *ctx, int sock)
success = ctx->cmd_cb(RAOP_VOLUME, volume); success = ctx->cmd_cb(RAOP_VOLUME, volume);
} else if (body && (p = strcasestr(body, "progress")) != NULL) { } else if (body && (p = strcasestr(body, "progress")) != NULL) {
int start, current, stop = 0; int start, current, stop = 0;
// we want ms, not s // we want ms, not s
sscanf(p, "%*[^:]:%u/%u/%u", &start, &current, &stop); sscanf(p, "%*[^:]:%u/%u/%u", &start, &current, &stop);
current = ((current - start) / 44100) * 1000;
if (stop) stop = ((stop - start) / 44100) * 1000;
current = ((current - start) / 44100) * 1000; current = ((current - start) / 44100) * 1000;
if (stop) stop = ((stop - start) / 44100) * 1000; if (stop) stop = ((stop - start) / 44100) * 1000;
else stop = -1; else stop = -1;
@@ -651,6 +649,10 @@ static bool handle_rtsp(raop_ctx_t *ctx, int sock)
LOG_INFO("[%p]: received metadata"); LOG_INFO("[%p]: received metadata");
settings.ctx = &metadata; settings.ctx = &metadata;
memset(&metadata, 0, sizeof(struct metadata_s)); memset(&metadata, 0, sizeof(struct metadata_s));
if (!dmap_parse(&settings, body, len)) {
LOG_INFO("[%p]: received metadata\n\tartist: %s\n\talbum: %s\n\ttitle: %s",
ctx, metadata.artist, metadata.album, metadata.title);
success = ctx->cmd_cb(RAOP_METADATA, metadata.artist, metadata.album, metadata.title);
free_metadata(&metadata); free_metadata(&metadata);
} }
} else { } else {