diff options
| author | Peter D'Hoye <peter.dhoye@gmail.com> | 2008-05-29 20:32:39 +0000 |
|---|---|---|
| committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2008-05-29 20:32:39 +0000 |
| commit | f76122f0e7a3b82962dbe005d58a643c835013d0 (patch) | |
| tree | 5c4e17d6bf78d70c5612191f9c2f70a561e35b77 /apps/recorder/radio.c | |
| parent | 0792596e1757a5ad91c3959d3721d812c8a282eb (diff) | |
| download | rockbox-f76122f0e7a3b82962dbe005d58a643c835013d0.tar.gz rockbox-f76122f0e7a3b82962dbe005d58a643c835013d0.zip | |
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
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17655 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder/radio.c')
| -rw-r--r-- | apps/recorder/radio.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index efc6aa0a74..ed6744ace8 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c @@ -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), |