diff options
author | Nils Wallménius <nils@rockbox.org> | 2007-08-06 13:08:36 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2007-08-06 13:08:36 +0000 |
commit | 5b76936a44de3c7ecd568300f26b5e6421901285 (patch) | |
tree | 504d9cf371d8f64c70a7bb40469a3a6f05a1b7cd /apps/onplay.c | |
parent | d755c283caef258ae5d81278d324f907fcf402c8 (diff) | |
download | rockbox-5b76936a44de3c7ecd568300f26b5e6421901285.tar.gz rockbox-5b76936a44de3c7ecd568300f26b5e6421901285.zip |
Accept FS#6159 'Add voice to roughly 100 splash screens and yes-no menus' by Stephane Doyon with some minor tweaks by me. Rerun 'configure' and do a 'make clean' before rebuilding your voice files.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14213 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/onplay.c')
-rw-r--r-- | apps/onplay.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/apps/onplay.c b/apps/onplay.c index 6c34d18d74..4921e7e428 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -160,12 +160,12 @@ static bool add_to_playlist(int position, bool queue) | |||
160 | { | 160 | { |
161 | bool new_playlist = !(audio_status() & AUDIO_STATUS_PLAY); | 161 | bool new_playlist = !(audio_status() & AUDIO_STATUS_PLAY); |
162 | char *lines[] = { | 162 | char *lines[] = { |
163 | (char *)str(LANG_RECURSE_DIRECTORY_QUESTION), | 163 | ID2P(LANG_RECURSE_DIRECTORY_QUESTION), |
164 | selected_file | 164 | selected_file |
165 | }; | 165 | }; |
166 | struct text_message message={lines, 2}; | 166 | struct text_message message={lines, 2}; |
167 | 167 | ||
168 | gui_syncsplash(0, str(LANG_WAIT)); | 168 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
169 | 169 | ||
170 | if (new_playlist) | 170 | if (new_playlist) |
171 | playlist_create(NULL, NULL); | 171 | playlist_create(NULL, NULL); |
@@ -502,7 +502,7 @@ static int remove_dir(char* dirname, int len) | |||
502 | #endif | 502 | #endif |
503 | if(ACTION_STD_CANCEL == get_action(CONTEXT_STD,TIMEOUT_NOBLOCK)) | 503 | if(ACTION_STD_CANCEL == get_action(CONTEXT_STD,TIMEOUT_NOBLOCK)) |
504 | { | 504 | { |
505 | gui_syncsplash(HZ, str(LANG_CANCEL)); | 505 | gui_syncsplash(HZ, ID2P(LANG_CANCEL)); |
506 | result = -1; | 506 | result = -1; |
507 | break; | 507 | break; |
508 | } | 508 | } |
@@ -524,11 +524,11 @@ static int remove_dir(char* dirname, int len) | |||
524 | static bool delete_handler(bool is_dir) | 524 | static bool delete_handler(bool is_dir) |
525 | { | 525 | { |
526 | char *lines[]={ | 526 | char *lines[]={ |
527 | (char *)str(LANG_REALLY_DELETE), | 527 | ID2P(LANG_REALLY_DELETE), |
528 | selected_file | 528 | selected_file |
529 | }; | 529 | }; |
530 | char *yes_lines[]={ | 530 | char *yes_lines[]={ |
531 | (char *)str(LANG_DELETED), | 531 | ID2P(LANG_DELETED), |
532 | selected_file | 532 | selected_file |
533 | }; | 533 | }; |
534 | 534 | ||
@@ -599,6 +599,7 @@ static bool rename_file(void) | |||
599 | lcd_puts(0,0,str(LANG_RENAME)); | 599 | lcd_puts(0,0,str(LANG_RENAME)); |
600 | lcd_puts(0,1,str(LANG_FAILED)); | 600 | lcd_puts(0,1,str(LANG_FAILED)); |
601 | lcd_update(); | 601 | lcd_update(); |
602 | cond_talk_ids_fq(LANG_RENAME, LANG_FAILED); | ||
602 | sleep(HZ*2); | 603 | sleep(HZ*2); |
603 | } | 604 | } |
604 | else | 605 | else |
@@ -628,6 +629,7 @@ static bool create_dir(void) | |||
628 | 629 | ||
629 | rc = mkdir(dirname); | 630 | rc = mkdir(dirname); |
630 | if (rc < 0) { | 631 | if (rc < 0) { |
632 | cond_talk_ids_fq(LANG_CREATE_DIR, LANG_FAILED); | ||
631 | gui_syncsplash(HZ, (unsigned char *)"%s %s", | 633 | gui_syncsplash(HZ, (unsigned char *)"%s %s", |
632 | str(LANG_CREATE_DIR), str(LANG_FAILED)); | 634 | str(LANG_CREATE_DIR), str(LANG_FAILED)); |
633 | } else { | 635 | } else { |
@@ -873,7 +875,7 @@ static bool clipboard_paste(void) | |||
873 | bool success; | 875 | bool success; |
874 | int target_fd; | 876 | int target_fd; |
875 | 877 | ||
876 | unsigned char *lines[]={str(LANG_REALLY_OVERWRITE)}; | 878 | unsigned char *lines[]={ID2P(LANG_REALLY_OVERWRITE)}; |
877 | struct text_message message={(char **)lines, 1}; | 879 | struct text_message message={(char **)lines, 1}; |
878 | 880 | ||
879 | /* Get the name of the current directory */ | 881 | /* Get the name of the current directory */ |
@@ -896,11 +898,11 @@ static bool clipboard_paste(void) | |||
896 | } | 898 | } |
897 | 899 | ||
898 | if (clipboard_is_copy) { | 900 | if (clipboard_is_copy) { |
899 | gui_syncsplash(0, str(LANG_COPYING)); | 901 | gui_syncsplash(0, ID2P(LANG_COPYING)); |
900 | } | 902 | } |
901 | else | 903 | else |
902 | { | 904 | { |
903 | gui_syncsplash(0, str(LANG_MOVING)); | 905 | gui_syncsplash(0, ID2P(LANG_MOVING)); |
904 | } | 906 | } |
905 | 907 | ||
906 | /* Now figure out what we're doing */ | 908 | /* Now figure out what we're doing */ |
@@ -939,6 +941,7 @@ static bool clipboard_paste(void) | |||
939 | /* Force reload of the current directory */ | 941 | /* Force reload of the current directory */ |
940 | onplay_result = ONPLAY_RELOAD_DIR; | 942 | onplay_result = ONPLAY_RELOAD_DIR; |
941 | } else { | 943 | } else { |
944 | cond_talk_ids_fq(LANG_PASTE, LANG_FAILED); | ||
942 | gui_syncsplash(HZ, (unsigned char *)"%s %s", | 945 | gui_syncsplash(HZ, (unsigned char *)"%s %s", |
943 | str(LANG_PASTE), str(LANG_FAILED)); | 946 | str(LANG_PASTE), str(LANG_FAILED)); |
944 | } | 947 | } |