diff options
-rw-r--r-- | apps/gui/charcell/list.c | 2 | ||||
-rw-r--r-- | apps/plugins/lrcplayer.c | 10 | ||||
-rw-r--r-- | apps/tree.c | 7 |
3 files changed, 15 insertions, 4 deletions
diff --git a/apps/gui/charcell/list.c b/apps/gui/charcell/list.c index a0ab02841f..15112adb51 100644 --- a/apps/gui/charcell/list.c +++ b/apps/gui/charcell/list.c | |||
@@ -54,11 +54,9 @@ void list_draw(struct screen *display, struct gui_synclist *gui_list) | |||
54 | bool draw_icons = (gui_list->callback_get_item_icon != NULL); | 54 | bool draw_icons = (gui_list->callback_get_item_icon != NULL); |
55 | bool draw_cursor; | 55 | bool draw_cursor; |
56 | int i; | 56 | int i; |
57 | int lines; | ||
58 | int start, end; | 57 | int start, end; |
59 | 58 | ||
60 | display->set_viewport(NULL); | 59 | display->set_viewport(NULL); |
61 | lines = display->getnblines(); | ||
62 | 60 | ||
63 | display->clear_display(); | 61 | display->clear_display(); |
64 | start = 0; | 62 | start = 0; |
diff --git a/apps/plugins/lrcplayer.c b/apps/plugins/lrcplayer.c index 4fb94d741e..f0b3e47728 100644 --- a/apps/plugins/lrcplayer.c +++ b/apps/plugins/lrcplayer.c | |||
@@ -449,7 +449,11 @@ static struct lrc_brpos *calc_brpos(struct lrc_line *lrc_line, int i) | |||
449 | int nword; | 449 | int nword; |
450 | int word_count, word_width; | 450 | int word_count, word_width; |
451 | const unsigned char *str; | 451 | const unsigned char *str; |
452 | } sp, cr; | 452 | } |
453 | #ifndef HAVE_LCD_CHARCELLS | ||
454 | sp, | ||
455 | #endif | ||
456 | cr; | ||
453 | 457 | ||
454 | lrc_buffer_used = (lrc_buffer_used+3)&~3; /* 4 bytes aligned */ | 458 | lrc_buffer_used = (lrc_buffer_used+3)&~3; /* 4 bytes aligned */ |
455 | lrc_brpos = (struct lrc_brpos *) &lrc_buffer[lrc_buffer_used]; | 459 | lrc_brpos = (struct lrc_brpos *) &lrc_buffer[lrc_buffer_used]; |
@@ -508,15 +512,19 @@ static struct lrc_brpos *calc_brpos(struct lrc_line *lrc_line, int i) | |||
508 | cr.nword = lrc_line->nword; | 512 | cr.nword = lrc_line->nword; |
509 | lrc_word = lrc_line->words+cr.nword; | 513 | lrc_word = lrc_line->words+cr.nword; |
510 | cr.str = (lrc_word-1)->word; | 514 | cr.str = (lrc_word-1)->word; |
515 | #ifndef HAVE_LCD_CHARCELLS | ||
511 | sp.word_count = 0; | 516 | sp.word_count = 0; |
512 | sp.word_width = 0; | 517 | sp.word_width = 0; |
513 | sp.nword = 0; | 518 | sp.nword = 0; |
514 | sp.count = 0; | 519 | sp.count = 0; |
515 | sp.width = 0; | 520 | sp.width = 0; |
521 | #endif | ||
516 | do { | 522 | do { |
517 | cr.count = 0; | 523 | cr.count = 0; |
518 | cr.width = 0; | 524 | cr.width = 0; |
525 | #ifndef HAVE_LCD_CHARCELLS | ||
519 | sp.str = NULL; | 526 | sp.str = NULL; |
527 | #endif | ||
520 | 528 | ||
521 | while (1) | 529 | while (1) |
522 | { | 530 | { |
diff --git a/apps/tree.c b/apps/tree.c index 24acd5ac69..ca4c567235 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -619,7 +619,10 @@ static int dirbrowse(void) | |||
619 | { | 619 | { |
620 | int numentries=0; | 620 | int numentries=0; |
621 | char buf[MAX_PATH]; | 621 | char buf[MAX_PATH]; |
622 | int button, oldbutton; | 622 | int button; |
623 | #ifdef HAVE_LCD_BITMAP | ||
624 | int oldbutton; | ||
625 | #endif | ||
623 | bool reload_root = false; | 626 | bool reload_root = false; |
624 | int lastfilter = *tc.dirfilter; | 627 | int lastfilter = *tc.dirfilter; |
625 | bool lastsortcase = global_settings.sort_case; | 628 | bool lastsortcase = global_settings.sort_case; |
@@ -663,7 +666,9 @@ static int dirbrowse(void) | |||
663 | 666 | ||
664 | button = get_action(CONTEXT_TREE, | 667 | button = get_action(CONTEXT_TREE, |
665 | list_do_action_timeout(&tree_lists, HZ/2)); | 668 | list_do_action_timeout(&tree_lists, HZ/2)); |
669 | #ifdef HAVE_LCD_BITMAP | ||
666 | oldbutton = button; | 670 | oldbutton = button; |
671 | #endif | ||
667 | gui_synclist_do_button(&tree_lists, &button,LIST_WRAP_UNLESS_HELD); | 672 | gui_synclist_do_button(&tree_lists, &button,LIST_WRAP_UNLESS_HELD); |
668 | tc.selected_item = gui_synclist_get_sel_pos(&tree_lists); | 673 | tc.selected_item = gui_synclist_get_sel_pos(&tree_lists); |
669 | switch ( button ) { | 674 | switch ( button ) { |