diff options
Diffstat (limited to 'apps/filetree.c')
-rw-r--r-- | apps/filetree.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index dd3cb5452d..2b883db8ea 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -92,7 +92,7 @@ bool ft_play_playlist(char* pathname, char* dirname, char* filename) | |||
92 | { | 92 | { |
93 | if (global_settings.party_mode) | 93 | if (global_settings.party_mode) |
94 | { | 94 | { |
95 | gui_syncsplash(HZ, ID2P(LANG_PARTY_MODE)); | 95 | splash(HZ, ID2P(LANG_PARTY_MODE)); |
96 | return false; | 96 | return false; |
97 | } | 97 | } |
98 | 98 | ||
@@ -101,7 +101,7 @@ bool ft_play_playlist(char* pathname, char* dirname, char* filename) | |||
101 | return false; | 101 | return false; |
102 | } | 102 | } |
103 | 103 | ||
104 | gui_syncsplash(0, ID2P(LANG_WAIT)); | 104 | splash(0, ID2P(LANG_WAIT)); |
105 | 105 | ||
106 | /* about to create a new current playlist... | 106 | /* about to create a new current playlist... |
107 | allow user to cancel the operation */ | 107 | allow user to cancel the operation */ |
@@ -397,7 +397,7 @@ int ft_enter(struct tree_context* c) | |||
397 | if (bookmark_autoload(c->currdir)) | 397 | if (bookmark_autoload(c->currdir)) |
398 | break; | 398 | break; |
399 | 399 | ||
400 | gui_syncsplash(0, ID2P(LANG_WAIT)); | 400 | splash(0, ID2P(LANG_WAIT)); |
401 | 401 | ||
402 | /* about to create a new current playlist... | 402 | /* about to create a new current playlist... |
403 | allow user to cancel the operation */ | 403 | allow user to cancel the operation */ |
@@ -408,7 +408,7 @@ int ft_enter(struct tree_context* c) | |||
408 | { | 408 | { |
409 | playlist_insert_track(NULL, buf, | 409 | playlist_insert_track(NULL, buf, |
410 | PLAYLIST_INSERT_LAST, true, true); | 410 | PLAYLIST_INSERT_LAST, true, true); |
411 | gui_syncsplash(HZ, ID2P(LANG_QUEUE_LAST)); | 411 | splash(HZ, ID2P(LANG_QUEUE_LAST)); |
412 | } | 412 | } |
413 | else if (playlist_create(c->currdir, NULL) != -1) | 413 | else if (playlist_create(c->currdir, NULL) != -1) |
414 | { | 414 | { |
@@ -432,8 +432,7 @@ int ft_enter(struct tree_context* c) | |||
432 | #if CONFIG_TUNER | 432 | #if CONFIG_TUNER |
433 | /* fmr preset file */ | 433 | /* fmr preset file */ |
434 | case FILE_ATTR_FMR: | 434 | case FILE_ATTR_FMR: |
435 | 435 | splash(0, ID2P(LANG_WAIT)); | |
436 | gui_syncsplash(0, ID2P(LANG_WAIT)); | ||
437 | 436 | ||
438 | /* Preset inside the default folder. */ | 437 | /* Preset inside the default folder. */ |
439 | if(!strncasecmp(FMPRESET_PATH, buf, strlen(FMPRESET_PATH))) | 438 | if(!strncasecmp(FMPRESET_PATH, buf, strlen(FMPRESET_PATH))) |
@@ -460,7 +459,7 @@ int ft_enter(struct tree_context* c) | |||
460 | 459 | ||
461 | /* wps config file */ | 460 | /* wps config file */ |
462 | case FILE_ATTR_WPS: | 461 | case FILE_ATTR_WPS: |
463 | gui_syncsplash(0, ID2P(LANG_WAIT)); | 462 | splash(0, ID2P(LANG_WAIT)); |
464 | #if LCD_DEPTH > 1 | 463 | #if LCD_DEPTH > 1 |
465 | unload_wps_backdrop(); | 464 | unload_wps_backdrop(); |
466 | #endif | 465 | #endif |
@@ -472,7 +471,7 @@ int ft_enter(struct tree_context* c) | |||
472 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) | 471 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
473 | /* remote-wps config file */ | 472 | /* remote-wps config file */ |
474 | case FILE_ATTR_RWPS: | 473 | case FILE_ATTR_RWPS: |
475 | gui_syncsplash(0, ID2P(LANG_WAIT)); | 474 | splash(0, ID2P(LANG_WAIT)); |
476 | #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 | 475 | #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 |
477 | unload_remote_wps_backdrop(); | 476 | unload_remote_wps_backdrop(); |
478 | #endif | 477 | #endif |
@@ -483,39 +482,39 @@ int ft_enter(struct tree_context* c) | |||
483 | #endif | 482 | #endif |
484 | 483 | ||
485 | case FILE_ATTR_CFG: | 484 | case FILE_ATTR_CFG: |
486 | gui_syncsplash(0, ID2P(LANG_WAIT)); | 485 | splash(0, ID2P(LANG_WAIT)); |
487 | if (!settings_load_config(buf,true)) | 486 | if (!settings_load_config(buf,true)) |
488 | break; | 487 | break; |
489 | gui_syncsplash(HZ, ID2P(LANG_SETTINGS_LOADED)); | 488 | splash(HZ, ID2P(LANG_SETTINGS_LOADED)); |
490 | break; | 489 | break; |
491 | 490 | ||
492 | case FILE_ATTR_BMARK: | 491 | case FILE_ATTR_BMARK: |
493 | gui_syncsplash(0, ID2P(LANG_WAIT)); | 492 | splash(0, ID2P(LANG_WAIT)); |
494 | bookmark_load(buf, false); | 493 | bookmark_load(buf, false); |
495 | reload_dir = true; | 494 | reload_dir = true; |
496 | break; | 495 | break; |
497 | 496 | ||
498 | case FILE_ATTR_LNG: | 497 | case FILE_ATTR_LNG: |
499 | gui_syncsplash(0, ID2P(LANG_WAIT)); | 498 | splash(0, ID2P(LANG_WAIT)); |
500 | if(!lang_load(buf)) { | 499 | if(!lang_load(buf)) { |
501 | set_file(buf, (char *)global_settings.lang_file, | 500 | set_file(buf, (char *)global_settings.lang_file, |
502 | MAX_FILENAME); | 501 | MAX_FILENAME); |
503 | talk_init(); /* use voice of same language */ | 502 | talk_init(); /* use voice of same language */ |
504 | gui_syncsplash(HZ, ID2P(LANG_LANGUAGE_LOADED)); | 503 | splash(HZ, ID2P(LANG_LANGUAGE_LOADED)); |
505 | } | 504 | } |
506 | break; | 505 | break; |
507 | 506 | ||
508 | #ifdef HAVE_LCD_BITMAP | 507 | #ifdef HAVE_LCD_BITMAP |
509 | case FILE_ATTR_FONT: | 508 | case FILE_ATTR_FONT: |
510 | gui_syncsplash(0, ID2P(LANG_WAIT)); | 509 | splash(0, ID2P(LANG_WAIT)); |
511 | font_load(buf); | 510 | font_load(buf); |
512 | set_file(buf, (char *)global_settings.font_file, MAX_FILENAME); | 511 | set_file(buf, (char *)global_settings.font_file, MAX_FILENAME); |
513 | break; | 512 | break; |
514 | 513 | ||
515 | case FILE_ATTR_KBD: | 514 | case FILE_ATTR_KBD: |
516 | gui_syncsplash(0, ID2P(LANG_WAIT)); | 515 | splash(0, ID2P(LANG_WAIT)); |
517 | if (!load_kbd(buf)) | 516 | if (!load_kbd(buf)) |
518 | gui_syncsplash(HZ, ID2P(LANG_KEYBOARD_LOADED)); | 517 | splash(HZ, ID2P(LANG_KEYBOARD_LOADED)); |
519 | set_file(buf, (char *)global_settings.kbd_file, MAX_FILENAME); | 518 | set_file(buf, (char *)global_settings.kbd_file, MAX_FILENAME); |
520 | break; | 519 | break; |
521 | #endif | 520 | #endif |
@@ -523,7 +522,7 @@ int ft_enter(struct tree_context* c) | |||
523 | #ifndef SIMULATOR | 522 | #ifndef SIMULATOR |
524 | /* firmware file */ | 523 | /* firmware file */ |
525 | case FILE_ATTR_MOD: | 524 | case FILE_ATTR_MOD: |
526 | gui_syncsplash(0, ID2P(LANG_WAIT)); | 525 | splash(0, ID2P(LANG_WAIT)); |
527 | rolo_load(buf); | 526 | rolo_load(buf); |
528 | break; | 527 | break; |
529 | #endif | 528 | #endif |
@@ -531,7 +530,7 @@ int ft_enter(struct tree_context* c) | |||
531 | /* plugin file */ | 530 | /* plugin file */ |
532 | case FILE_ATTR_ROCK: | 531 | case FILE_ATTR_ROCK: |
533 | if (global_settings.party_mode) { | 532 | if (global_settings.party_mode) { |
534 | gui_syncsplash(HZ, ID2P(LANG_PARTY_MODE)); | 533 | splash(HZ, ID2P(LANG_PARTY_MODE)); |
535 | break; | 534 | break; |
536 | } | 535 | } |
537 | 536 | ||
@@ -555,7 +554,7 @@ int ft_enter(struct tree_context* c) | |||
555 | const char* plugin; | 554 | const char* plugin; |
556 | 555 | ||
557 | if (global_settings.party_mode) { | 556 | if (global_settings.party_mode) { |
558 | gui_syncsplash(HZ, ID2P(LANG_PARTY_MODE)); | 557 | splash(HZ, ID2P(LANG_PARTY_MODE)); |
559 | break; | 558 | break; |
560 | } | 559 | } |
561 | 560 | ||