diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-17 12:33:34 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-17 12:33:34 +0000 |
commit | daf66940b1a06de2681c91dcb8cf72d95a234e86 (patch) | |
tree | cf19ca0f426f3a44718fbe42ce64306ac28aa815 /apps/menus/recording_menu.c | |
parent | 86ecc9588beca55162d7b4ef44ffcddd9c447600 (diff) | |
download | rockbox-daf66940b1a06de2681c91dcb8cf72d95a234e86.tar.gz rockbox-daf66940b1a06de2681c91dcb8cf72d95a234e86.zip |
Unify the way functions are called from menus.
Optionally, the functions return value can be checked for a value to
tell the menu to quit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12821 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/recording_menu.c')
-rw-r--r-- | apps/menus/recording_menu.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 76763b101d..43bd8a781f 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -90,8 +90,8 @@ static int recsource_func(void) | |||
90 | &global_settings.rec_source, INT, names, | 90 | &global_settings.rec_source, INT, names, |
91 | n_opts, NULL ); | 91 | n_opts, NULL ); |
92 | } | 92 | } |
93 | MENUITEM_FUNCTION(recsource, ID2P(LANG_RECORDING_SOURCE), | 93 | MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), |
94 | recsource_func, recmenu_callback, Icon_Menu_setting); | 94 | recsource_func, NULL, 0, recmenu_callback, Icon_Menu_setting); |
95 | 95 | ||
96 | #if CONFIG_CODEC == SWCODEC | 96 | #if CONFIG_CODEC == SWCODEC |
97 | /* Makes an options list from a source list of options and indexes */ | 97 | /* Makes an options list from a source list of options and indexes */ |
@@ -205,8 +205,8 @@ static int recfrequency_func(void) | |||
205 | return ret; | 205 | return ret; |
206 | #endif /* CONFIG_CODEC == SWCODEC */ | 206 | #endif /* CONFIG_CODEC == SWCODEC */ |
207 | } /* recfrequency */ | 207 | } /* recfrequency */ |
208 | MENUITEM_FUNCTION(recfrequency, ID2P(LANG_RECORDING_FREQUENCY), | 208 | MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_RECORDING_FREQUENCY), |
209 | recfrequency_func, NULL, Icon_Menu_setting); | 209 | recfrequency_func, NULL, 0, NULL, Icon_Menu_setting); |
210 | 210 | ||
211 | 211 | ||
212 | static int recchannels_func(void) | 212 | static int recchannels_func(void) |
@@ -253,8 +253,8 @@ static int recchannels_func(void) | |||
253 | return ret; | 253 | return ret; |
254 | #endif /* CONFIG_CODEC == SWCODEC */ | 254 | #endif /* CONFIG_CODEC == SWCODEC */ |
255 | } | 255 | } |
256 | MENUITEM_FUNCTION(recchannels, ID2P(LANG_RECORDING_CHANNELS), | 256 | MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_RECORDING_CHANNELS), |
257 | recchannels_func, NULL, Icon_Menu_setting); | 257 | recchannels_func, NULL, 0, NULL, Icon_Menu_setting); |
258 | 258 | ||
259 | #if CONFIG_CODEC == SWCODEC | 259 | #if CONFIG_CODEC == SWCODEC |
260 | 260 | ||
@@ -279,11 +279,12 @@ static int recformat_func(void) | |||
279 | 279 | ||
280 | return res; | 280 | return res; |
281 | } /* recformat */ | 281 | } /* recformat */ |
282 | MENUITEM_FUNCTION(recformat, ID2P(LANG_RECORDING_FORMAT), | 282 | MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_RECORDING_FORMAT), |
283 | recformat_func, NULL, Icon_Menu_setting); | 283 | recformat_func, NULL, 0, NULL, Icon_Menu_setting); |
284 | 284 | ||
285 | MENUITEM_FUNCTION(enc_global_config_menu_item, ID2P(LANG_ENCODER_SETTINGS), | 285 | MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), |
286 | (int(*)(void))enc_global_config_menu, NULL, Icon_Submenu); | 286 | (int(*)(void))enc_global_config_menu, |
287 | NULL, 0, NULL, Icon_Submenu); | ||
287 | 288 | ||
288 | #endif /* CONFIG_CODEC == SWCODEC */ | 289 | #endif /* CONFIG_CODEC == SWCODEC */ |
289 | 290 | ||
@@ -323,8 +324,8 @@ static int recdirectory_func(void) | |||
323 | &global_settings.rec_directory, INT, | 324 | &global_settings.rec_directory, INT, |
324 | names, 2, NULL ); | 325 | names, 2, NULL ); |
325 | } | 326 | } |
326 | MENUITEM_FUNCTION(recdirectory, ID2P(LANG_RECORD_DIRECTORY), | 327 | MENUITEM_FUNCTION(recdirectory, 0, ID2P(LANG_RECORD_DIRECTORY), |
327 | recdirectory_func, NULL, Icon_Menu_setting); | 328 | recdirectory_func, NULL, 0, NULL, Icon_Menu_setting); |
328 | 329 | ||
329 | MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL); | 330 | MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL); |
330 | 331 | ||
@@ -362,10 +363,10 @@ static int agc_cliptime_func(void) | |||
362 | &global_settings.rec_agc_cliptime, | 363 | &global_settings.rec_agc_cliptime, |
363 | INT, names, 5, NULL ); | 364 | INT, names, 5, NULL ); |
364 | } | 365 | } |
365 | MENUITEM_FUNCTION(agc_preset, ID2P(LANG_RECORD_AGC_PRESET), | 366 | MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORD_AGC_PRESET), |
366 | agc_preset_func, NULL, Icon_Menu_setting); | 367 | agc_preset_func, NULL, 0, NULL, Icon_Menu_setting); |
367 | MENUITEM_FUNCTION(agc_cliptime, ID2P(LANG_RECORD_AGC_CLIPTIME), | 368 | MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORD_AGC_CLIPTIME), |
368 | agc_cliptime_func, NULL, Icon_Menu_setting); | 369 | agc_cliptime_func, NULL, 0, NULL, Icon_Menu_setting); |
369 | #endif /* HAVE_AGC */ | 370 | #endif /* HAVE_AGC */ |
370 | 371 | ||
371 | /** Rec trigger **/ | 372 | /** Rec trigger **/ |
@@ -796,8 +797,8 @@ bool rectrigger(void) | |||
796 | return retval; | 797 | return retval; |
797 | } | 798 | } |
798 | 799 | ||
799 | MENUITEM_FUNCTION(rectrigger_item, ID2P(LANG_RECORD_TRIGGER), | 800 | MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), |
800 | (int(*)(void))rectrigger, NULL, Icon_Menu_setting); | 801 | (int(*)(void))rectrigger, NULL, 0, NULL, Icon_Menu_setting); |
801 | 802 | ||
802 | 803 | ||
803 | 804 | ||
@@ -836,5 +837,5 @@ bool recording_menu(bool no_source) | |||
836 | return do_menu(&recording_setting_menu, NULL) == MENU_ATTACHED_USB; | 837 | return do_menu(&recording_setting_menu, NULL) == MENU_ATTACHED_USB; |
837 | }; | 838 | }; |
838 | 839 | ||
839 | MENUITEM_FUNCTION_WPARAM(recording_settings, ID2P(LANG_RECORDING_SETTINGS), | 840 | MENUITEM_FUNCTION(recording_settings, MENU_FUNC_USEPARAM, ID2P(LANG_RECORDING_SETTINGS), |
840 | (int (*)(void*))recording_menu,0, NULL, Icon_NOICON); | 841 | (int (*)(void*))recording_menu, 0, 0, NULL, Icon_NOICON); |