diff options
| author | Peter D'Hoye <peter.dhoye@gmail.com> | 2008-08-08 20:58:27 +0000 |
|---|---|---|
| committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2008-08-08 20:58:27 +0000 |
| commit | a6477dda759a3b6c8fbe9b80dd5373107c91da8a (patch) | |
| tree | 437701f940443318d750ea2b9f89589ed24599a0 | |
| parent | af6aa0edbef5c682597d5be52d51ba93a25afc4f (diff) | |
| download | rockbox-a6477dda759a3b6c8fbe9b80dd5373107c91da8a.zip rockbox-a6477dda759a3b6c8fbe9b80dd5373107c91da8a.tar.gz rockbox-a6477dda759a3b6c8fbe9b80dd5373107c91da8a.tar.bz2 rockbox-a6477dda759a3b6c8fbe9b80dd5373107c91da8a.tar.xz | |
Also have the peakmeter menu shown inside the recording menu, because there is a big chance you want to teak them from inside the recording screen. Also makes the clipcounter setting available there.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18223 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/menus/exported_menus.h | 3 | ||||
| -rw-r--r-- | apps/menus/recording_menu.c | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/menus/exported_menus.h b/apps/menus/exported_menus.h index 32f7dd4..9fb39cb 100644 --- a/apps/menus/exported_menus.h +++ b/apps/menus/exported_menus.h @@ -31,6 +31,9 @@ extern const struct menu_item_ex playback_settings, /* playback_menu.c */ #ifdef HAVE_RECORDING recording_settings, /* recording_menu.c */ +#ifdef HAVE_LCD_BITMAP + peak_meter_menu, /* also used from within recording_menu */ +#endif #endif sound_settings, /* sound_menu.c */ settings_menu_item, /* settings_menu.c */ diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 277f8d9..b55cba8 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c @@ -69,6 +69,7 @@ #include "settings_list.h" #include "list.h" #include "viewport.h" +#include "exported_menus.h" static bool no_source_in_menu = false; static int recmenu_callback(int action,const struct menu_item_ex *this_item); @@ -586,13 +587,6 @@ int rectrigger(void) MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), rectrigger, NULL, NULL, Icon_Menu_setting); - - -/* from main_menu.c */ -struct browse_folder_info { - const char* dir; - int show_options; -}; static struct browse_folder_info rec_config_browse = {RECPRESETS_DIR, SHOW_CFG}; int browse_folder(void *param); MENUITEM_FUNCTION(browse_recconfigs, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_CFG), @@ -627,6 +621,9 @@ MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), #ifdef HAVE_AGC &agc_preset, &agc_cliptime, #endif +#ifdef HAVE_LCD_BITMAP + &peak_meter_menu, +#endif &browse_recconfigs, &save_recpresets_item ); |