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 /apps/menus | |
parent | af6aa0edbef5c682597d5be52d51ba93a25afc4f (diff) | |
download | rockbox-a6477dda759a3b6c8fbe9b80dd5373107c91da8a.tar.gz rockbox-a6477dda759a3b6c8fbe9b80dd5373107c91da8a.zip |
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
Diffstat (limited to 'apps/menus')
-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 32f7dd433a..9fb39cbf8f 100644 --- a/apps/menus/exported_menus.h +++ b/apps/menus/exported_menus.h | |||
@@ -31,6 +31,9 @@ extern const struct menu_item_ex | |||
31 | playback_settings, /* playback_menu.c */ | 31 | playback_settings, /* playback_menu.c */ |
32 | #ifdef HAVE_RECORDING | 32 | #ifdef HAVE_RECORDING |
33 | recording_settings, /* recording_menu.c */ | 33 | recording_settings, /* recording_menu.c */ |
34 | #ifdef HAVE_LCD_BITMAP | ||
35 | peak_meter_menu, /* also used from within recording_menu */ | ||
36 | #endif | ||
34 | #endif | 37 | #endif |
35 | sound_settings, /* sound_menu.c */ | 38 | sound_settings, /* sound_menu.c */ |
36 | settings_menu_item, /* settings_menu.c */ | 39 | settings_menu_item, /* settings_menu.c */ |
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 277f8d93b7..b55cba8061 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -69,6 +69,7 @@ | |||
69 | #include "settings_list.h" | 69 | #include "settings_list.h" |
70 | #include "list.h" | 70 | #include "list.h" |
71 | #include "viewport.h" | 71 | #include "viewport.h" |
72 | #include "exported_menus.h" | ||
72 | 73 | ||
73 | static bool no_source_in_menu = false; | 74 | static bool no_source_in_menu = false; |
74 | static int recmenu_callback(int action,const struct menu_item_ex *this_item); | 75 | static int recmenu_callback(int action,const struct menu_item_ex *this_item); |
@@ -586,13 +587,6 @@ int rectrigger(void) | |||
586 | MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), | 587 | MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), |
587 | rectrigger, NULL, NULL, Icon_Menu_setting); | 588 | rectrigger, NULL, NULL, Icon_Menu_setting); |
588 | 589 | ||
589 | |||
590 | |||
591 | /* from main_menu.c */ | ||
592 | struct browse_folder_info { | ||
593 | const char* dir; | ||
594 | int show_options; | ||
595 | }; | ||
596 | static struct browse_folder_info rec_config_browse = {RECPRESETS_DIR, SHOW_CFG}; | 590 | static struct browse_folder_info rec_config_browse = {RECPRESETS_DIR, SHOW_CFG}; |
597 | int browse_folder(void *param); | 591 | int browse_folder(void *param); |
598 | MENUITEM_FUNCTION(browse_recconfigs, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_CFG), | 592 | MENUITEM_FUNCTION(browse_recconfigs, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_CFG), |
@@ -627,6 +621,9 @@ MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), | |||
627 | #ifdef HAVE_AGC | 621 | #ifdef HAVE_AGC |
628 | &agc_preset, &agc_cliptime, | 622 | &agc_preset, &agc_cliptime, |
629 | #endif | 623 | #endif |
624 | #ifdef HAVE_LCD_BITMAP | ||
625 | &peak_meter_menu, | ||
626 | #endif | ||
630 | &browse_recconfigs, &save_recpresets_item | 627 | &browse_recconfigs, &save_recpresets_item |
631 | ); | 628 | ); |
632 | 629 | ||