diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-11-04 07:14:02 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-11-04 07:14:02 +0000 |
commit | c0635ba6c9abc22bbb87a6b426d61d4c915f7131 (patch) | |
tree | e5589565f013ed144dc0f7bed93831b46d684a04 /apps/gui | |
parent | 6750d65f791f19097ce740cfbe12a873a915a897 (diff) | |
download | rockbox-c0635ba6c9abc22bbb87a6b426d61d4c915f7131.tar.gz rockbox-c0635ba6c9abc22bbb87a6b426d61d4c915f7131.zip |
Remove wps_data.remote_wps. It's redundant with the new global curr_screen.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23512 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 19 | ||||
-rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 4 | ||||
-rw-r--r-- | apps/gui/statusbar-skinned.c | 6 | ||||
-rw-r--r-- | apps/gui/wps.c | 7 |
4 files changed, 3 insertions, 33 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 3585907182..d06494d908 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -696,12 +696,6 @@ static int parse_viewport(const char *wps_bufptr, | |||
696 | (void)token; /* Kill warnings */ | 696 | (void)token; /* Kill warnings */ |
697 | const char *ptr = wps_bufptr; | 697 | const char *ptr = wps_bufptr; |
698 | 698 | ||
699 | const int screen = | ||
700 | #ifdef HAVE_REMOTE_LCD | ||
701 | wps_data->remote_wps ? SCREEN_REMOTE : | ||
702 | #endif | ||
703 | SCREEN_MAIN; | ||
704 | |||
705 | struct skin_viewport *skin_vp = skin_buffer_alloc(sizeof(struct skin_viewport)); | 699 | struct skin_viewport *skin_vp = skin_buffer_alloc(sizeof(struct skin_viewport)); |
706 | 700 | ||
707 | /* check for the optional letter to signify its a hideable viewport */ | 701 | /* check for the optional letter to signify its a hideable viewport */ |
@@ -749,7 +743,7 @@ static int parse_viewport(const char *wps_bufptr, | |||
749 | struct viewport *vp = &skin_vp->vp; | 743 | struct viewport *vp = &skin_vp->vp; |
750 | /* format: %V|x|y|width|height|font|fg_pattern|bg_pattern| */ | 744 | /* format: %V|x|y|width|height|font|fg_pattern|bg_pattern| */ |
751 | 745 | ||
752 | if (!(ptr = viewport_parse_viewport(vp, screen, ptr, '|'))) | 746 | if (!(ptr = viewport_parse_viewport(vp, curr_screen, ptr, '|'))) |
753 | return WPS_ERROR_INVALID_PARAM; | 747 | return WPS_ERROR_INVALID_PARAM; |
754 | 748 | ||
755 | vp->flags &= ~VP_FLAG_ALIGN_RIGHT; /* ignore right-to-left languages */ | 749 | vp->flags &= ~VP_FLAG_ALIGN_RIGHT; /* ignore right-to-left languages */ |
@@ -1732,7 +1726,6 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr, bool debug) | |||
1732 | * initial setup of wps_data; does reset everything | 1726 | * initial setup of wps_data; does reset everything |
1733 | * except fields which need to survive, i.e. | 1727 | * except fields which need to survive, i.e. |
1734 | * | 1728 | * |
1735 | * wps_data->remote_wps | ||
1736 | **/ | 1729 | **/ |
1737 | void skin_data_reset(struct wps_data *wps_data) | 1730 | void skin_data_reset(struct wps_data *wps_data) |
1738 | { | 1731 | { |
@@ -1784,7 +1777,7 @@ static bool load_skin_bmp(struct wps_data *wps_data, struct bitmap *bitmap, char | |||
1784 | /* load the image */ | 1777 | /* load the image */ |
1785 | int format; | 1778 | int format; |
1786 | #ifdef HAVE_REMOTE_LCD | 1779 | #ifdef HAVE_REMOTE_LCD |
1787 | if (wps_data->remote_wps) | 1780 | if (curr_screen == SCREEN_REMOTE) |
1788 | format = FORMAT_ANY|FORMAT_REMOTE; | 1781 | format = FORMAT_ANY|FORMAT_REMOTE; |
1789 | else | 1782 | else |
1790 | #endif | 1783 | #endif |
@@ -1839,16 +1832,10 @@ static bool load_skin_bitmaps(struct wps_data *wps_data, char *bmpdir) | |||
1839 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) | 1832 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) |
1840 | if (bmp_names[BACKDROP_BMP]) | 1833 | if (bmp_names[BACKDROP_BMP]) |
1841 | { | 1834 | { |
1842 | int screen = SCREEN_MAIN; | ||
1843 | char img_path[MAX_PATH]; | 1835 | char img_path[MAX_PATH]; |
1844 | get_image_filename(bmp_names[BACKDROP_BMP], bmpdir, | 1836 | get_image_filename(bmp_names[BACKDROP_BMP], bmpdir, |
1845 | img_path, sizeof(img_path)); | 1837 | img_path, sizeof(img_path)); |
1846 | #if defined(HAVE_REMOTE_LCD) | 1838 | screens[curr_screen].backdrop_load(BACKDROP_SKIN_WPS, img_path); |
1847 | /* We only need to check LCD type if there is a remote LCD */ | ||
1848 | if (wps_data->remote_wps) | ||
1849 | screen = SCREEN_REMOTE; | ||
1850 | #endif | ||
1851 | screens[screen].backdrop_load(BACKDROP_SKIN_WPS, img_path); | ||
1852 | } | 1839 | } |
1853 | #endif /* has backdrop support */ | 1840 | #endif /* has backdrop support */ |
1854 | 1841 | ||
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index 8763ef9e3d..e975616f91 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h | |||
@@ -274,10 +274,6 @@ struct wps_data | |||
274 | bool full_line_progressbar; | 274 | bool full_line_progressbar; |
275 | #endif | 275 | #endif |
276 | bool wps_loaded; | 276 | bool wps_loaded; |
277 | #ifdef HAVE_REMOTE_LCD | ||
278 | /* this must not be reset on skin loading */ | ||
279 | bool remote_wps; | ||
280 | #endif | ||
281 | }; | 277 | }; |
282 | 278 | ||
283 | /* wps_data end */ | 279 | /* wps_data end */ |
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c index 11805c83a8..2bef616524 100644 --- a/apps/gui/statusbar-skinned.c +++ b/apps/gui/statusbar-skinned.c | |||
@@ -71,9 +71,6 @@ void sb_skin_data_load(enum screen_type screen, const char *buf, bool isfile) | |||
71 | if (!success) | 71 | if (!success) |
72 | remove_event(GUI_EVENT_ACTIONUPDATE, sb_skin_update); | 72 | remove_event(GUI_EVENT_ACTIONUPDATE, sb_skin_update); |
73 | 73 | ||
74 | #ifdef HAVE_REMOVE_LCD | ||
75 | data->remote_wps = !(screen == SCREEN_MAIN); | ||
76 | #endif | ||
77 | loaded_ok[screen] = success; | 74 | loaded_ok[screen] = success; |
78 | } | 75 | } |
79 | 76 | ||
@@ -211,9 +208,6 @@ void sb_skin_init(void) | |||
211 | sb_skin_data[i].albumart = NULL; | 208 | sb_skin_data[i].albumart = NULL; |
212 | sb_skin_data[i].playback_aa_slot = -1; | 209 | sb_skin_data[i].playback_aa_slot = -1; |
213 | #endif | 210 | #endif |
214 | #ifdef HAVE_REMOTE_LCD | ||
215 | sb_skin_data[i].remote_wps = (i == SCREEN_REMOTE); | ||
216 | #endif | ||
217 | sb_skin[i].data = &sb_skin_data[i]; | 211 | sb_skin[i].data = &sb_skin_data[i]; |
218 | sb_skin[i].display = &screens[i]; | 212 | sb_skin[i].display = &screens[i]; |
219 | /* Currently no seperate wps_state needed/possible | 213 | /* Currently no seperate wps_state needed/possible |
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 4f162f452a..e0e63ad822 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -153,10 +153,6 @@ void wps_data_load(enum screen_type screen, const char *buf, bool isfile) | |||
153 | }; | 153 | }; |
154 | skin_data_load(screen, gui_wps[screen].data, skin_buf[screen], false); | 154 | skin_data_load(screen, gui_wps[screen].data, skin_buf[screen], false); |
155 | } | 155 | } |
156 | #ifdef HAVE_REMOVE_LCD | ||
157 | gui_wps[screen].data->remote_wps = !(screen == SCREEN_MAIN); | ||
158 | |||
159 | #endif | ||
160 | } | 156 | } |
161 | 157 | ||
162 | void fade(bool fade_in, bool updatewps) | 158 | void fade(bool fade_in, bool updatewps) |
@@ -1280,9 +1276,6 @@ void gui_sync_wps_init(void) | |||
1280 | wps_datas[i].albumart = NULL; | 1276 | wps_datas[i].albumart = NULL; |
1281 | wps_datas[i].playback_aa_slot = -1; | 1277 | wps_datas[i].playback_aa_slot = -1; |
1282 | #endif | 1278 | #endif |
1283 | #ifdef HAVE_REMOTE_LCD | ||
1284 | wps_datas[i].remote_wps = (i == SCREEN_REMOTE); | ||
1285 | #endif | ||
1286 | gui_wps[i].data = &wps_datas[i]; | 1279 | gui_wps[i].data = &wps_datas[i]; |
1287 | gui_wps[i].display = &screens[i]; | 1280 | gui_wps[i].display = &screens[i]; |
1288 | /* Currently no seperate wps_state needed/possible | 1281 | /* Currently no seperate wps_state needed/possible |