A bit mroe wps/skin engine cleanup so that the structs the wps uses can be static:

-add wrappers wps_data_load() and wps_data_init() so that other code doesn't need the structs for that
-change (and rename) gui_sync_wps_uses_albumart() to take points to be filled as parameter to get the AA size of a wps

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22139 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 7 insertions, 11 deletions

diff --git a/apps/settings.c b/apps/settings.c
index 8835b95..423e6ed 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -69,7 +69,7 @@
 #if CONFIG_TUNER
 #include "radio.h"
 #endif
-#include "skin_engine/skin_engine.h"
+#include "wps.h"
 
 #if CONFIG_CODEC == MAS3507D
 void dac_line_in(bool enable);
@@ -848,15 +848,12 @@ void settings_apply(bool read_disk)
             global_settings.wps_file[0] != 0xff ) {
             snprintf(buf, sizeof buf, WPS_DIR "/%s.wps",
                     global_settings.wps_file);
-            skin_data_load(gui_wps[0].data, &screens[0], buf, true);
+            wps_data_load(SCREEN_MAIN, buf, true);
         }
         else
         {
-            wps_data_init(gui_wps[0].data);
-            skin_data_load(gui_wps[0].data, &screens[0], NULL, true);
-#ifdef HAVE_REMOTE_LCD
-            gui_wps[0].data->remote_wps = false;
-#endif
+            wps_data_init(SCREEN_MAIN);
+            wps_data_load(SCREEN_MAIN, NULL, true);
         }
 
 #if LCD_DEPTH > 1
@@ -878,13 +875,12 @@ void settings_apply(bool read_disk)
         if ( global_settings.rwps_file[0]) {
             snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps",
                     global_settings.rwps_file);
-            skin_data_load(gui_wps[1].data, &screens[1], buf, true);
+            wps_data_load(SCREEN_REMOTE, buf, true);
         }
         else
         {
-            wps_data_init(gui_wps[1].data);
-            skin_data_load(gui_wps[1].data, &screens[1], NULL, true);
-            gui_wps[1].data->remote_wps = true;
+            wps_data_init(SCREEN_REMOTE);
+            wps_data_load(SCREEN_REMOTE, NULL, true);
         }
 #endif
         if ( global_settings.lang_file[0]) {