diff options
Diffstat (limited to 'apps/main_menu.c')
-rw-r--r-- | apps/main_menu.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index f42655b0c2..ade6e7bd99 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -262,8 +262,8 @@ bool rec_menu(void) | |||
262 | 262 | ||
263 | /* recording menu */ | 263 | /* recording menu */ |
264 | struct menu_items items[] = { | 264 | struct menu_items items[] = { |
265 | { str(LANG_RECORDING_MENU), recording_screen }, | 265 | { STR(LANG_RECORDING_MENU), recording_screen }, |
266 | { str(LANG_RECORDING_SETTINGS), recording_settings}, | 266 | { STR(LANG_RECORDING_SETTINGS), recording_settings}, |
267 | }; | 267 | }; |
268 | 268 | ||
269 | m=menu_init( items, sizeof items / sizeof(struct menu_items), NULL ); | 269 | m=menu_init( items, sizeof items / sizeof(struct menu_items), NULL ); |
@@ -281,13 +281,13 @@ bool info_menu(void) | |||
281 | 281 | ||
282 | /* info menu */ | 282 | /* info menu */ |
283 | struct menu_items items[] = { | 283 | struct menu_items items[] = { |
284 | { str(LANG_MENU_SHOW_ID3_INFO), browse_id3 }, | 284 | { STR(LANG_MENU_SHOW_ID3_INFO), browse_id3 }, |
285 | { str(LANG_INFO_MENU), show_info }, | 285 | { STR(LANG_INFO_MENU), show_info }, |
286 | { str(LANG_VERSION), show_credits }, | 286 | { STR(LANG_VERSION), show_credits }, |
287 | #ifndef SIMULATOR | 287 | #ifndef SIMULATOR |
288 | { str(LANG_DEBUG), debug_menu }, | 288 | { STR(LANG_DEBUG), debug_menu }, |
289 | #else | 289 | #else |
290 | { str(LANG_USB), simulate_usb }, | 290 | { STR(LANG_USB), simulate_usb }, |
291 | #endif | 291 | #endif |
292 | }; | 292 | }; |
293 | 293 | ||
@@ -308,33 +308,41 @@ bool main_menu(void) | |||
308 | struct menu_items items[8]; | 308 | struct menu_items items[8]; |
309 | 309 | ||
310 | items[i].desc = str(LANG_BOOKMARK_MENU); | 310 | items[i].desc = str(LANG_BOOKMARK_MENU); |
311 | items[i].voice_id = LANG_BOOKMARK_MENU; | ||
311 | items[i++].function = bookmark_menu; | 312 | items[i++].function = bookmark_menu; |
312 | 313 | ||
313 | items[i].desc = str(LANG_SOUND_SETTINGS); | 314 | items[i].desc = str(LANG_SOUND_SETTINGS); |
315 | items[i].voice_id = LANG_SOUND_SETTINGS; | ||
314 | items[i++].function = sound_menu; | 316 | items[i++].function = sound_menu; |
315 | 317 | ||
316 | items[i].desc = str(LANG_GENERAL_SETTINGS); | 318 | items[i].desc = str(LANG_GENERAL_SETTINGS); |
319 | items[i].voice_id = LANG_GENERAL_SETTINGS; | ||
317 | items[i++].function = settings_menu; | 320 | items[i++].function = settings_menu; |
318 | 321 | ||
319 | #ifdef HAVE_FMRADIO | 322 | #ifdef HAVE_FMRADIO |
320 | if(radio_hardware_present()) { | 323 | if(radio_hardware_present()) { |
321 | items[i].desc = str(LANG_FM_RADIO); | 324 | items[i].desc = str(LANG_FM_RADIO); |
325 | items[i].voice_id = LANG_FM_RADIO; | ||
322 | items[i++].function = radio_screen; | 326 | items[i++].function = radio_screen; |
323 | } | 327 | } |
324 | #endif | 328 | #endif |
325 | 329 | ||
326 | #ifdef HAVE_MAS3587F | 330 | #ifdef HAVE_MAS3587F |
327 | items[i].desc = str(LANG_RECORDING); | 331 | items[i].desc = str(LANG_RECORDING); |
332 | items[i].voice_id = LANG_RECORDING; | ||
328 | items[i++].function = rec_menu; | 333 | items[i++].function = rec_menu; |
329 | #endif | 334 | #endif |
330 | 335 | ||
331 | items[i].desc = str(LANG_PLAYLIST_MENU); | 336 | items[i].desc = str(LANG_PLAYLIST_MENU); |
337 | items[i].voice_id = LANG_PLAYLIST_MENU; | ||
332 | items[i++].function = playlist_menu; | 338 | items[i++].function = playlist_menu; |
333 | 339 | ||
334 | items[i].desc = str(LANG_PLUGINS); | 340 | items[i].desc = str(LANG_PLUGINS); |
341 | items[i].voice_id = LANG_PLUGINS; | ||
335 | items[i++].function = plugin_browse; | 342 | items[i++].function = plugin_browse; |
336 | 343 | ||
337 | items[i].desc = str(LANG_INFO); | 344 | items[i].desc = str(LANG_INFO); |
345 | items[i].voice_id = LANG_INFO; | ||
338 | items[i++].function = info_menu; | 346 | items[i++].function = info_menu; |
339 | 347 | ||
340 | m=menu_init( items, i, NULL ); | 348 | m=menu_init( items, i, NULL ); |