diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/onplay.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/apps/onplay.c b/apps/onplay.c index c36f2242ca..bcea88fd37 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -83,7 +83,11 @@ static bool clipboard_is_copy = false; | |||
83 | MENU_ITEM_COUNT(sizeof( name##_)/sizeof(*name##_)), \ | 83 | MENU_ITEM_COUNT(sizeof( name##_)/sizeof(*name##_)), \ |
84 | { (void*)name##_},{.callback_and_desc = & name##__}}; | 84 | { (void*)name##_},{.callback_and_desc = & name##__}}; |
85 | 85 | ||
86 | 86 | #ifdef HAVE_LCD_BITMAP | |
87 | static void draw_slider(void); | ||
88 | #else | ||
89 | #define draw_slider() | ||
90 | #endif | ||
87 | /* ----------------------------------------------------------------------- */ | 91 | /* ----------------------------------------------------------------------- */ |
88 | /* Displays the bookmark menu options for the user to decide. This is an */ | 92 | /* Displays the bookmark menu options for the user to decide. This is an */ |
89 | /* interface function. */ | 93 | /* interface function. */ |
@@ -465,8 +469,10 @@ static int remove_dir(char* dirname, int len) | |||
465 | break; | 469 | break; |
466 | 470 | ||
467 | dirname[dirlen] ='\0'; | 471 | dirname[dirlen] ='\0'; |
468 | FOR_NB_SCREENS(i) | 472 | FOR_NB_SCREENS(i){ |
469 | screens[i].puts(0,1,dirname); | 473 | screens[i].puts(0,1,dirname); |
474 | screens[i].update(); | ||
475 | } | ||
470 | 476 | ||
471 | /* append name to current directory */ | 477 | /* append name to current directory */ |
472 | snprintf(dirname+dirlen, len-dirlen, "/%s", entry->d_name); | 478 | snprintf(dirname+dirlen, len-dirlen, "/%s", entry->d_name); |
@@ -484,19 +490,9 @@ static int remove_dir(char* dirname, int len) | |||
484 | } | 490 | } |
485 | else | 491 | else |
486 | { /* remove a file */ | 492 | { /* remove a file */ |
487 | #ifdef HAVE_LCD_BITMAP | 493 | draw_slider(); |
488 | FOR_NB_SCREENS(i) | ||
489 | { | ||
490 | show_busy_slider(&screens[i], 2, 3*screens[i].char_height, | ||
491 | LCD_WIDTH-4, screens[i].char_height); | ||
492 | } | ||
493 | #endif | ||
494 | result = remove(dirname); | 494 | result = remove(dirname); |
495 | } | 495 | } |
496 | #ifdef HAVE_LCD_BITMAP | ||
497 | FOR_NB_SCREENS(i) | ||
498 | screens[i].update(); | ||
499 | #endif | ||
500 | if(ACTION_STD_CANCEL == get_action(CONTEXT_STD,TIMEOUT_NOBLOCK)) | 496 | if(ACTION_STD_CANCEL == get_action(CONTEXT_STD,TIMEOUT_NOBLOCK)) |
501 | { | 497 | { |
502 | gui_syncsplash(HZ, ID2P(LANG_CANCEL)); | 498 | gui_syncsplash(HZ, ID2P(LANG_CANCEL)); |
@@ -666,18 +662,16 @@ static bool clipboard_copy(void) | |||
666 | } | 662 | } |
667 | 663 | ||
668 | #ifdef HAVE_LCD_BITMAP | 664 | #ifdef HAVE_LCD_BITMAP |
669 | static inline void draw_slider(void) | 665 | static void draw_slider(void) |
670 | { | 666 | { |
671 | int i; | 667 | int i; |
672 | FOR_NB_SCREENS(i) | 668 | FOR_NB_SCREENS(i) |
673 | { | 669 | { |
674 | show_busy_slider(&screens[i], 2, LCD_HEIGHT/4, | 670 | show_busy_slider(&screens[i], 1, LCD_HEIGHT-2*screens[i].char_height, |
675 | LCD_WIDTH-4, screens[i].char_height); | 671 | LCD_WIDTH-2, 2*screens[i].char_height-1); |
676 | screens[i].update(); | 672 | screens[i].update(); |
677 | } | 673 | } |
678 | } | 674 | } |
679 | #else | ||
680 | #define draw_slider() | ||
681 | #endif | 675 | #endif |
682 | 676 | ||
683 | /* Paste a file to a new directory. Will overwrite always. */ | 677 | /* Paste a file to a new directory. Will overwrite always. */ |