From b05eec8b1ea4cbad0b668a8974c87272acc78ed6 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 5 Dec 2005 23:37:14 +0000 Subject: Big Code Police raid. Pretty pretty please, we do no macrofy simple assignments and things just to make them appear as function calls. That makes code harder to follow. Did some gcc4 warning fixes as well. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8163 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'apps/settings.c') diff --git a/apps/settings.c b/apps/settings.c index ac23cafe96..ae9bd6792a 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -1520,19 +1520,19 @@ bool set_int(const unsigned char* string, formatter); gui_syncselect_draw(&select); talk_unit(voice_unit, *variable); - while (!gui_select_is_validated(&select)) + while (!select.validated) { button = button_get_w_tmo(HZ/2); if(gui_syncselect_do_button(&select, button)) { - *variable=gui_select_get_selected(&select); + *variable=select.options.option; gui_syncselect_draw(&select); talk_unit(voice_unit, *variable); if ( function ) function(*variable); } gui_syncstatusbar_draw(&statusbars, false); - if(gui_select_is_canceled(&select)) + if(select.canceled) { *variable=oldvalue; if ( function ) @@ -1579,23 +1579,24 @@ bool set_option(const char* string, void* variable, enum optiontype type, gui_select_init_items(&select, string, oldvalue, options, numoptions); gui_syncselect_draw(&select); if (global_settings.talk_menu) - talk_id(options[gui_select_get_selected(&select)].voice_id, true); - while ( !gui_select_is_validated(&select) ) + talk_id(options[select.options.option].voice_id, true); + + while ( !select.validated ) { gui_syncstatusbar_draw(&statusbars, true); button = button_get_w_tmo(HZ/2); if(gui_syncselect_do_button(&select, button)) { /* *variable = gui_select_get_selected(&select) */ - set_type_fromint(type, variable, gui_select_get_selected(&select)); + set_type_fromint(type, variable, select.options.option); gui_syncselect_draw(&select); if (global_settings.talk_menu) - talk_id(options[gui_select_get_selected(&select)].voice_id, false); + talk_id(options[select.options.option].voice_id, false); if ( function ) function(type_fromvoidptr(type, variable)); } gui_syncstatusbar_draw(&statusbars, false); - if(gui_select_is_canceled(&select)) + if(select.canceled) { /* *variable=oldvalue; */ set_type_fromint(type, variable, oldvalue); -- cgit v1.2.3