diff options
-rw-r--r-- | apps/gui/statusbar.c | 12 | ||||
-rw-r--r-- | apps/gui/statusbar.h | 3 | ||||
-rw-r--r-- | apps/onplay.c | 2 | ||||
-rw-r--r-- | apps/plugin.h | 1 | ||||
-rw-r--r-- | docs/PLUGIN_API | 12 |
5 files changed, 1 insertions, 29 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index a961d191b2..74da14bd3f 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -725,18 +725,6 @@ void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) | |||
725 | } | 725 | } |
726 | } | 726 | } |
727 | 727 | ||
728 | void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, | ||
729 | bool force_redraw) | ||
730 | { | ||
731 | if(!global_settings.statusbar) | ||
732 | return; | ||
733 | struct viewport viewport; | ||
734 | FOR_NB_SCREENS(i) { | ||
735 | GET_RECT(viewport,statusbar_position(i),&screens[i]); | ||
736 | gui_statusbar_draw( &(bars->statusbars[i]), force_redraw, &viewport ); | ||
737 | } | ||
738 | } | ||
739 | |||
740 | 728 | ||
741 | #ifdef HAVE_REMOTE_LCD | 729 | #ifdef HAVE_REMOTE_LCD |
742 | enum statusbar_values statusbar_position(int screen) | 730 | enum statusbar_values statusbar_position(int screen) |
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h index a676c7b143..c62434155d 100644 --- a/apps/gui/statusbar.h +++ b/apps/gui/statusbar.h | |||
@@ -99,8 +99,7 @@ struct gui_syncstatusbar | |||
99 | }; | 99 | }; |
100 | 100 | ||
101 | extern void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) INIT_ATTR; | 101 | extern void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) INIT_ATTR; |
102 | extern void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, | 102 | |
103 | bool force_redraw); | ||
104 | #if !defined(HAVE_REMOTE_LCD) || defined(__PCTOOL__) | 103 | #if !defined(HAVE_REMOTE_LCD) || defined(__PCTOOL__) |
105 | #include "settings.h" | 104 | #include "settings.h" |
106 | #define statusbar_position(a) ((enum statusbar_values)global_settings.statusbar) | 105 | #define statusbar_position(a) ((enum statusbar_values)global_settings.statusbar) |
diff --git a/apps/onplay.c b/apps/onplay.c index 8f2c3c4f4a..c3e1ebec54 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -425,10 +425,8 @@ static bool playing_time(void) | |||
425 | gui_synclist_set_voice_callback(&pt_lists, playing_time_speak_info); | 425 | gui_synclist_set_voice_callback(&pt_lists, playing_time_speak_info); |
426 | gui_synclist_set_nb_items(&pt_lists, 8); | 426 | gui_synclist_set_nb_items(&pt_lists, 8); |
427 | gui_synclist_draw(&pt_lists); | 427 | gui_synclist_draw(&pt_lists); |
428 | /* gui_syncstatusbar_draw(&statusbars, true); */ | ||
429 | gui_synclist_speak_item(&pt_lists); | 428 | gui_synclist_speak_item(&pt_lists); |
430 | while (true) { | 429 | while (true) { |
431 | /* gui_syncstatusbar_draw(&statusbars, false); */ | ||
432 | if (list_do_action(CONTEXT_LIST, HZ/2, | 430 | if (list_do_action(CONTEXT_LIST, HZ/2, |
433 | &pt_lists, &key, LIST_WRAP_UNLESS_HELD) == 0 | 431 | &pt_lists, &key, LIST_WRAP_UNLESS_HELD) == 0 |
434 | && key!=ACTION_NONE && key!=ACTION_UNKNOWN) | 432 | && key!=ACTION_NONE && key!=ACTION_UNKNOWN) |
diff --git a/apps/plugin.h b/apps/plugin.h index 7306e3fcba..38d44530b0 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -94,7 +94,6 @@ int plugin_open(const char *plugin, const char *parameter); | |||
94 | #include "scrollbar.h" | 94 | #include "scrollbar.h" |
95 | #include "jpeg_load.h" | 95 | #include "jpeg_load.h" |
96 | #include "../recorder/bmp.h" | 96 | #include "../recorder/bmp.h" |
97 | #include "statusbar.h" | ||
98 | #include "menu.h" | 97 | #include "menu.h" |
99 | #include "rbunicode.h" | 98 | #include "rbunicode.h" |
100 | #include "list.h" | 99 | #include "list.h" |
diff --git a/docs/PLUGIN_API b/docs/PLUGIN_API index 94729a728b..8814833959 100644 --- a/docs/PLUGIN_API +++ b/docs/PLUGIN_API | |||
@@ -750,13 +750,6 @@ void gui_synclist_set_title(struct gui_synclist *lists, char* title, int icon) | |||
750 | \param icon | 750 | \param icon |
751 | \description | 751 | \description |
752 | 752 | ||
753 | void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, bool force_redraw) | ||
754 | \group scroll bar | ||
755 | \param bars | ||
756 | \param force_redraw refreshes =bars= if true | ||
757 | \description Draws an initialized statusbar =bars= on the screen and refreshs it if =force_redraw= is true. | ||
758 | \see [S[apps/gui/statusbar.h]] | ||
759 | |||
760 | enum yesno_res gui_syncyesno_run(const struct text_message * main_message, const struct text_message * yes_message, const struct text_message * no_message) | 753 | enum yesno_res gui_syncyesno_run(const struct text_message * main_message, const struct text_message * yes_message, const struct text_message * no_message) |
761 | \group list | 754 | \group list |
762 | \param main_message | 755 | \param main_message |
@@ -1969,11 +1962,6 @@ void srand(unsigned int seed) | |||
1969 | \param seed | 1962 | \param seed |
1970 | \description Seed the random number generator | 1963 | \description Seed the random number generator |
1971 | 1964 | ||
1972 | struct gui_syncstatusbar *statusbars | ||
1973 | \group scroll bar | ||
1974 | \return | ||
1975 | \description | ||
1976 | |||
1977 | int strcasecmp(const char *, const char *) | 1965 | int strcasecmp(const char *, const char *) |
1978 | \group strings and memory | 1966 | \group strings and memory |
1979 | \param | 1967 | \param |