diff options
Diffstat (limited to 'apps/menu.c')
-rw-r--r-- | apps/menu.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/apps/menu.c b/apps/menu.c index c1af044374..97af181267 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -60,7 +60,6 @@ | |||
60 | 60 | ||
61 | /* gui api */ | 61 | /* gui api */ |
62 | #include "list.h" | 62 | #include "list.h" |
63 | #include "buttonbar.h" | ||
64 | 63 | ||
65 | #define MAX_MENUS 8 | 64 | #define MAX_MENUS 8 |
66 | /* used to allow for dynamic menus */ | 65 | /* used to allow for dynamic menus */ |
@@ -376,12 +375,6 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, | |||
376 | int stack_top = 0; | 375 | int stack_top = 0; |
377 | bool in_stringlist, done = false; | 376 | bool in_stringlist, done = false; |
378 | struct viewport *vps = NULL; | 377 | struct viewport *vps = NULL; |
379 | #ifdef HAVE_BUTTONBAR | ||
380 | struct gui_buttonbar buttonbar; | ||
381 | gui_buttonbar_init(&buttonbar); | ||
382 | gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) ); | ||
383 | gui_buttonbar_set(&buttonbar, "<<<", "", ""); | ||
384 | #endif | ||
385 | menu_callback_type menu_callback = NULL; | 378 | menu_callback_type menu_callback = NULL; |
386 | 379 | ||
387 | /* if hide_theme is true, assume parent has been fixed before passed into | 380 | /* if hide_theme is true, assume parent has been fixed before passed into |
@@ -394,23 +387,10 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, | |||
394 | 387 | ||
395 | gui_synclist_draw(&lists); | 388 | gui_synclist_draw(&lists); |
396 | gui_synclist_speak_item(&lists); | 389 | gui_synclist_speak_item(&lists); |
397 | #ifdef HAVE_BUTTONBAR | ||
398 | if (!hide_theme) | ||
399 | { | ||
400 | gui_buttonbar_set(&buttonbar, "<<<", "", ""); | ||
401 | gui_buttonbar_draw(&buttonbar); | ||
402 | } | ||
403 | #endif | ||
404 | while (!done) | 390 | while (!done) |
405 | { | 391 | { |
406 | int new_audio_status; | 392 | int new_audio_status; |
407 | redraw_lists = false; | 393 | redraw_lists = false; |
408 | if (!hide_theme) | ||
409 | { | ||
410 | #ifdef HAVE_BUTTONBAR | ||
411 | gui_buttonbar_draw(&buttonbar); | ||
412 | #endif | ||
413 | } | ||
414 | #if CONFIG_CODEC == SWCODEC | 394 | #if CONFIG_CODEC == SWCODEC |
415 | keyclick_set_callback(gui_synclist_keyclick_callback, &lists); | 395 | keyclick_set_callback(gui_synclist_keyclick_callback, &lists); |
416 | #endif | 396 | #endif |
@@ -590,13 +570,6 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, | |||
590 | int type = (menu->flags&MENU_TYPE_MASK); | 570 | int type = (menu->flags&MENU_TYPE_MASK); |
591 | /* entering an item that may not be a list, so stop scrolling */ | 571 | /* entering an item that may not be a list, so stop scrolling */ |
592 | gui_synclist_scroll_stop(&lists); | 572 | gui_synclist_scroll_stop(&lists); |
593 | #ifdef HAVE_BUTTONBAR | ||
594 | if (!hide_theme) | ||
595 | { | ||
596 | gui_buttonbar_unset(&buttonbar); | ||
597 | gui_buttonbar_draw(&buttonbar); | ||
598 | } | ||
599 | #endif | ||
600 | selected = get_menu_selection(gui_synclist_get_sel_pos(&lists), menu); | 573 | selected = get_menu_selection(gui_synclist_get_sel_pos(&lists), menu); |
601 | if (type == MT_MENU) | 574 | if (type == MT_MENU) |
602 | temp = menu->submenus[selected]; | 575 | temp = menu->submenus[selected]; |
@@ -700,13 +673,6 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, | |||
700 | done = true; | 673 | done = true; |
701 | break; | 674 | break; |
702 | } | 675 | } |
703 | #ifdef HAVE_BUTTONBAR | ||
704 | if (!hide_theme) | ||
705 | { | ||
706 | gui_buttonbar_set(&buttonbar, "<<<", "", ""); | ||
707 | gui_buttonbar_draw(&buttonbar); | ||
708 | } | ||
709 | #endif | ||
710 | } | 676 | } |
711 | else | 677 | else |
712 | { | 678 | { |