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

right scrolling

Browse Source
This commit is contained in:
philippe44
2020-01-20 23:34:14 -08:00
parent ce790a412e
commit d79a1bf55f
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/squeezelite/display.c
View File

@@ -364,23 +364,30 @@ static void scroll_task(void *args) {
u8_t *scroll_ptr, *frame; u8_t *scroll_ptr, *frame;
bool active = false; bool active = false;
int len = display->width * display->height / 8; int len = display->width * display->height / 8;
int scroll_len; int scroll_len, scroll_step;
while (1) { while (1) {
if (!active) vTaskSuspend(NULL); if (!active) vTaskSuspend(NULL);
// restart at the beginning - I don't know what right scrolling means ... // restart at the beginning - I don't know what right scrolling means ...
scroll_ptr = scroller.scroll_frame;
scroll_len = len - (display->width - scroller.scroll_width) * display->height / 8; scroll_len = len - (display->width - scroller.scroll_width) * display->height / 8;
if (scroller.direction == 1) {
scroll_ptr = scroller.scroll_frame;
scroll_step = scroller.by * display->height / 8;
} else {
scroll_ptr = scroller.scroll_frame + scroller.size - scroll_len;
scroll_step = -scroller.by * display->height / 8;
}
frame = malloc(display->width * display->height / 8); frame = malloc(display->width * display->height / 8);
// scroll required amount of columns (within the window) // scroll required amount of columns (within the window)
while (scroll_ptr <= scroller.scroll_frame + scroller.size - scroller.by * display->height / 8 - len) { while (scroller.direction == 1 ? (scroll_ptr <= scroller.scroll_frame + scroller.size - scroll_step - len) :
scroll_ptr += scroller.by * display->height / 8; (scroll_ptr + scroll_step >= scroller.scroll_frame) ) {
// build a combined frame // build a combined frame
memcpy(frame, scroller.back_frame, len); memcpy(frame, scroller.back_frame, len);
for (int i = 0; i < scroll_len; i++) frame[i] |= scroll_ptr[i]; for (int i = 0; i < scroll_len; i++) frame[i] |= scroll_ptr[i];
scroll_ptr += scroll_step;
xSemaphoreTake(display_sem, portMAX_DELAY); xSemaphoreTake(display_sem, portMAX_DELAY);
active = scroller.active; active = scroller.active;