diff options
Diffstat (limited to 'apps/onplay.c')
-rw-r--r-- | apps/onplay.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/apps/onplay.c b/apps/onplay.c index 2a70415b51..9ca0c6743e 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -166,7 +166,7 @@ static bool add_to_playlist(int position, bool queue) | |||
166 | }; | 166 | }; |
167 | const struct text_message message={lines, 2}; | 167 | const struct text_message message={lines, 2}; |
168 | 168 | ||
169 | gui_syncsplash(0, ID2P(LANG_WAIT)); | 169 | splash(0, ID2P(LANG_WAIT)); |
170 | 170 | ||
171 | if (new_playlist) | 171 | if (new_playlist) |
172 | playlist_create(NULL, NULL); | 172 | playlist_create(NULL, NULL); |
@@ -476,7 +476,7 @@ static int remove_dir(char* dirname, int len) | |||
476 | break; | 476 | break; |
477 | 477 | ||
478 | dirname[dirlen] ='\0'; | 478 | dirname[dirlen] ='\0'; |
479 | gui_syncsplash(0, dirname); | 479 | splash(0, dirname); |
480 | 480 | ||
481 | /* append name to current directory */ | 481 | /* append name to current directory */ |
482 | snprintf(dirname+dirlen, len-dirlen, "/%s", entry->d_name); | 482 | snprintf(dirname+dirlen, len-dirlen, "/%s", entry->d_name); |
@@ -499,7 +499,7 @@ static int remove_dir(char* dirname, int len) | |||
499 | } | 499 | } |
500 | if(ACTION_STD_CANCEL == get_action(CONTEXT_STD,TIMEOUT_NOBLOCK)) | 500 | if(ACTION_STD_CANCEL == get_action(CONTEXT_STD,TIMEOUT_NOBLOCK)) |
501 | { | 501 | { |
502 | gui_syncsplash(HZ, ID2P(LANG_CANCEL)); | 502 | splash(HZ, ID2P(LANG_CANCEL)); |
503 | result = -1; | 503 | result = -1; |
504 | break; | 504 | break; |
505 | } | 505 | } |
@@ -538,7 +538,7 @@ static bool delete_handler(bool is_dir) | |||
538 | if(gui_syncyesno_run(&message, &yes_message, NULL)!=YESNO_YES) | 538 | if(gui_syncyesno_run(&message, &yes_message, NULL)!=YESNO_YES) |
539 | return false; | 539 | return false; |
540 | 540 | ||
541 | gui_syncsplash(0, str(LANG_DELETING)); | 541 | splash(0, str(LANG_DELETING)); |
542 | 542 | ||
543 | int res; | 543 | int res; |
544 | if (is_dir) | 544 | if (is_dir) |
@@ -574,13 +574,13 @@ static bool set_backdrop(void) | |||
574 | { | 574 | { |
575 | /* load the image */ | 575 | /* load the image */ |
576 | if(load_main_backdrop(selected_file)) { | 576 | if(load_main_backdrop(selected_file)) { |
577 | gui_syncsplash(HZ, str(LANG_BACKDROP_LOADED)); | 577 | splash(HZ, str(LANG_BACKDROP_LOADED)); |
578 | set_file(selected_file, (char *)global_settings.backdrop_file, | 578 | set_file(selected_file, (char *)global_settings.backdrop_file, |
579 | MAX_FILENAME); | 579 | MAX_FILENAME); |
580 | show_main_backdrop(); | 580 | show_main_backdrop(); |
581 | return true; | 581 | return true; |
582 | } else { | 582 | } else { |
583 | gui_syncsplash(HZ, str(LANG_BACKDROP_FAILED)); | 583 | splash(HZ, str(LANG_BACKDROP_FAILED)); |
584 | return false; | 584 | return false; |
585 | } | 585 | } |
586 | } | 586 | } |
@@ -630,8 +630,8 @@ static bool create_dir(void) | |||
630 | rc = mkdir(dirname); | 630 | rc = mkdir(dirname); |
631 | if (rc < 0) { | 631 | if (rc < 0) { |
632 | cond_talk_ids_fq(LANG_CREATE_DIR, LANG_FAILED); | 632 | cond_talk_ids_fq(LANG_CREATE_DIR, LANG_FAILED); |
633 | gui_syncsplash(HZ, (unsigned char *)"%s %s", | 633 | splashf(HZ, (unsigned char *)"%s %s", str(LANG_CREATE_DIR), |
634 | str(LANG_CREATE_DIR), str(LANG_FAILED)); | 634 | str(LANG_FAILED)); |
635 | } else { | 635 | } else { |
636 | onplay_result = ONPLAY_RELOAD_DIR; | 636 | onplay_result = ONPLAY_RELOAD_DIR; |
637 | } | 637 | } |
@@ -886,11 +886,11 @@ static bool clipboard_paste(void) | |||
886 | } | 886 | } |
887 | 887 | ||
888 | if (clipboard_is_copy) { | 888 | if (clipboard_is_copy) { |
889 | gui_syncsplash(0, ID2P(LANG_COPYING)); | 889 | splash(0, ID2P(LANG_COPYING)); |
890 | } | 890 | } |
891 | else | 891 | else |
892 | { | 892 | { |
893 | gui_syncsplash(0, ID2P(LANG_MOVING)); | 893 | splash(0, ID2P(LANG_MOVING)); |
894 | } | 894 | } |
895 | 895 | ||
896 | /* Now figure out what we're doing */ | 896 | /* Now figure out what we're doing */ |
@@ -930,8 +930,8 @@ static bool clipboard_paste(void) | |||
930 | onplay_result = ONPLAY_RELOAD_DIR; | 930 | onplay_result = ONPLAY_RELOAD_DIR; |
931 | } else { | 931 | } else { |
932 | cond_talk_ids_fq(LANG_PASTE, LANG_FAILED); | 932 | cond_talk_ids_fq(LANG_PASTE, LANG_FAILED); |
933 | gui_syncsplash(HZ, (unsigned char *)"%s %s", | 933 | splashf(HZ, (unsigned char *)"%s %s", str(LANG_PASTE), |
934 | str(LANG_PASTE), str(LANG_FAILED)); | 934 | str(LANG_FAILED)); |
935 | } | 935 | } |
936 | 936 | ||
937 | return true; | 937 | return true; |
@@ -949,7 +949,7 @@ static int set_rating_inline(void) | |||
949 | tagcache_update_numeric(id3->tagcache_idx-1, tag_rating, id3->rating); | 949 | tagcache_update_numeric(id3->tagcache_idx-1, tag_rating, id3->rating); |
950 | } | 950 | } |
951 | else | 951 | else |
952 | gui_syncsplash(HZ*2, ID2P(LANG_ID3_NO_INFO)); | 952 | splash(HZ*2, ID2P(LANG_ID3_NO_INFO)); |
953 | return 0; | 953 | return 0; |
954 | } | 954 | } |
955 | static int ratingitem_callback(int action,const struct menu_item_ex *this_item) | 955 | static int ratingitem_callback(int action,const struct menu_item_ex *this_item) |