diff options
Diffstat (limited to 'apps/main_menu.c')
-rw-r--r-- | apps/main_menu.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index ade6e7bd99..6fec696240 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -261,12 +261,13 @@ bool rec_menu(void) | |||
261 | bool result; | 261 | bool result; |
262 | 262 | ||
263 | /* recording menu */ | 263 | /* recording menu */ |
264 | struct menu_items items[] = { | 264 | struct menu_item 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(*items), NULL, |
270 | NULL, NULL, NULL); | ||
270 | result = menu_run(m); | 271 | result = menu_run(m); |
271 | menu_exit(m); | 272 | menu_exit(m); |
272 | 273 | ||
@@ -280,7 +281,7 @@ bool info_menu(void) | |||
280 | bool result; | 281 | bool result; |
281 | 282 | ||
282 | /* info menu */ | 283 | /* info menu */ |
283 | struct menu_items items[] = { | 284 | struct menu_item items[] = { |
284 | { STR(LANG_MENU_SHOW_ID3_INFO), browse_id3 }, | 285 | { STR(LANG_MENU_SHOW_ID3_INFO), browse_id3 }, |
285 | { STR(LANG_INFO_MENU), show_info }, | 286 | { STR(LANG_INFO_MENU), show_info }, |
286 | { STR(LANG_VERSION), show_credits }, | 287 | { STR(LANG_VERSION), show_credits }, |
@@ -291,7 +292,8 @@ bool info_menu(void) | |||
291 | #endif | 292 | #endif |
292 | }; | 293 | }; |
293 | 294 | ||
294 | m=menu_init( items, sizeof items / sizeof(struct menu_items), NULL ); | 295 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
296 | NULL, NULL, NULL); | ||
295 | result = menu_run(m); | 297 | result = menu_run(m); |
296 | menu_exit(m); | 298 | menu_exit(m); |
297 | 299 | ||
@@ -305,7 +307,7 @@ bool main_menu(void) | |||
305 | int i = 0; | 307 | int i = 0; |
306 | 308 | ||
307 | /* main menu */ | 309 | /* main menu */ |
308 | struct menu_items items[8]; | 310 | struct menu_item items[8]; |
309 | 311 | ||
310 | items[i].desc = str(LANG_BOOKMARK_MENU); | 312 | items[i].desc = str(LANG_BOOKMARK_MENU); |
311 | items[i].voice_id = LANG_BOOKMARK_MENU; | 313 | items[i].voice_id = LANG_BOOKMARK_MENU; |
@@ -345,7 +347,7 @@ bool main_menu(void) | |||
345 | items[i].voice_id = LANG_INFO; | 347 | items[i].voice_id = LANG_INFO; |
346 | items[i++].function = info_menu; | 348 | items[i++].function = info_menu; |
347 | 349 | ||
348 | m=menu_init( items, i, NULL ); | 350 | m=menu_init( items, i, NULL, NULL, NULL, NULL ); |
349 | #ifdef HAVE_LCD_CHARCELLS | 351 | #ifdef HAVE_LCD_CHARCELLS |
350 | status_set_param(true); | 352 | status_set_param(true); |
351 | #endif | 353 | #endif |