Index: rockbox-devel/apps/bookmark.c =================================================================== --- rockbox-devel.orig/apps/bookmark.c +++ rockbox-devel/apps/bookmark.c @@ -267,9 +267,9 @@ static bool write_bookmark(bool create_b } if (success) - gui_syncsplash(HZ, true, str(LANG_BOOKMARK_CREATE_SUCCESS)); + gui_syncsplash(HZ, true, ID2P(LANG_BOOKMARK_CREATE_SUCCESS)); else - gui_syncsplash(HZ, true, str(LANG_BOOKMARK_CREATE_FAILURE)); + gui_syncsplash(HZ, true, ID2P(LANG_BOOKMARK_CREATE_FAILURE)); return true; } @@ -592,7 +592,7 @@ static char* select_bookmark(const char* /* if there were no bookmarks in the file, delete the file and exit. */ if(bookmark_id <= 0) { - gui_syncsplash(HZ, true, str(LANG_BOOKMARK_LOAD_EMPTY)); + gui_syncsplash(HZ, true, ID2P(LANG_BOOKMARK_LOAD_EMPTY)); remove(bookmark_file_name); action_signalscreenchange(); return NULL; Index: rockbox-devel/apps/filetree.c =================================================================== --- rockbox-devel.orig/apps/filetree.c +++ rockbox-devel/apps/filetree.c @@ -359,21 +359,21 @@ int ft_enter(struct tree_context* c) switch ( file->attr & TREE_ATTR_MASK ) { case TREE_ATTR_M3U: if (global_settings.party_mode) { - gui_syncsplash(HZ, true, str(LANG_PARTY_MODE)); + gui_syncsplash(HZ, true, ID2P(LANG_PARTY_MODE)); break; } if (bookmark_autoload(buf)) break; - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, 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) @@ -394,7 +394,7 @@ int ft_enter(struct tree_context* c) if (bookmark_autoload(c->currdir)) break; - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); /* about to create a new current playlist... allow user to cancel the operation */ @@ -402,7 +402,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) @@ -413,7 +413,7 @@ int ft_enter(struct tree_context* c) { playlist_insert_track(NULL, buf, PLAYLIST_INSERT_LAST, true, true); - gui_syncsplash(HZ, true, str(LANG_QUEUE_LAST)); + gui_syncsplash(HZ, true, ID2P(LANG_QUEUE_LAST)); } else if (playlist_create(c->currdir, NULL) != -1) { @@ -438,7 +438,7 @@ int ft_enter(struct tree_context* c) /* fmr preset file */ case TREE_ATTR_FMR: - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); /* Preset inside the default folder. */ if(!strncasecmp(FMPRESET_PATH, buf, strlen(FMPRESET_PATH))) @@ -465,7 +465,7 @@ int ft_enter(struct tree_context* c) /* wps config file */ case TREE_ATTR_WPS: - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); #ifdef HAVE_LCD_COLOR unload_wps_backdrop(); #endif @@ -477,7 +477,7 @@ int ft_enter(struct tree_context* c) #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) /* remote-wps config file */ case TREE_ATTR_RWPS: - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); wps_data_load(gui_wps[1].data, buf, true); set_file(buf, (char *)global_settings.rwps_file, MAX_FILENAME); @@ -485,39 +485,39 @@ int ft_enter(struct tree_context* c) #endif case TREE_ATTR_CFG: - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); if (!settings_load_config(buf)) break; - gui_syncsplash(HZ, true, str(LANG_SETTINGS_LOADED)); + gui_syncsplash(HZ, true, ID2P(LANG_SETTINGS_LOADED)); break; case TREE_ATTR_BMARK: - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); bookmark_load(buf, false); reload_dir = true; break; case TREE_ATTR_LNG: - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, 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, true, str(LANG_LANGUAGE_LOADED)); + gui_syncsplash(HZ, true, ID2P(LANG_LANGUAGE_LOADED)); } break; #ifdef HAVE_LCD_BITMAP case TREE_ATTR_FONT: - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); font_load(buf); set_file(buf, (char *)global_settings.font_file, MAX_FILENAME); break; case TREE_ATTR_KBD: - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); if (!load_kbd(buf)) - gui_syncsplash(HZ, true, str(LANG_KEYBOARD_LOADED)); + gui_syncsplash(HZ, true, ID2P(LANG_KEYBOARD_LOADED)); set_file(buf, (char *)global_settings.kbd_file, MAX_FILENAME); break; #endif @@ -525,7 +525,7 @@ int ft_enter(struct tree_context* c) #ifndef SIMULATOR /* firmware file */ case TREE_ATTR_MOD: - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); rolo_load(buf); break; #endif @@ -533,11 +533,11 @@ int ft_enter(struct tree_context* c) /* plugin file */ case TREE_ATTR_ROCK: if (global_settings.party_mode) { - gui_syncsplash(HZ, true, str(LANG_PARTY_MODE)); + gui_syncsplash(HZ, true, ID2P(LANG_PARTY_MODE)); break; } - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); if (plugin_load(buf,NULL) == PLUGIN_USB_CONNECTED) { @@ -555,7 +555,7 @@ int ft_enter(struct tree_context* c) char* plugin; if (global_settings.party_mode) { - gui_syncsplash(HZ, true, str(LANG_PARTY_MODE)); + gui_syncsplash(HZ, true, ID2P(LANG_PARTY_MODE)); break; } Index: rockbox-devel/apps/onplay.c =================================================================== --- rockbox-devel.orig/apps/onplay.c +++ rockbox-devel/apps/onplay.c @@ -758,7 +758,7 @@ static bool clipboard_paste(void) bool success; int target_fd; - unsigned char *lines[]={str(LANG_REALLY_OVERWRITE)}; + unsigned char *lines[]={ID2P(LANG_REALLY_OVERWRITE)}; struct text_message message={(char **)lines, 1}; /* Get the name of the current directory */ Index: rockbox-devel/apps/playlist.c =================================================================== --- rockbox-devel.orig/apps/playlist.c +++ rockbox-devel/apps/playlist.c @@ -1277,9 +1277,9 @@ static int get_filename(struct playlist_ if (max < 0) { if (control_file) - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); else - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_ACCESS_ERROR)); return max; } @@ -1369,7 +1369,7 @@ static int get_next_dir(char *dir, bool if (ft_load(tc, (dir[0]=='\0')?"/":dir) < 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); exit = true; result = -1; break; @@ -1454,7 +1454,7 @@ static int check_subdir_for_music(char * if (ft_load(tc, dir) < 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); return -2; } @@ -1507,8 +1507,7 @@ static int check_subdir_for_music(char * /* we now need to reload our current directory */ if(ft_load(tc, dir) < 0) - gui_syncsplash(HZ*2, true, - str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); } return result; @@ -1606,7 +1605,7 @@ static void display_playlist_count(int c */ static void display_buffer_full(void) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_BUFFER_FULL)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_BUFFER_FULL)); } /* @@ -1685,7 +1684,7 @@ static int flush_cached_control(struct p else { result = -1; - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_UPDATE_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_CONTROL_UPDATE_ERROR)); } return result; @@ -1872,11 +1871,11 @@ int playlist_resume(void) empty_playlist(playlist, true); - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); playlist->control_fd = open(playlist->control_filename, O_RDWR); if (playlist->control_fd < 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); return -1; } playlist->control_created = true; @@ -1884,7 +1883,7 @@ int playlist_resume(void) control_file_size = filesize(playlist->control_fd); if (control_file_size <= 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); return -1; } @@ -1893,7 +1892,7 @@ int playlist_resume(void) PLAYLIST_COMMAND_SIZE= control_file_size) { /* no newline at end of control file */ - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_INVALID)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_CONTROL_INVALID)); return -1; } @@ -2788,7 +2787,7 @@ int playlist_insert_track(struct playlis if (check_control(playlist) < 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); return -1; } @@ -2819,7 +2818,7 @@ int playlist_insert_directory(struct pla if (check_control(playlist) < 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); return -1; } @@ -2877,14 +2876,14 @@ int playlist_insert_playlist(struct play if (check_control(playlist) < 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); return -1; } fd = open(filename, O_RDONLY); if (fd < 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_ACCESS_ERROR)); return -1; } @@ -2990,7 +2989,7 @@ int playlist_delete(struct playlist_info if (check_control(playlist) < 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); return -1; } @@ -3025,7 +3024,7 @@ int playlist_move(struct playlist_info* if (check_control(playlist) < 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); return -1; } @@ -3288,7 +3287,7 @@ int playlist_save(struct playlist_info* if (playlist->buffer_size < (int)(playlist->amount * sizeof(int))) { /* not enough buffer space to store updated indices */ - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_ACCESS_ERROR)); return -1; } @@ -3304,7 +3303,7 @@ int playlist_save(struct playlist_info* fd = open(path, O_CREAT|O_WRONLY|O_TRUNC); if (fd < 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_ACCESS_ERROR)); return -1; } @@ -3345,7 +3344,7 @@ int playlist_save(struct playlist_info* if (fdprintf(fd, "%s\n", tmp_buf) < 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_ACCESS_ERROR)); result = -1; break; } @@ -3432,7 +3431,7 @@ int playlist_directory_tracksearch(const if (ft_load(tc, dirname) < 0) { - gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); *(tc->dirfilter) = old_dirfilter; return -1; } Index: rockbox-devel/apps/playlist_catalog.c =================================================================== --- rockbox-devel.orig/apps/playlist_catalog.c +++ rockbox-devel/apps/playlist_catalog.c @@ -112,7 +112,7 @@ static int initialize_catalog(void) if (!playlist_dir_exists) { if (mkdir(playlist_dir, 0) < 0) { - gui_syncsplash(HZ*2, true, str(LANG_CATALOG_NO_DIRECTORY), + gui_syncsplash(HZ*2, true, ID2P(LANG_CATALOG_NO_DIRECTORY), playlist_dir); return -1; } @@ -146,7 +146,7 @@ static int create_playlist_list(char** p if (ft_load(tc, playlist_dir) < 0) { - gui_syncsplash(HZ*2, true, str(LANG_CATALOG_NO_DIRECTORY), + gui_syncsplash(HZ*2, true, ID2P(LANG_CATALOG_NO_DIRECTORY), playlist_dir); goto exit; } @@ -231,7 +231,7 @@ static int display_playlists(char* playl if (num_playlists <= 0) { - gui_syncsplash(HZ*2, true, str(LANG_CATALOG_NO_PLAYLISTS)); + gui_syncsplash(HZ*2, true, ID2P(LANG_CATALOG_NO_PLAYLISTS)); return -1; } Index: rockbox-devel/apps/plugin.c =================================================================== --- rockbox-devel.orig/apps/plugin.c +++ rockbox-devel/apps/plugin.c @@ -501,7 +501,7 @@ int plugin_load(const char* plugin, void plugin_loaded = false; } - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); #ifdef SIMULATOR hdr = sim_plugin_load((char *)plugin, &pd); Index: rockbox-devel/apps/settings.c =================================================================== --- rockbox-devel.orig/apps/settings.c +++ rockbox-devel/apps/settings.c @@ -1728,12 +1728,12 @@ bool settings_save_config(void) if (!kbd_input(filename, sizeof filename)) { fd = creat(filename, O_WRONLY); if (fd < 0) - gui_syncsplash(HZ, true, str(LANG_FAILED)); + gui_syncsplash(HZ, true, ID2P(LANG_FAILED)); else break; } else { - gui_syncsplash(HZ, true, str(LANG_MENU_SETTING_CANCEL)); + gui_syncsplash(HZ, true, ID2P(LANG_MENU_SETTING_CANCEL)); return false; } } @@ -1786,7 +1786,7 @@ bool settings_save_config(void) close(fd); - gui_syncsplash(HZ, true, str(LANG_SETTINGS_SAVED)); + gui_syncsplash(HZ, true, ID2P(LANG_SETTINGS_SAVED)); return true; } @@ -2023,7 +2023,7 @@ bool do_set_setting(const unsigned char* } else if (action == ACTION_STD_CANCEL) { - gui_syncsplash(HZ/2,true,str(LANG_MENU_SETTING_CANCEL)); + gui_syncsplash(HZ/2,true, ID2P(LANG_MENU_SETTING_CANCEL)); if (cb_data->type == INT) *(int*)variable = oldvalue; else *(bool*)variable = (bool)oldvalue; Index: rockbox-devel/apps/settings_menu.c =================================================================== --- rockbox-devel.orig/apps/settings_menu.c +++ rockbox-devel/apps/settings_menu.c @@ -1397,7 +1397,7 @@ static bool audioscrobbler(void) NULL); if (!scrobbler_is_enabled() && global_settings.audioscrobbler) - gui_syncsplash(HZ*2, true, str(LANG_PLEASE_REBOOT)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLEASE_REBOOT)); if(!result) scrobbler_shutdown(); @@ -1623,7 +1623,7 @@ static bool dircache(void) NULL); if (!dircache_is_enabled() && global_settings.dircache) - gui_syncsplash(HZ*2, true, str(LANG_PLEASE_REBOOT)); + gui_syncsplash(HZ*2, true, ID2P(LANG_PLEASE_REBOOT)); if (!result) dircache_disable(); Index: rockbox-devel/apps/sound_menu.c =================================================================== --- rockbox-devel.orig/apps/sound_menu.c +++ rockbox-devel/apps/sound_menu.c @@ -903,7 +903,7 @@ bool rectrigger(void) switch (button) { case ACTION_STD_CANCEL: - gui_syncsplash(50, true, str(LANG_MENU_SETTING_CANCEL)); + gui_syncsplash(50, true, ID2P(LANG_MENU_SETTING_CANCEL)); global_settings.rec_start_thres = old_start_thres; global_settings.rec_start_duration = old_start_duration; global_settings.rec_prerecord_time = old_prerecord_time; Index: rockbox-devel/apps/tagcache.c =================================================================== --- rockbox-devel.orig/apps/tagcache.c +++ rockbox-devel/apps/tagcache.c @@ -3788,7 +3788,7 @@ bool tagcache_update(void) return false; queue_post(&tagcache_queue, Q_UPDATE, 0); - gui_syncsplash(HZ*2, true, str(LANG_TAGCACHE_FORCE_UPDATE_SPLASH)); + gui_syncsplash(HZ*2, true, ID2P(LANG_TAGCACHE_FORCE_UPDATE_SPLASH)); return false; } @@ -3796,7 +3796,7 @@ bool tagcache_update(void) bool tagcache_rebuild(void) { queue_post(&tagcache_queue, Q_REBUILD, 0); - gui_syncsplash(HZ*2, true, str(LANG_TAGCACHE_FORCE_UPDATE_SPLASH)); + gui_syncsplash(HZ*2, true, ID2P(LANG_TAGCACHE_FORCE_UPDATE_SPLASH)); return false; } Index: rockbox-devel/apps/tagtree.c =================================================================== --- rockbox-devel.orig/apps/tagtree.c +++ rockbox-devel/apps/tagtree.c @@ -661,7 +661,7 @@ bool tagtree_export(void) gui_syncsplash(0, true, str(LANG_CREATING)); if (!tagcache_create_changelog(&tcs)) { - gui_syncsplash(HZ*2, true, str(LANG_FAILED)); + gui_syncsplash(HZ*2, true, ID2P(LANG_FAILED)); } return false; @@ -669,10 +669,10 @@ bool tagtree_export(void) bool tagtree_import(void) { - gui_syncsplash(0, true, str(LANG_WAIT)); + gui_syncsplash(0, true, ID2P(LANG_WAIT)); if (!tagcache_import_changelog()) { - gui_syncsplash(HZ*2, true, str(LANG_FAILED)); + gui_syncsplash(HZ*2, true, ID2P(LANG_FAILED)); } return false; @@ -1147,7 +1147,7 @@ int retrieve_entries(struct tree_context if (!sort && (sort_inverse || sort_limit)) { - gui_syncsplash(HZ*4, true, str(LANG_SHOWDIR_BUFFER_FULL), total_count); + gui_syncsplash(HZ*4, true, ID2P(LANG_SHOWDIR_BUFFER_FULL)); logf("Too small dir buffer"); return 0; } @@ -1338,7 +1338,7 @@ int tagtree_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) @@ -1415,7 +1415,7 @@ bool insert_all_playlist(struct tree_con cpu_boost_id(true, CPUBOOSTID_TAGTREE); if (!tagcache_search(&tcs, tag_filename)) { - gui_syncsplash(HZ, true, str(LANG_TAGCACHE_BUSY)); + gui_syncsplash(HZ, true, ID2P(LANG_TAGCACHE_BUSY)); cpu_boost_id(false, CPUBOOSTID_TAGTREE); return false; } @@ -1512,12 +1512,12 @@ bool tagtree_insert_selection_playlist(i } if (tc->filesindir <= 0) - gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST_PLAYER)); + gui_syncsplash(HZ, true, ID2P(LANG_END_PLAYLIST_PLAYER)); else { logf("insert_all_playlist"); if (!insert_all_playlist(tc, position, queue)) - gui_syncsplash(HZ*2, true, str(LANG_FAILED)); + gui_syncsplash(HZ*2, true, ID2P(LANG_FAILED)); } /* Finally return the dirlevel to its original value. */ Index: rockbox-devel/apps/filetypes.c =================================================================== --- rockbox-devel.orig/apps/filetypes.c +++ rockbox-devel/apps/filetypes.c @@ -340,14 +340,14 @@ static void scan_plugins(void) /* exttypes[] full, bail out */ if (cnt_exttypes >= MAX_EXTTYPES) { - gui_syncsplash(HZ, true, str(LANG_FILETYPES_EXTENSION_FULL)); + gui_syncsplash(HZ, true, ID2P(LANG_FILETYPES_EXTENSION_FULL)); break; } /* filetypes[] full, bail out */ if (cnt_filetypes >= MAX_FILETYPES) { - gui_syncsplash(HZ, true, str(LANG_FILETYPES_FULL)); + gui_syncsplash(HZ, true, ID2P(LANG_FILETYPES_FULL)); break; } @@ -380,7 +380,7 @@ static void scan_plugins(void) /* filter out to long filenames */ if (strlen((char *)entry->d_name) > MAX_PLUGIN_LENGTH + 5) { - gui_syncsplash(HZ, true, str(LANG_FILETYPES_PLUGIN_NAME_LONG)); + gui_syncsplash(HZ, true, ID2P(LANG_FILETYPES_PLUGIN_NAME_LONG)); continue; } @@ -561,13 +561,13 @@ bool read_config(const char* file) { if (cnt_exttypes >= MAX_EXTTYPES) { - gui_syncsplash(HZ, true, str(LANG_FILETYPES_EXTENSION_FULL)); + gui_syncsplash(HZ, true, ID2P(LANG_FILETYPES_EXTENSION_FULL)); break; } if (cnt_filetypes >= MAX_FILETYPES) { - gui_syncsplash(HZ, true, str(LANG_FILETYPES_FULL)); + gui_syncsplash(HZ, true, ID2P(LANG_FILETYPES_FULL)); break; } @@ -636,7 +636,7 @@ bool read_config(const char* file) { if (strlen(str[plugin]) > MAX_PLUGIN_LENGTH) { - gui_syncsplash(HZ, true, str(LANG_FILETYPES_PLUGIN_NAME_LONG)); + gui_syncsplash(HZ, true, ID2P(LANG_FILETYPES_PLUGIN_NAME_LONG)); str[plugin] = NULL; continue; } @@ -736,7 +736,7 @@ static char* string2icon(const char* str (unsigned long) string_buffer - (unsigned long) next_free_string) < ICON_LENGTH) { - gui_syncsplash(HZ, true, str(LANG_FILETYPES_STRING_BUFFER_EMPTY)); + gui_syncsplash(HZ, true, ID2P(LANG_FILETYPES_STRING_BUFFER_EMPTY)); return NULL; } @@ -792,7 +792,7 @@ static char* get_string(const char* str) } else { - gui_syncsplash(HZ, true, str(LANG_FILETYPES_STRING_BUFFER_EMPTY)); + gui_syncsplash(HZ, true, ID2P(LANG_FILETYPES_STRING_BUFFER_EMPTY)); return NULL; } } Index: rockbox-devel/apps/tree.c =================================================================== --- rockbox-devel.orig/apps/tree.c +++ rockbox-devel/apps/tree.c @@ -348,7 +348,7 @@ static int update_dir(void) if(!id3db && (tc.dirfull || tc.filesindir == global_settings.max_files_in_dir) ) { - gui_syncsplash(HZ, true, str(LANG_SHOWDIR_BUFFER_FULL)); + gui_syncsplash(HZ, true, ID2P(LANG_SHOWDIR_BUFFER_FULL)); } } if (id3db) @@ -494,7 +494,7 @@ static void start_resume(bool just_power else return; } else if (! just_powered_on) { - gui_syncsplash(HZ*2, true, str(LANG_NOTHING_TO_RESUME)); + gui_syncsplash(HZ*2, true, ID2P(LANG_NOTHING_TO_RESUME)); } } @@ -628,7 +628,7 @@ static bool dirbrowse(void) if (*tc.dirfilter > NUM_FILTER_MODES && numentries==0) { - gui_syncsplash(HZ*2, true, str(LANG_NO_FILES)); + gui_syncsplash(HZ*2, true, ID2P(LANG_NO_FILES)); return false; /* No files found for rockbox_browser() */ } } Index: rockbox-devel/apps/playlist_viewer.c =================================================================== --- rockbox-devel.orig/apps/playlist_viewer.c +++ rockbox-devel/apps/playlist_viewer.c @@ -694,7 +694,7 @@ bool playlist_viewer_ex(char* filename) ret = playlist_move(viewer.playlist, viewer.move_track, current_track->index); if (ret < 0) - gui_syncsplash(HZ, true, str(LANG_MOVE_FAILED)); + gui_syncsplash(HZ, true, ID2P(LANG_MOVE_FAILED)); update_playlist(true); viewer.move_track = -1; Index: rockbox-devel/apps/eq_menu.c =================================================================== --- rockbox-devel.orig/apps/eq_menu.c +++ rockbox-devel/apps/eq_menu.c @@ -717,12 +717,12 @@ static bool eq_save_preset(void) if (!kbd_input(filename, sizeof filename)) { fd = creat(filename, O_WRONLY); if (fd < 0) - gui_syncsplash(HZ, true, str(LANG_FAILED)); + gui_syncsplash(HZ, true, ID2P(LANG_FAILED)); else break; } else { - gui_syncsplash(HZ, true, str(LANG_MENU_SETTING_CANCEL)); + gui_syncsplash(HZ, true, ID2P(LANG_MENU_SETTING_CANCEL)); return false; } } @@ -741,7 +741,7 @@ static bool eq_save_preset(void) close(fd); - gui_syncsplash(HZ, true, str(LANG_SETTINGS_SAVED)); + gui_syncsplash(HZ, true, ID2P(LANG_SETTINGS_SAVED)); return true; }