len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Accept FS #9052 by Alexander Levin with a fix by me. Changes HAS_BUTTONBAR into HAVE_BUTTONBAR to bring it in line with the other defines

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17655 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Peter D'Hoye 2008-05-29 20:32:39 +00:00
parent 0792596e17
commit f76122f0e7
12 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/recorder/keyboard.c
View file

@ -338,7 +338,7 @@ int kbd_input(char* text, int buflen)
}
char outline[256];
#ifdef HAS_BUTTONBAR
#ifdef HAVE_BUTTONBAR
struct gui_buttonbar buttonbar;
bool buttonbar_config = global_settings.buttonbar;
@ -712,7 +712,7 @@ int kbd_input(char* text, int buflen)
cur_blink = !cur_blink;
#ifdef HAS_BUTTONBAR
#ifdef HAVE_BUTTONBAR
/* draw the button bar */
gui_buttonbar_set(&buttonbar, "Shift", "OK", "Del");
gui_buttonbar_draw(&buttonbar);
@ -764,7 +764,7 @@ int kbd_input(char* text, int buflen)
FOR_NB_SCREENS(l)
screens[l].setfont(FONT_UI);
#ifdef HAS_BUTTONBAR
#ifdef HAVE_BUTTONBAR
global_settings.buttonbar=buttonbar_config;
#endif
return -1;
@ -1230,7 +1230,7 @@ int kbd_input(char* text, int buflen)
}
}
#ifdef HAS_BUTTONBAR
#ifdef HAVE_BUTTONBAR
global_settings.buttonbar = buttonbar_config;
#endif

16
apps/recorder/radio.c
View file

@ -452,7 +452,7 @@ int radio_screen(void)
int button_timeout = current_tick + (2*HZ);
#endif
struct viewport vp[NB_SCREENS];
#ifdef HAS_BUTTONBAR
#ifdef HAVE_BUTTONBAR
struct gui_buttonbar buttonbar;
gui_buttonbar_init(&buttonbar);
gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) );
@ -468,7 +468,7 @@ int radio_screen(void)
FOR_NB_SCREENS(i)
{
viewport_set_defaults(&vp[i], i);
#ifdef HAS_BUTTONBAR
#ifdef HAVE_BUTTONBAR
if (global_settings.buttonbar)
vp[i].height -= BUTTONBAR_HEIGHT;
#endif
@ -532,7 +532,7 @@ int radio_screen(void)
if(curr_preset != -1)
radio_mode = RADIO_PRESET_MODE;
#ifdef HAS_BUTTONBAR
#ifdef HAVE_BUTTONBAR
gui_buttonbar_set(&buttonbar, str(LANG_BUTTONBAR_MENU),
str(LANG_PRESET), str(LANG_FM_BUTTONBAR_RECORD));
#endif
@ -728,7 +728,7 @@ int radio_screen(void)
screens[i].update_viewport();
screens[i].set_viewport(NULL);
}
#ifdef HAS_BUTTONBAR
#ifdef HAVE_BUTTONBAR
gui_buttonbar_set(&buttonbar, str(LANG_BUTTONBAR_MENU),
str(LANG_PRESET),
str(LANG_FM_BUTTONBAR_RECORD));
@ -760,7 +760,7 @@ int radio_screen(void)
screens[i].update_viewport();
screens[i].set_viewport(NULL);
}
#ifdef HAS_BUTTONBAR
#ifdef HAVE_BUTTONBAR
gui_buttonbar_set(&buttonbar,
str(LANG_BUTTONBAR_MENU),
str(LANG_PRESET),
@ -952,7 +952,7 @@ int radio_screen(void)
screens[i].set_viewport(NULL);
}
#ifdef HAS_BUTTONBAR
#ifdef HAVE_BUTTONBAR
gui_buttonbar_draw(&buttonbar);
#endif
}
@ -1337,14 +1337,14 @@ static int handle_radio_presets(void)
struct gui_synclist lists;
int result = 0;
int action = ACTION_NONE;
#ifdef HAS_BUTTONBAR
#ifdef HAVE_BUTTONBAR
struct gui_buttonbar buttonbar;
#endif
if(presets_loaded == false)
return result;
#ifdef HAS_BUTTONBAR
#ifdef HAVE_BUTTONBAR
gui_buttonbar_init(&buttonbar);
gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) );
gui_buttonbar_set(&buttonbar, str(LANG_FM_BUTTONBAR_ADD),