diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/menus/eq_menu.c | 10 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 11 |
2 files changed, 9 insertions, 12 deletions
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c index 066787a896..720b98d7ae 100644 --- a/apps/menus/eq_menu.c +++ b/apps/menus/eq_menu.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include "gui/scrollbar.h" | 45 | #include "gui/scrollbar.h" |
46 | #include "menu_common.h" | 46 | #include "menu_common.h" |
47 | #include "viewport.h" | 47 | #include "viewport.h" |
48 | #include "exported_menus.h" | ||
48 | 49 | ||
49 | /* | 50 | /* |
50 | * Utility functions | 51 | * Utility functions |
@@ -594,18 +595,15 @@ static bool eq_save_preset(void) | |||
594 | } | 595 | } |
595 | 596 | ||
596 | /* Allows browsing of preset files */ | 597 | /* Allows browsing of preset files */ |
597 | bool eq_browse_presets(void) | 598 | static struct browse_folder_info eqs = { EQS_DIR, SHOW_CFG }; |
598 | { | ||
599 | return rockbox_browse(EQS_DIR, SHOW_CFG); | ||
600 | } | ||
601 | 599 | ||
602 | MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), | 600 | MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), |
603 | (int(*)(void))eq_menu_graphical, NULL, lowlatency_callback, | 601 | (int(*)(void))eq_menu_graphical, NULL, lowlatency_callback, |
604 | Icon_EQ); | 602 | Icon_EQ); |
605 | MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), | 603 | MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), |
606 | (int(*)(void))eq_save_preset, NULL, NULL, Icon_NOICON); | 604 | (int(*)(void))eq_save_preset, NULL, NULL, Icon_NOICON); |
607 | MENUITEM_FUNCTION(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE), | 605 | MENUITEM_FUNCTION(eq_browse, MENU_FUNC_USEPARAM, ID2P(LANG_EQUALIZER_BROWSE), |
608 | (int(*)(void))eq_browse_presets, NULL, lowlatency_callback, | 606 | browse_folder, (void*)&eqs, lowlatency_callback, |
609 | Icon_NOICON); | 607 | Icon_NOICON); |
610 | 608 | ||
611 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, | 609 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index efd18b2204..f619bb7db7 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -413,12 +413,11 @@ MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, | |||
413 | 413 | ||
414 | /***********************************/ | 414 | /***********************************/ |
415 | /* SETTINGS MENU */ | 415 | /* SETTINGS MENU */ |
416 | static int language_browse(void) | 416 | |
417 | { | 417 | static struct browse_folder_info langs = { LANG_DIR, SHOW_LNG }; |
418 | return (int)rockbox_browse(LANG_DIR, SHOW_LNG); | 418 | |
419 | } | 419 | MENUITEM_FUNCTION(browse_langs, MENU_FUNC_USEPARAM, ID2P(LANG_LANGUAGE), |
420 | MENUITEM_FUNCTION(browse_langs, 0, ID2P(LANG_LANGUAGE), language_browse, | 420 | browse_folder, (void*)&langs, NULL, Icon_Language); |
421 | NULL, NULL, Icon_Language); | ||
422 | 421 | ||
423 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, | 422 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, |
424 | Icon_General_settings_menu, | 423 | Icon_General_settings_menu, |