diff options
Diffstat (limited to 'apps/gui/gwps.c')
-rw-r--r-- | apps/gui/gwps.c | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index ee4522966c..6134cb5068 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -802,29 +802,6 @@ long gui_wps_show(void) | |||
802 | /* needs checking if needed end*/ | 802 | /* needs checking if needed end*/ |
803 | 803 | ||
804 | /* wps_data*/ | 804 | /* wps_data*/ |
805 | /* initial setup of wps_data */ | ||
806 | void wps_data_init(struct wps_data *wps_data) | ||
807 | { | ||
808 | int i; | ||
809 | #ifdef HAVE_LCD_BITMAP | ||
810 | for (i = 0; i < MAX_IMAGES; i++) { | ||
811 | wps_data->img[i].loaded = false; | ||
812 | wps_data->img[i].display = false; | ||
813 | wps_data->img[i].always_display = false; | ||
814 | } | ||
815 | wps_data->wps_sb_tag = false; | ||
816 | wps_data->show_sb_on_wps = false; | ||
817 | wps_data->progressbar.have_bitmap_pb=false; | ||
818 | #else /* HAVE_LCD_CHARCELLS */ | ||
819 | for(i = 0; i < 8; i++) | ||
820 | wps_data->wps_progress_pat[i] = 0; | ||
821 | wps_data->full_line_progressbar = 0; | ||
822 | #endif | ||
823 | wps_data->format_buffer[0] = '\0'; | ||
824 | wps_data->wps_loaded = false; | ||
825 | wps_data->peak_meter_enabled = false; | ||
826 | } | ||
827 | |||
828 | #ifdef HAVE_LCD_BITMAP | 805 | #ifdef HAVE_LCD_BITMAP |
829 | /* Clear the WPS image cache */ | 806 | /* Clear the WPS image cache */ |
830 | static void wps_clear(struct wps_data *data ) | 807 | static void wps_clear(struct wps_data *data ) |
@@ -844,11 +821,32 @@ static void wps_clear(struct wps_data *data ) | |||
844 | #define wps_clear(a) | 821 | #define wps_clear(a) |
845 | #endif | 822 | #endif |
846 | 823 | ||
824 | /* initial setup of wps_data */ | ||
825 | void wps_data_init(struct wps_data *wps_data) | ||
826 | { | ||
827 | #ifdef HAVE_LCD_BITMAP | ||
828 | wps_clear(wps_data); | ||
829 | #else /* HAVE_LCD_CHARCELLS */ | ||
830 | { | ||
831 | int i; | ||
832 | for(i = 0; i < 8; i++) | ||
833 | wps_data->wps_progress_pat[i] = 0; | ||
834 | wps_data->full_line_progressbar = 0; | ||
835 | } | ||
836 | #endif | ||
837 | wps_data->format_buffer[0] = '\0'; | ||
838 | wps_data->wps_loaded = false; | ||
839 | wps_data->peak_meter_enabled = false; | ||
840 | } | ||
841 | |||
847 | static void wps_reset(struct wps_data *data) | 842 | static void wps_reset(struct wps_data *data) |
848 | { | 843 | { |
849 | data->wps_loaded = false; | 844 | data->wps_loaded = false; |
850 | memset(&data->format_buffer, 0, sizeof data->format_buffer); | 845 | memset(&data->format_buffer, 0, sizeof data->format_buffer); |
851 | wps_clear(data); | 846 | wps_data_init(data); |
847 | #ifdef HAVE_LCD_COLOR | ||
848 | wps_has_backdrop = false; | ||
849 | #endif | ||
852 | } | 850 | } |
853 | 851 | ||
854 | /* to setup up the wps-data from a format-buffer (isfile = false) | 852 | /* to setup up the wps-data from a format-buffer (isfile = false) |