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/filetree.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/filetree.c')
-rw-r--r-- | apps/filetree.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index bc4709baab..35be92e4b5 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -342,21 +342,21 @@ int ft_enter(struct tree_context* c) | |||
342 | switch ( file->attr & FILE_ATTR_MASK ) { | 342 | switch ( file->attr & FILE_ATTR_MASK ) { |
343 | case FILE_ATTR_M3U: | 343 | case FILE_ATTR_M3U: |
344 | if (global_settings.party_mode) { | 344 | if (global_settings.party_mode) { |
345 | gui_syncsplash(HZ, str(LANG_PARTY_MODE)); | 345 | gui_syncsplash(HZ, ID2P(LANG_PARTY_MODE)); |
346 | break; | 346 | break; |
347 | } | 347 | } |
348 | 348 | ||
349 | if (bookmark_autoload(buf)) | 349 | if (bookmark_autoload(buf)) |
350 | break; | 350 | break; |
351 | 351 | ||
352 | gui_syncsplash(0, str(LANG_WAIT)); | 352 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
353 | 353 | ||
354 | /* about to create a new current playlist... | 354 | /* about to create a new current playlist... |
355 | allow user to cancel the operation */ | 355 | allow user to cancel the operation */ |
356 | if (global_settings.warnon_erase_dynplaylist && | 356 | if (global_settings.warnon_erase_dynplaylist && |
357 | playlist_modified(NULL)) | 357 | playlist_modified(NULL)) |
358 | { | 358 | { |
359 | char *lines[]={str(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)}; | 359 | char *lines[]={ID2P(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)}; |
360 | struct text_message message={lines, 1}; | 360 | struct text_message message={lines, 1}; |
361 | 361 | ||
362 | if(gui_syncyesno_run(&message, NULL, NULL) != YESNO_YES) | 362 | if(gui_syncyesno_run(&message, NULL, NULL) != YESNO_YES) |
@@ -377,7 +377,7 @@ int ft_enter(struct tree_context* c) | |||
377 | if (bookmark_autoload(c->currdir)) | 377 | if (bookmark_autoload(c->currdir)) |
378 | break; | 378 | break; |
379 | 379 | ||
380 | gui_syncsplash(0, str(LANG_WAIT)); | 380 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
381 | 381 | ||
382 | /* about to create a new current playlist... | 382 | /* about to create a new current playlist... |
383 | allow user to cancel the operation */ | 383 | allow user to cancel the operation */ |
@@ -385,7 +385,7 @@ int ft_enter(struct tree_context* c) | |||
385 | !global_settings.party_mode && | 385 | !global_settings.party_mode && |
386 | playlist_modified(NULL)) | 386 | playlist_modified(NULL)) |
387 | { | 387 | { |
388 | char *lines[]={str(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)}; | 388 | char *lines[]={ID2P(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)}; |
389 | struct text_message message={lines, 1}; | 389 | struct text_message message={lines, 1}; |
390 | 390 | ||
391 | if(gui_syncyesno_run(&message, NULL, NULL) != YESNO_YES) | 391 | if(gui_syncyesno_run(&message, NULL, NULL) != YESNO_YES) |
@@ -396,7 +396,7 @@ int ft_enter(struct tree_context* c) | |||
396 | { | 396 | { |
397 | playlist_insert_track(NULL, buf, | 397 | playlist_insert_track(NULL, buf, |
398 | PLAYLIST_INSERT_LAST, true, true); | 398 | PLAYLIST_INSERT_LAST, true, true); |
399 | gui_syncsplash(HZ, str(LANG_QUEUE_LAST)); | 399 | gui_syncsplash(HZ, ID2P(LANG_QUEUE_LAST)); |
400 | } | 400 | } |
401 | else if (playlist_create(c->currdir, NULL) != -1) | 401 | else if (playlist_create(c->currdir, NULL) != -1) |
402 | { | 402 | { |
@@ -421,7 +421,7 @@ int ft_enter(struct tree_context* c) | |||
421 | /* fmr preset file */ | 421 | /* fmr preset file */ |
422 | case FILE_ATTR_FMR: | 422 | case FILE_ATTR_FMR: |
423 | 423 | ||
424 | gui_syncsplash(0, str(LANG_WAIT)); | 424 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
425 | 425 | ||
426 | /* Preset inside the default folder. */ | 426 | /* Preset inside the default folder. */ |
427 | if(!strncasecmp(FMPRESET_PATH, buf, strlen(FMPRESET_PATH))) | 427 | if(!strncasecmp(FMPRESET_PATH, buf, strlen(FMPRESET_PATH))) |
@@ -448,7 +448,7 @@ int ft_enter(struct tree_context* c) | |||
448 | 448 | ||
449 | /* wps config file */ | 449 | /* wps config file */ |
450 | case FILE_ATTR_WPS: | 450 | case FILE_ATTR_WPS: |
451 | gui_syncsplash(0, str(LANG_WAIT)); | 451 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
452 | #if LCD_DEPTH > 1 | 452 | #if LCD_DEPTH > 1 |
453 | unload_wps_backdrop(); | 453 | unload_wps_backdrop(); |
454 | #endif | 454 | #endif |
@@ -460,7 +460,7 @@ int ft_enter(struct tree_context* c) | |||
460 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) | 460 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
461 | /* remote-wps config file */ | 461 | /* remote-wps config file */ |
462 | case FILE_ATTR_RWPS: | 462 | case FILE_ATTR_RWPS: |
463 | gui_syncsplash(0, str(LANG_WAIT)); | 463 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
464 | #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 | 464 | #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 |
465 | unload_remote_wps_backdrop(); | 465 | unload_remote_wps_backdrop(); |
466 | #endif | 466 | #endif |
@@ -471,39 +471,39 @@ int ft_enter(struct tree_context* c) | |||
471 | #endif | 471 | #endif |
472 | 472 | ||
473 | case FILE_ATTR_CFG: | 473 | case FILE_ATTR_CFG: |
474 | gui_syncsplash(0, str(LANG_WAIT)); | 474 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
475 | if (!settings_load_config(buf,true)) | 475 | if (!settings_load_config(buf,true)) |
476 | break; | 476 | break; |
477 | gui_syncsplash(HZ, str(LANG_SETTINGS_LOADED)); | 477 | gui_syncsplash(HZ, ID2P(LANG_SETTINGS_LOADED)); |
478 | break; | 478 | break; |
479 | 479 | ||
480 | case FILE_ATTR_BMARK: | 480 | case FILE_ATTR_BMARK: |
481 | gui_syncsplash(0, str(LANG_WAIT)); | 481 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
482 | bookmark_load(buf, false); | 482 | bookmark_load(buf, false); |
483 | reload_dir = true; | 483 | reload_dir = true; |
484 | break; | 484 | break; |
485 | 485 | ||
486 | case FILE_ATTR_LNG: | 486 | case FILE_ATTR_LNG: |
487 | gui_syncsplash(0, str(LANG_WAIT)); | 487 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
488 | if(!lang_load(buf)) { | 488 | if(!lang_load(buf)) { |
489 | set_file(buf, (char *)global_settings.lang_file, | 489 | set_file(buf, (char *)global_settings.lang_file, |
490 | MAX_FILENAME); | 490 | MAX_FILENAME); |
491 | talk_init(); /* use voice of same language */ | 491 | talk_init(); /* use voice of same language */ |
492 | gui_syncsplash(HZ, str(LANG_LANGUAGE_LOADED)); | 492 | gui_syncsplash(HZ, ID2P(LANG_LANGUAGE_LOADED)); |
493 | } | 493 | } |
494 | break; | 494 | break; |
495 | 495 | ||
496 | #ifdef HAVE_LCD_BITMAP | 496 | #ifdef HAVE_LCD_BITMAP |
497 | case FILE_ATTR_FONT: | 497 | case FILE_ATTR_FONT: |
498 | gui_syncsplash(0, str(LANG_WAIT)); | 498 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
499 | font_load(buf); | 499 | font_load(buf); |
500 | set_file(buf, (char *)global_settings.font_file, MAX_FILENAME); | 500 | set_file(buf, (char *)global_settings.font_file, MAX_FILENAME); |
501 | break; | 501 | break; |
502 | 502 | ||
503 | case FILE_ATTR_KBD: | 503 | case FILE_ATTR_KBD: |
504 | gui_syncsplash(0, str(LANG_WAIT)); | 504 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
505 | if (!load_kbd(buf)) | 505 | if (!load_kbd(buf)) |
506 | gui_syncsplash(HZ, str(LANG_KEYBOARD_LOADED)); | 506 | gui_syncsplash(HZ, ID2P(LANG_KEYBOARD_LOADED)); |
507 | set_file(buf, (char *)global_settings.kbd_file, MAX_FILENAME); | 507 | set_file(buf, (char *)global_settings.kbd_file, MAX_FILENAME); |
508 | break; | 508 | break; |
509 | #endif | 509 | #endif |
@@ -511,7 +511,7 @@ int ft_enter(struct tree_context* c) | |||
511 | #ifndef SIMULATOR | 511 | #ifndef SIMULATOR |
512 | /* firmware file */ | 512 | /* firmware file */ |
513 | case FILE_ATTR_MOD: | 513 | case FILE_ATTR_MOD: |
514 | gui_syncsplash(0, str(LANG_WAIT)); | 514 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
515 | rolo_load(buf); | 515 | rolo_load(buf); |
516 | break; | 516 | break; |
517 | #endif | 517 | #endif |
@@ -519,11 +519,11 @@ int ft_enter(struct tree_context* c) | |||
519 | /* plugin file */ | 519 | /* plugin file */ |
520 | case FILE_ATTR_ROCK: | 520 | case FILE_ATTR_ROCK: |
521 | if (global_settings.party_mode) { | 521 | if (global_settings.party_mode) { |
522 | gui_syncsplash(HZ, str(LANG_PARTY_MODE)); | 522 | gui_syncsplash(HZ, ID2P(LANG_PARTY_MODE)); |
523 | break; | 523 | break; |
524 | } | 524 | } |
525 | 525 | ||
526 | gui_syncsplash(0, str(LANG_WAIT)); | 526 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
527 | 527 | ||
528 | if (plugin_load(buf,NULL) == PLUGIN_USB_CONNECTED) | 528 | if (plugin_load(buf,NULL) == PLUGIN_USB_CONNECTED) |
529 | { | 529 | { |
@@ -545,7 +545,7 @@ int ft_enter(struct tree_context* c) | |||
545 | char* plugin; | 545 | char* plugin; |
546 | 546 | ||
547 | if (global_settings.party_mode) { | 547 | if (global_settings.party_mode) { |
548 | gui_syncsplash(HZ, str(LANG_PARTY_MODE)); | 548 | gui_syncsplash(HZ, ID2P(LANG_PARTY_MODE)); |
549 | break; | 549 | break; |
550 | } | 550 | } |
551 | 551 | ||