From 5b76936a44de3c7ecd568300f26b5e6421901285 Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Mon, 6 Aug 2007 13:08:36 +0000 Subject: 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 --- apps/filetree.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'apps/filetree.c') 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) switch ( file->attr & FILE_ATTR_MASK ) { case FILE_ATTR_M3U: if (global_settings.party_mode) { - gui_syncsplash(HZ, str(LANG_PARTY_MODE)); + gui_syncsplash(HZ, ID2P(LANG_PARTY_MODE)); break; } if (bookmark_autoload(buf)) break; - gui_syncsplash(0, str(LANG_WAIT)); + gui_syncsplash(0, ID2P(LANG_WAIT)); /* about to create a new current playlist... allow user to cancel the operation */ if (global_settings.warnon_erase_dynplaylist && playlist_modified(NULL)) { - char *lines[]={str(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)}; + char *lines[]={ID2P(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)}; struct text_message message={lines, 1}; if(gui_syncyesno_run(&message, NULL, NULL) != YESNO_YES) @@ -377,7 +377,7 @@ int ft_enter(struct tree_context* c) if (bookmark_autoload(c->currdir)) break; - gui_syncsplash(0, str(LANG_WAIT)); + gui_syncsplash(0, ID2P(LANG_WAIT)); /* about to create a new current playlist... allow user to cancel the operation */ @@ -385,7 +385,7 @@ int ft_enter(struct tree_context* c) !global_settings.party_mode && playlist_modified(NULL)) { - char *lines[]={str(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)}; + char *lines[]={ID2P(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)}; struct text_message message={lines, 1}; if(gui_syncyesno_run(&message, NULL, NULL) != YESNO_YES) @@ -396,7 +396,7 @@ int ft_enter(struct tree_context* c) { playlist_insert_track(NULL, buf, PLAYLIST_INSERT_LAST, true, true); - gui_syncsplash(HZ, str(LANG_QUEUE_LAST)); + gui_syncsplash(HZ, ID2P(LANG_QUEUE_LAST)); } else if (playlist_create(c->currdir, NULL) != -1) { @@ -421,7 +421,7 @@ int ft_enter(struct tree_context* c) /* fmr preset file */ case FILE_ATTR_FMR: - gui_syncsplash(0, str(LANG_WAIT)); + gui_syncsplash(0, ID2P(LANG_WAIT)); /* Preset inside the default folder. */ if(!strncasecmp(FMPRESET_PATH, buf, strlen(FMPRESET_PATH))) @@ -448,7 +448,7 @@ int ft_enter(struct tree_context* c) /* wps config file */ case FILE_ATTR_WPS: - gui_syncsplash(0, str(LANG_WAIT)); + gui_syncsplash(0, ID2P(LANG_WAIT)); #if LCD_DEPTH > 1 unload_wps_backdrop(); #endif @@ -460,7 +460,7 @@ int ft_enter(struct tree_context* c) #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) /* remote-wps config file */ case FILE_ATTR_RWPS: - gui_syncsplash(0, str(LANG_WAIT)); + gui_syncsplash(0, ID2P(LANG_WAIT)); #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 unload_remote_wps_backdrop(); #endif @@ -471,39 +471,39 @@ int ft_enter(struct tree_context* c) #endif case FILE_ATTR_CFG: - gui_syncsplash(0, str(LANG_WAIT)); + gui_syncsplash(0, ID2P(LANG_WAIT)); if (!settings_load_config(buf,true)) break; - gui_syncsplash(HZ, str(LANG_SETTINGS_LOADED)); + gui_syncsplash(HZ, ID2P(LANG_SETTINGS_LOADED)); break; case FILE_ATTR_BMARK: - gui_syncsplash(0, str(LANG_WAIT)); + gui_syncsplash(0, ID2P(LANG_WAIT)); bookmark_load(buf, false); reload_dir = true; break; case FILE_ATTR_LNG: - gui_syncsplash(0, str(LANG_WAIT)); + gui_syncsplash(0, ID2P(LANG_WAIT)); if(!lang_load(buf)) { set_file(buf, (char *)global_settings.lang_file, MAX_FILENAME); talk_init(); /* use voice of same language */ - gui_syncsplash(HZ, str(LANG_LANGUAGE_LOADED)); + gui_syncsplash(HZ, ID2P(LANG_LANGUAGE_LOADED)); } break; #ifdef HAVE_LCD_BITMAP case FILE_ATTR_FONT: - gui_syncsplash(0, str(LANG_WAIT)); + gui_syncsplash(0, ID2P(LANG_WAIT)); font_load(buf); set_file(buf, (char *)global_settings.font_file, MAX_FILENAME); break; case FILE_ATTR_KBD: - gui_syncsplash(0, str(LANG_WAIT)); + gui_syncsplash(0, ID2P(LANG_WAIT)); if (!load_kbd(buf)) - gui_syncsplash(HZ, str(LANG_KEYBOARD_LOADED)); + gui_syncsplash(HZ, ID2P(LANG_KEYBOARD_LOADED)); set_file(buf, (char *)global_settings.kbd_file, MAX_FILENAME); break; #endif @@ -511,7 +511,7 @@ int ft_enter(struct tree_context* c) #ifndef SIMULATOR /* firmware file */ case FILE_ATTR_MOD: - gui_syncsplash(0, str(LANG_WAIT)); + gui_syncsplash(0, ID2P(LANG_WAIT)); rolo_load(buf); break; #endif @@ -519,11 +519,11 @@ int ft_enter(struct tree_context* c) /* plugin file */ case FILE_ATTR_ROCK: if (global_settings.party_mode) { - gui_syncsplash(HZ, str(LANG_PARTY_MODE)); + gui_syncsplash(HZ, ID2P(LANG_PARTY_MODE)); break; } - gui_syncsplash(0, str(LANG_WAIT)); + gui_syncsplash(0, ID2P(LANG_WAIT)); if (plugin_load(buf,NULL) == PLUGIN_USB_CONNECTED) { @@ -545,7 +545,7 @@ int ft_enter(struct tree_context* c) char* plugin; if (global_settings.party_mode) { - gui_syncsplash(HZ, str(LANG_PARTY_MODE)); + gui_syncsplash(HZ, ID2P(LANG_PARTY_MODE)); break; } -- cgit v1.2.3