diff options
Diffstat (limited to 'apps/recorder')
-rw-r--r-- | apps/recorder/keyboard.c | 8 | ||||
-rw-r--r-- | apps/recorder/radio.c | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 752e0369e9..9bbe529154 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -338,7 +338,7 @@ int kbd_input(char* text, int buflen) | |||
338 | } | 338 | } |
339 | 339 | ||
340 | char outline[256]; | 340 | char outline[256]; |
341 | #ifdef HAS_BUTTONBAR | 341 | #ifdef HAVE_BUTTONBAR |
342 | struct gui_buttonbar buttonbar; | 342 | struct gui_buttonbar buttonbar; |
343 | bool buttonbar_config = global_settings.buttonbar; | 343 | bool buttonbar_config = global_settings.buttonbar; |
344 | 344 | ||
@@ -712,7 +712,7 @@ int kbd_input(char* text, int buflen) | |||
712 | 712 | ||
713 | cur_blink = !cur_blink; | 713 | cur_blink = !cur_blink; |
714 | 714 | ||
715 | #ifdef HAS_BUTTONBAR | 715 | #ifdef HAVE_BUTTONBAR |
716 | /* draw the button bar */ | 716 | /* draw the button bar */ |
717 | gui_buttonbar_set(&buttonbar, "Shift", "OK", "Del"); | 717 | gui_buttonbar_set(&buttonbar, "Shift", "OK", "Del"); |
718 | gui_buttonbar_draw(&buttonbar); | 718 | gui_buttonbar_draw(&buttonbar); |
@@ -764,7 +764,7 @@ int kbd_input(char* text, int buflen) | |||
764 | FOR_NB_SCREENS(l) | 764 | FOR_NB_SCREENS(l) |
765 | screens[l].setfont(FONT_UI); | 765 | screens[l].setfont(FONT_UI); |
766 | 766 | ||
767 | #ifdef HAS_BUTTONBAR | 767 | #ifdef HAVE_BUTTONBAR |
768 | global_settings.buttonbar=buttonbar_config; | 768 | global_settings.buttonbar=buttonbar_config; |
769 | #endif | 769 | #endif |
770 | return -1; | 770 | return -1; |
@@ -1230,7 +1230,7 @@ int kbd_input(char* text, int buflen) | |||
1230 | } | 1230 | } |
1231 | } | 1231 | } |
1232 | 1232 | ||
1233 | #ifdef HAS_BUTTONBAR | 1233 | #ifdef HAVE_BUTTONBAR |
1234 | global_settings.buttonbar = buttonbar_config; | 1234 | global_settings.buttonbar = buttonbar_config; |
1235 | #endif | 1235 | #endif |
1236 | 1236 | ||
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) | |||
452 | int button_timeout = current_tick + (2*HZ); | 452 | int button_timeout = current_tick + (2*HZ); |
453 | #endif | 453 | #endif |
454 | struct viewport vp[NB_SCREENS]; | 454 | struct viewport vp[NB_SCREENS]; |
455 | #ifdef HAS_BUTTONBAR | 455 | #ifdef HAVE_BUTTONBAR |
456 | struct gui_buttonbar buttonbar; | 456 | struct gui_buttonbar buttonbar; |
457 | gui_buttonbar_init(&buttonbar); | 457 | gui_buttonbar_init(&buttonbar); |
458 | gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) ); | 458 | gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) ); |
@@ -468,7 +468,7 @@ int radio_screen(void) | |||
468 | FOR_NB_SCREENS(i) | 468 | FOR_NB_SCREENS(i) |
469 | { | 469 | { |
470 | viewport_set_defaults(&vp[i], i); | 470 | viewport_set_defaults(&vp[i], i); |
471 | #ifdef HAS_BUTTONBAR | 471 | #ifdef HAVE_BUTTONBAR |
472 | if (global_settings.buttonbar) | 472 | if (global_settings.buttonbar) |
473 | vp[i].height -= BUTTONBAR_HEIGHT; | 473 | vp[i].height -= BUTTONBAR_HEIGHT; |
474 | #endif | 474 | #endif |
@@ -532,7 +532,7 @@ int radio_screen(void) | |||
532 | if(curr_preset != -1) | 532 | if(curr_preset != -1) |
533 | radio_mode = RADIO_PRESET_MODE; | 533 | radio_mode = RADIO_PRESET_MODE; |
534 | 534 | ||
535 | #ifdef HAS_BUTTONBAR | 535 | #ifdef HAVE_BUTTONBAR |
536 | gui_buttonbar_set(&buttonbar, str(LANG_BUTTONBAR_MENU), | 536 | gui_buttonbar_set(&buttonbar, str(LANG_BUTTONBAR_MENU), |
537 | str(LANG_PRESET), str(LANG_FM_BUTTONBAR_RECORD)); | 537 | str(LANG_PRESET), str(LANG_FM_BUTTONBAR_RECORD)); |
538 | #endif | 538 | #endif |
@@ -728,7 +728,7 @@ int radio_screen(void) | |||
728 | screens[i].update_viewport(); | 728 | screens[i].update_viewport(); |
729 | screens[i].set_viewport(NULL); | 729 | screens[i].set_viewport(NULL); |
730 | } | 730 | } |
731 | #ifdef HAS_BUTTONBAR | 731 | #ifdef HAVE_BUTTONBAR |
732 | gui_buttonbar_set(&buttonbar, str(LANG_BUTTONBAR_MENU), | 732 | gui_buttonbar_set(&buttonbar, str(LANG_BUTTONBAR_MENU), |
733 | str(LANG_PRESET), | 733 | str(LANG_PRESET), |
734 | str(LANG_FM_BUTTONBAR_RECORD)); | 734 | str(LANG_FM_BUTTONBAR_RECORD)); |
@@ -760,7 +760,7 @@ int radio_screen(void) | |||
760 | screens[i].update_viewport(); | 760 | screens[i].update_viewport(); |
761 | screens[i].set_viewport(NULL); | 761 | screens[i].set_viewport(NULL); |
762 | } | 762 | } |
763 | #ifdef HAS_BUTTONBAR | 763 | #ifdef HAVE_BUTTONBAR |
764 | gui_buttonbar_set(&buttonbar, | 764 | gui_buttonbar_set(&buttonbar, |
765 | str(LANG_BUTTONBAR_MENU), | 765 | str(LANG_BUTTONBAR_MENU), |
766 | str(LANG_PRESET), | 766 | str(LANG_PRESET), |
@@ -952,7 +952,7 @@ int radio_screen(void) | |||
952 | screens[i].set_viewport(NULL); | 952 | screens[i].set_viewport(NULL); |
953 | } | 953 | } |
954 | 954 | ||
955 | #ifdef HAS_BUTTONBAR | 955 | #ifdef HAVE_BUTTONBAR |
956 | gui_buttonbar_draw(&buttonbar); | 956 | gui_buttonbar_draw(&buttonbar); |
957 | #endif | 957 | #endif |
958 | } | 958 | } |
@@ -1337,14 +1337,14 @@ static int handle_radio_presets(void) | |||
1337 | struct gui_synclist lists; | 1337 | struct gui_synclist lists; |
1338 | int result = 0; | 1338 | int result = 0; |
1339 | int action = ACTION_NONE; | 1339 | int action = ACTION_NONE; |
1340 | #ifdef HAS_BUTTONBAR | 1340 | #ifdef HAVE_BUTTONBAR |
1341 | struct gui_buttonbar buttonbar; | 1341 | struct gui_buttonbar buttonbar; |
1342 | #endif | 1342 | #endif |
1343 | 1343 | ||
1344 | if(presets_loaded == false) | 1344 | if(presets_loaded == false) |
1345 | return result; | 1345 | return result; |
1346 | 1346 | ||
1347 | #ifdef HAS_BUTTONBAR | 1347 | #ifdef HAVE_BUTTONBAR |
1348 | gui_buttonbar_init(&buttonbar); | 1348 | gui_buttonbar_init(&buttonbar); |
1349 | gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) ); | 1349 | gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) ); |
1350 | gui_buttonbar_set(&buttonbar, str(LANG_FM_BUTTONBAR_ADD), | 1350 | gui_buttonbar_set(&buttonbar, str(LANG_FM_BUTTONBAR_ADD), |